diff -Nru sweethome3d-3.3+dfsg/build.xml sweethome3d-3.4+dfsg/build.xml
--- sweethome3d-3.3+dfsg/build.xml	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/build.xml	2011-12-21 00:48:48.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- build.xml
 
-	 Sweet Home 3D, Copyright (c) 2007-2011 Emmanuel PUYBARET / eTeks <info@eteks.com>. 
+     Sweet Home 3D, Copyright (c) 2007-2011 Emmanuel PUYBARET / eTeks <info@eteks.com>. 
      
      Ant build file. Available targets :
      - build       : Builds SweetHome3D.jar file in build directory
@@ -27,10 +27,10 @@
 -->
 <project basedir="." default="javaWebStart" name="SweetHome3D">
   <!-- The current version of Sweet Home 3D -->
-  <property name="version" value="3.3"/>
+  <property name="version" value="3.4"/>
 
   <target name="build" 
-  	      description="Builds build/SweetHome3D.jar with all its classes">
+          description="Builds build/SweetHome3D.jar with all its classes">
     <!-- Compile Sweet Home 3D -->
     <mkdir dir="build/classes"/>
     <!-- Compile Sweet Home 3D applets first with javac 1.1 to be able to detect current Java version
@@ -73,7 +73,7 @@
   </target>
 
   <target name="application" depends="build"
-  	      description="Builds build/SweetHome3D.jar application with all its classes">
+          description="Builds build/SweetHome3D.jar application with all its classes">
     <zip destfile="build/SweetHome3DStandalone.jar">
       <zipfileset src="build/SweetHome3D.jar" 
                   excludes="com/eteks/sweethome3d/applet/**"/>
@@ -82,7 +82,7 @@
   </target>
 
   <target name="furniture"
-  	      description="Builds build/Furniture.jar that contains the furniture files">
+          description="Builds build/Furniture.jar that contains the furniture files">
     <mkdir dir="build"/>
     <zip destfile="build/Furniture.jar" basedir="src">
       <include name="com/eteks/sweethome3d/io/*FurnitureCatalog*.properties"/>
@@ -93,7 +93,7 @@
   </target>
 
   <target name="textures"
-  	      description="Builds build/Textures.jar that contains the textures files">
+          description="Builds build/Textures.jar that contains the textures files">
     <mkdir dir="build"/>
     <zip destfile="build/Textures.jar" basedir="src">
       <include name="com/eteks/sweethome3d/io/*TexturesCatalog*.properties"/>
@@ -102,7 +102,7 @@
   </target>
 
   <target name="help"
-  	      description="Builds build/Help.jar that contains the help files">
+          description="Builds build/Help.jar that contains the help files">
     <mkdir dir="build"/>
     <zip destfile="build/Help.jar" basedir="src">
       <include name="**/help/**"/>
@@ -110,7 +110,7 @@
   </target>
 
   <target name="java3dLibraries"
-  	      description="Builds JNLP Java 3D libraries in deploy/lib subdirectories">
+          description="Builds JNLP Java 3D libraries in deploy/lib subdirectories">
     <!-- Create java3d.jar containing Windows 32 bits Java 3D DLLs and jars -->
     <mkdir dir="deploy/lib/windows/i386"/>
     <zip destfile="deploy/lib/windows/i386/java3d.jar">
@@ -179,16 +179,16 @@
   </target>
 
   <target name="javaWebStart" depends="application,furniture,textures,help,java3dLibraries"
-  	      description="Builds deploy/lib/SweetHome3D.jar and signs jars required by Sweet Home 3D with Java Web Start">
+          description="Builds deploy/lib/SweetHome3D.jar and signs jars required by Sweet Home 3D with Java Web Start">
     <!-- Build SweetHome3D.jar file from the content of built jars -->
     <mkdir dir="deploy/lib"/>
     <zip destfile="deploy/lib/SweetHome3DJavaWebStartBootstrap.jar">
       <zipfileset src="build/SweetHome3D.jar"  
-      	  includes="com/eteks/sweethome3d/SweetHome3DJavaWebStartBootstrap.class"/>
+         includes="com/eteks/sweethome3d/SweetHome3DJavaWebStartBootstrap.class"/>
     </zip>
     <zip destfile="deploy/lib/SweetHome3D.jar">
       <zipfileset src="build/SweetHome3D.jar" 
-      	  excludes="com/eteks/sweethome3d/SweetHome3DJavaWebStartBootstrap.class"/>
+          excludes="com/eteks/sweethome3d/SweetHome3DJavaWebStartBootstrap.class"/>
       <zipfileset src="build/Furniture.jar"/>
       <zipfileset src="build/Textures.jar"/>
       <zipfileset src="build/Help.jar"/>
@@ -221,7 +221,7 @@
   </target>
 
   <target name="applet" depends="build,java3dLibraries"
-  	      description="Builds deploy/lib/SweetHome3DApplet.jar and signs jars required by Sweet Home 3D applet">
+          description="Builds deploy/lib/SweetHome3DApplet.jar and signs jars required by Sweet Home 3D applet">
     <!-- Create SweetHome3DApplet.jar containing Sweet Home 3D classes and resources -->
     <mkdir dir="deploy/lib"/>
     <zip destfile="deploy/lib/SweetHome3DApplet.jar">
@@ -273,7 +273,7 @@
   </target>
 
   <target name="viewer" depends="java3dLibraries"
-  	      description="Builds deploy/lib/SweetHome3DViewer.jar and signs jars required by Sweet Home 3D viewer">
+          description="Builds deploy/lib/SweetHome3DViewer.jar and signs jars required by Sweet Home 3D viewer">
     <!-- Compile Sweet Home 3D Viewer-->
     <mkdir dir="build/classes"/>
     <!-- Compile Sweet Home 3D Viewer applet first with javac 1.1 to be able to detect current Java version
@@ -289,6 +289,9 @@
       <extdirs>
         <pathelement location="lib"/>
       </extdirs>
+      <classpath>
+        <pathelement location="libtest/jnlp.jar"/>
+      </classpath>
     </javac>
     
     <!-- Copy only resources used by viewer -->
@@ -369,7 +372,7 @@
   </target>
 
   <target name="jarExecutable" depends="application,furniture,textures,help"
-  	      description="Builds install/SweetHome3D-version.jar executable Jar">
+          description="Builds install/SweetHome3D-version.jar executable Jar">
     <!-- Create SweetHome3D-version.jar containing Sweet Home 3D classes and resources,
          and other DLLs and jars -->
     <jar destfile="install/SweetHome3D-${version}.jar" 
@@ -395,10 +398,11 @@
         <include name="COPYING.TXT"/>
         <include name="THIRDPARTY-LICENSE-JAVA3D.TXT"/>
         <include name="THIRDPARTY-LICENSE-LOADER3DS.TXT"/>
+        <include name="THIRDPARTY-LICENSE-BATIK.TXT"/>
         <include name="THIRDPARTY-LICENSE-ITEXT.TXT"/>
         <include name="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT"/>
         <include name="THIRDPARTY-LICENSE-SUNFLOW.TXT"/>
-      	<include name="THIRDPARTY-LICENSE-JMF.HTML"/>
+        <include name="THIRDPARTY-LICENSE-JMF.HTML"/>
         <include name="THIRDPARTY-LICENSE-TANGO.TXT"/>
         <include name="THIRDPARTY-LICENSE-CONTRIBUTIONS.TXT"/>
       </fileset>
@@ -415,7 +419,7 @@
        CAUTION : May be run only under Windows and requires a Windows 32 bits JRE, launch4j and Inno Setup 
                  installed in their default location -->
   <target name="windowsInstaller" depends="application,furniture,textures,help"
-  	      description="Builds install/SweetHome3D-version-windows.exe installer">
+          description="Builds install/SweetHome3D-version-windows.exe installer">
     <!-- Copy SweetHome3D JARs and Windows Java 3D DLLs and JARs for Java 3D 
          to install/windows/tmp/lib -->
     <mkdir dir="install/windows/tmp/lib"/>
@@ -437,10 +441,11 @@
     <copy file="THIRDPARTY-LICENSE-JAVA.TXT"      todir="install/windows/tmp" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"    todir="install/windows/tmp" />
     <copy file="THIRDPARTY-LICENSE-LOADER3DS.TXT" todir="install/windows/tmp" />
+    <copy file="THIRDPARTY-LICENSE-BATIK.TXT"     todir="install/windows/tmp"/>
     <copy file="THIRDPARTY-LICENSE-ITEXT.TXT"     todir="install/windows/tmp" />
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT"  todir="install/windows/tmp" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"   todir="install/windows/tmp" />
-  	<copy file="THIRDPARTY-LICENSE-JMF.HTML"      todir="install/windows/tmp"/>
+    <copy file="THIRDPARTY-LICENSE-JMF.HTML"      todir="install/windows/tmp"/>
     <copy file="THIRDPARTY-LICENSE-LAUNCH4J.TXT"  todir="install/windows/tmp" />
     <copy file="THIRDPARTY-LICENSE-INNOSETUP.TXT" todir="install/windows/tmp" />
     <copy file="THIRDPARTY-LICENSE-TANGO.TXT"     todir="install/windows/tmp" />
@@ -512,7 +517,7 @@
        and Sweet Home 3D libraries. 
        CAUTION : May be run only under Mac OS X and requires Disk Utility -->
   <target name="macosxInstaller" depends="application,furniture,textures,help"
-  	      description="Builds install/SweetHome3D-version-macosx.dmg archive">
+          description="Builds install/SweetHome3D-version-macosx.dmg archive">
     <!-- Copy Sweet Home 3D files to install/macosx/SweetHome3D-version/Sweet Home 3D.app -->
     <mkdir dir="install/macosx/SweetHome3D-${version}/"/>
     <copy todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app">
@@ -560,9 +565,10 @@
     <copy file="LICENSE.TXT" todir="install/macosx/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"     todir="install/macosx/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-LOADER3DS.TXT"  todir="install/macosx/SweetHome3D-${version}" />
+    <copy file="THIRDPARTY-LICENSE-BATIK.TXT"      todir="install/macosx/SweetHome3D-${version}"/>
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT"  todir="install/macosx/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"   todir="install/macosx/SweetHome3D-${version}" />
-  	<copy file="THIRDPARTY-LICENSE-JMF.HTML"       todir="install/macosx/SweetHome3D-${version}"/>
+    <copy file="THIRDPARTY-LICENSE-JMF.HTML"       todir="install/macosx/SweetHome3D-${version}"/>
     <copy file="THIRDPARTY-LICENSE-TANGO.TXT"      todir="install/macosx/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-CONTRIBUTIONS.TXT"   todir="install/macosx/SweetHome3D-${version}" />
  
@@ -584,9 +590,9 @@
 
   <!-- Builds install/SweetHome3D-version-linux-x86.tgz archive that contains SweetHome3D command
        with a Linux JRE and Sweet Home 3D libraries.
-       CAUTION : Requires a Linux 32 bits JRE installed in jre1.6.0_26 -->
+       CAUTION : Requires a Linux 32 bits JRE installed in jre1.6.0_30 -->
   <target name="linux32Installer" depends="application,furniture,textures,help"
-  	      description="Builds install/SweetHome3D-version-linux-x86.tgz archive">
+          description="Builds install/SweetHome3D-version-linux-x86.tgz archive">
     <!-- Copy SweetHome3D.jar and Linux Java 3D DLLs and JARs for Java 3D 
          to install/linux/i386/SweetHome3D-version/lib -->
     <mkdir dir="install/linux/i386/SweetHome3D-${version}/lib"/>
@@ -613,17 +619,18 @@
     <copy file="THIRDPARTY-LICENSE-JAVA.TXT"      todir="install/linux/i386/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"    todir="install/linux/i386/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-LOADER3DS.TXT" todir="install/linux/i386/SweetHome3D-${version}" />
+    <copy file="THIRDPARTY-LICENSE-BATIK.TXT"     todir="install/linux/i386/SweetHome3D-${version}"/>
     <copy file="THIRDPARTY-LICENSE-ITEXT.TXT"     todir="install/linux/i386/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT" todir="install/linux/i386/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"   todir="install/linux/i386/SweetHome3D-${version}" />
-  	<copy file="THIRDPARTY-LICENSE-JMF.HTML"      todir="install/linux/i386/SweetHome3D-${version}"/>
+    <copy file="THIRDPARTY-LICENSE-JMF.HTML"      todir="install/linux/i386/SweetHome3D-${version}"/>
     <copy file="THIRDPARTY-LICENSE-TANGO.TXT"     todir="install/linux/i386/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-CONTRIBUTIONS.TXT"  todir="install/linux/i386/SweetHome3D-${version}" />
 
     <!-- Copy JRE to install/linux/i386/SweetHome3D-version/jre... excluding files mentioned 
          in JRE README.TXT file (JRE bin/java command excepted) -->
-    <copy todir="install/linux/i386/SweetHome3D-${version}/jre1.6.0_26">
-      <fileset dir="jre1.6.0_26">
+    <copy todir="install/linux/i386/SweetHome3D-${version}/jre1.6.0_30">
+      <fileset dir="jre1.6.0_30">
         <include name="**"/>
 
         <exclude name="lib/ext/sunjce_provider.jar"/>
@@ -643,12 +650,12 @@
       <tarfileset dir="install/linux/i386"
                   includes="SweetHome3D-${version}/**">
         <exclude name="SweetHome3D-${version}/SweetHome3D"/>
-        <exclude name="SweetHome3D-${version}/jre1.6.0_26/bin/java"/>
+        <exclude name="SweetHome3D-${version}/jre1.6.0_30/bin/java"/>
       </tarfileset>
       <!-- Change executable permission of SweetHome3D and java commands -->
       <tarfileset dir="install/linux/i386" mode="755">
         <include name="SweetHome3D-${version}/SweetHome3D"/>
-        <include name="SweetHome3D-${version}/jre1.6.0_26/bin/java"/>
+        <include name="SweetHome3D-${version}/jre1.6.0_30/bin/java"/>
       </tarfileset>
     </tar>
 
@@ -661,9 +668,9 @@
 
   <!-- Builds install/SweetHome3D-version-linux-x64.tgz archive that contains SweetHome3D command
        with a Linux JRE and Sweet Home 3D libraries.
-       CAUTION : Requires a Linux 64 bits JRE installed in jre1.6.0_26 -->
+       CAUTION : Requires a Linux 64 bits JRE installed in jre1.6.0_30 -->
   <target name="linux64Installer" depends="application,furniture,textures,help"
-  	      description="Builds install/SweetHome3D-version-linux-x64.tgz archive">
+          description="Builds install/SweetHome3D-version-linux-x64.tgz archive">
     <!-- Copy SweetHome3D.jar and Linux Java 3D DLLs and JARs for Java 3D 
          to install/linux/x64/SweetHome3D-version/lib -->
     <mkdir dir="install/linux/x64/SweetHome3D-${version}/lib"/>
@@ -690,17 +697,18 @@
     <copy file="THIRDPARTY-LICENSE-JAVA.TXT"      todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"    todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-LOADER3DS.TXT" todir="install/linux/x64/SweetHome3D-${version}" />
+    <copy file="THIRDPARTY-LICENSE-BATIK.TXT"     todir="install/linux/x64/SweetHome3D-${version}"/>
     <copy file="THIRDPARTY-LICENSE-ITEXT.TXT"     todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT" todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"   todir="install/linux/x64/SweetHome3D-${version}" />
-  	<copy file="THIRDPARTY-LICENSE-JMF.HTML"      todir="install/linux/x64/SweetHome3D-${version}"/>
+    <copy file="THIRDPARTY-LICENSE-JMF.HTML"      todir="install/linux/x64/SweetHome3D-${version}"/>
     <copy file="THIRDPARTY-LICENSE-TANGO.TXT"     todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-CONTRIBUTIONS.TXT"  todir="install/linux/x64/SweetHome3D-${version}" />
 
     <!-- Copy JRE to install/linux/x64/SweetHome3D-version/jre... excluding files mentioned 
          in JRE README.TXT file (JRE bin/java command excepted) -->
-    <copy todir="install/linux/x64/SweetHome3D-${version}/jre1.6.0_26">
-      <fileset dir="jre1.6.0_26">
+    <copy todir="install/linux/x64/SweetHome3D-${version}/jre1.6.0_30">
+      <fileset dir="jre1.6.0_30">
         <include name="**"/>
 
         <exclude name="lib/ext/sunjce_provider.jar"/>
@@ -720,12 +728,12 @@
       <tarfileset dir="install/linux/x64"
                   includes="SweetHome3D-${version}/**">
         <exclude name="SweetHome3D-${version}/SweetHome3D"/>
-        <exclude name="SweetHome3D-${version}/jre1.6.0_26/bin/java"/>
+        <exclude name="SweetHome3D-${version}/jre1.6.0_30/bin/java"/>
       </tarfileset>
       <!-- Change executable permission of SweetHome3D and java commands -->
       <tarfileset dir="install/linux/x64" mode="755">
         <include name="SweetHome3D-${version}/SweetHome3D"/>
-        <include name="SweetHome3D-${version}/jre1.6.0_26/bin/java"/>
+        <include name="SweetHome3D-${version}/jre1.6.0_30/bin/java"/>
       </tarfileset>
     </tar>
 
@@ -739,34 +747,34 @@
   <!-- Builds install/SweetHome3DViewer-version.zip archive that contains 
        the files required for SweetHome3DViewer applet -->
   <target name="viewerInstaller" depends="viewer"
-  	      description="Builds install/SweetHome3DViewer-version.zip archive">
+          description="Builds install/SweetHome3DViewer-version.zip archive">
     <zip destfile="install/SweetHome3DViewer-${version}.zip">
       <zipfileset dir="deploy" 
                   includes="lib/**, SweetHome3DViewer.*"/>
       <zipfileset dir="install/viewer" 
                   includes="README.TXT"/>
       <zipfileset dir=".">
-     	<include name="COPYING.TXT"/>
-      	<include name="LICENSE.TXT"/>
-		<include name="THIRDPARTY-LICENSE-JAVA3D.TXT"/>
-      	<include name="THIRDPARTY-LICENSE-LOADER3DS.TXT"/>
+       <include name="COPYING.TXT"/>
+        <include name="LICENSE.TXT"/>
+        <include name="THIRDPARTY-LICENSE-JAVA3D.TXT"/>
+        <include name="THIRDPARTY-LICENSE-LOADER3DS.TXT"/>
       </zipfileset>
     </zip>
-  	
+
     <echo message="install/SweetHome3DViewer-${version}.zip ready for ftp"/>
   </target>
 
   <!-- Builds install/SweetHome3D-version-src.zip archive that contains 
        SweetHome3D source files in directory named SweetHome3D-version-src -->
   <target name="sourceArchive"
-  	      description="Builds install/SweetHome3D-version-src.zip archive">
+          description="Builds install/SweetHome3D-version-src.zip archive">
     <mkdir dir="install/source/SweetHome3D-${version}-src"/>
     <copy todir="install/source/SweetHome3D-${version}-src">
       <fileset dir=".">
         <include name="build.xml"/>
         <include name="*.TXT"/>
         <include name="THIRDPARTY-LICENSE-*.HTML"/>
-      	<include name="*-diff.zip"/>
+        <include name="*-diff.zip"/>
         <include name="src/**"/>
         <include name="test/**"/>
         <include name="lib/**"/>
@@ -798,7 +806,7 @@
   <!-- Builds install/SweetHome3D-version-javadoc.zip archive that contains 
        SweetHome3D source files in directory named SweetHome3D-version-src -->
   <target name="javadoc"
-  	      description="Builds install/SweetHome3D-version-javadoc.zip archive">
+          description="Builds install/SweetHome3D-version-javadoc.zip archive">
     <mkdir dir="install/javadoc/SweetHome3D-${version}-javadoc"/>
     <javadoc sourcepath="src" destdir="install/javadoc/SweetHome3D-${version}-javadoc" 
              encoding="ISO-8859-1" version="true" author="true" use="true"
@@ -832,7 +840,7 @@
 
   <!-- Launchs a JDepend graphical UI to help update dependencies in PackageDependenciesTest test -->
   <target name="jdepend" depends="build"
-  	      description="Launchs a JDepend graphical UI">
+          description="Launchs a JDepend graphical UI">
     <!-- Create jdepend.properties file in build directory that specifies ignored Java packages -->
     <concat destfile="build/jdepend.properties">ignore.java=java.*,javax.swing.*</concat>
 
diff -Nru sweethome3d-3.3+dfsg/ChangeLog sweethome3d-3.4+dfsg/ChangeLog
--- sweethome3d-3.3+dfsg/ChangeLog	2011-08-03 21:57:44.000000000 +0000
+++ sweethome3d-3.4+dfsg/ChangeLog	2012-01-08 23:53:22.000000000 +0000
@@ -3,6 +3,65 @@
      Read this page to get more information about Sweet Home 3D versions
                                   history.
 
+ Version 3.4, December 20, 2011
+
+     * Added Plan > Add level / Modify level / Delete level menu items to
+       support multiple levels with possible intermediate levels and/or
+       levels at negative elevation.
+     * Added 3D view > Display all levels / Display selected level menu
+       items.
+     * Added the New floors thickness field in preferences pane.
+     * Added a new property for staircases in furniture catalog to define
+       the shape used to cut out the ceiling and the floor of upper levels
+       when they intersect with a staircase.
+     * Added a Staircase check box in Import furniture wizard and in
+       Furniture Library Editor.
+     * Reused the walls transparency value to make transparent floors and
+       ceilings of upper levels as well.
+     * Enabled the virtual visitor to go below elevation 0 to visit
+       underground levels.
+     * Improved ground management to be able to handle elevations up to
+       100m without seeing a black line at the horizon.
+     * Added a button in preferences pane to import language libraries.
+     * Improved drawing magnetism of walls and rooms.
+     * Increased magnetism sensitivity.
+     * Added Select object submenu in the contextual menu of the plan that
+       will let the user select an object among the superimposed ones at
+       the point where he right clicked.
+     * Added the ability to directly change the visibility of piece of
+       furniture by clicking on its visible check box in the furniture
+       table.
+     * Added support for auto completion in the name text fields displayed
+       modification panes (suggested texts comes from previous entered
+       texts and are saved in preferences).
+     * Added the ability to fine tune the orientation of a 3D model at the
+       second step of its importation.
+     * Improved performances when using textures.
+     * Added support for unsigned applets when run without 3D feature and
+       furniture/textures listed in plugin files.
+     * Fixed drag and support from catalog to plan or furniture list in
+       the online version run with Plugin2 under Mac OS X or with OpenJDK
+       under Linux.
+     * Fixed a bug that prevented to view dialog boxes placed out of the
+       main screen after a configuration change in a multi screen
+       environment.
+     * Fixed a bug that prevented to open Furniture import wizard on an
+       screen different from the main screen, or to view the online
+       version in a browser placed out of the main screen.
+     * Fixed a bug that wrongly shifted the texture applied on an object
+       with a 3D model file not placed at the origin (this bug fix will be
+       applied only to texture changes made from this version to ensure
+       existing designs won't look different when a circumvent tip was
+       used).
+     * Fixed a bug that displayed a texture as inverted when applied to
+       the left side of a wall.
+     * Fixed a bug that reset 3D view aspect ratio in photo creation
+       dialog box after a camera change.
+     * Updated English, French, German and Bulgarian help pages.
+     * Replaced JRE 6u26 by JRE 6u30 in Sweet Home 3D installers bundled
+       with Java.
+     * Other minor bugs fixes and enhancements.
+
  Version 3.3, July 26, 2011
 
      * Improved the precision of alignement lines.
@@ -321,7 +380,7 @@
        with Java.
      * Added Japanese localization written by Takahiro Sato.
      * Added Vietnamese localization of the user interface written by
-       Phùng Lê Tuấn.
+       Phùng Lê Tuấn.
      * Other minor bugs fixes and enhancements.
 
  Version 2.0, June 6, 2009
diff -Nru sweethome3d-3.3+dfsg/.classpath sweethome3d-3.4+dfsg/.classpath
--- sweethome3d-3.3+dfsg/.classpath	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/.classpath	2011-12-21 00:48:48.000000000 +0000
@@ -10,6 +10,7 @@
 	<classpathentry kind="lib" path="lib/Loader3DS1_2u.jar"/>
 	<classpathentry kind="lib" path="lib/sunflow-0.07.3g.jar"/>
 	<classpathentry kind="lib" path="lib/jmf.jar"/>
+	<classpathentry kind="lib" path="lib/batik-svgpathparser-1.7.jar"/>
 	<classpathentry kind="lib" path="libtest/abbot.jar"/>
 	<classpathentry kind="lib" path="libtest/jdom-1.0.jar"/>
 	<classpathentry kind="lib" path="libtest/gnu-regexp-1.1.0.jar"/>
diff -Nru sweethome3d-3.3+dfsg/debian/changelog sweethome3d-3.4+dfsg/debian/changelog
--- sweethome3d-3.3+dfsg/debian/changelog	2011-08-07 22:59:57.000000000 +0000
+++ sweethome3d-3.4+dfsg/debian/changelog	2012-01-28 02:43:50.000000000 +0000
@@ -1,3 +1,12 @@
+sweethome3d (3.4+dfsg-1) unstable; urgency=low
+
+  * New upstream release (Closes: #654989).
+  * Add libbatik-java as build and runtime dep.
+  * Replace dep on icedtea-netx with icedtea-netx-common.
+  * Fix d/copyright.
+
+ -- Gabriele Giacone <1o5g4r8o@gmail.com>  Sat, 28 Jan 2012 02:37:57 +0000
+
 sweethome3d (3.3+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru sweethome3d-3.3+dfsg/debian/control sweethome3d-3.4+dfsg/debian/control
--- sweethome3d-3.3+dfsg/debian/control	2011-08-07 22:59:57.000000000 +0000
+++ sweethome3d-3.4+dfsg/debian/control	2012-01-28 02:43:50.000000000 +0000
@@ -3,10 +3,16 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Gabriele Giacone <1o5g4r8o@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), ant
-Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk, libjava3d-java, imagemagick,
- libsunflow-java (>= 0.07.2.svn396+dfsg-9), java3ds-fileloader, libitext-java,
- libfreehep-graphicsio-svg-java, icedtea-netx
+Build-Depends: ant, debhelper (>= 7.0.50~)
+Build-Depends-Indep: icedtea-netx-common,
+                     imagemagick,
+                     java3ds-fileloader,
+                     libfreehep-graphicsio-svg-java,
+                     libitext-java,
+                     libjava3d-java,
+                     libsunflow-java (>= 0.07.2.svn396+dfsg-9),
+                     libbatik-java,
+                     openjdk-6-jdk | sun-java6-jdk
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/pkg-java/sweethome3d.git
@@ -15,9 +21,16 @@
 
 Package: sweethome3d
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre, java-wrappers,
- libjava3d-java, libsunflow-java (>= 0.07.2.svn396+dfsg-9), java3ds-fileloader,
- libitext-java, libfreehep-graphicsio-svg-java, icedtea-netx
+Depends: icedtea-netx-common | sun-java6-bin,
+         java-wrappers,
+         java3ds-fileloader,
+         libfreehep-graphicsio-svg-java,
+         libitext-java,
+         libjava3d-java,
+         libsunflow-java (>= 0.07.2.svn396+dfsg-9),
+         libbatik-java,
+         openjdk-6-jre | sun-java6-jre,
+         ${misc:Depends}
 Description: Interior 2D design application with 3D preview
  Sweet Home 3D is an interior design Java application for
  quickly choosing and placing furniture on a house 2D plan
diff -Nru sweethome3d-3.3+dfsg/debian/copyright sweethome3d-3.4+dfsg/debian/copyright
--- sweethome3d-3.3+dfsg/debian/copyright	2011-08-07 22:59:57.000000000 +0000
+++ sweethome3d-3.4+dfsg/debian/copyright	2012-01-28 02:43:50.000000000 +0000
@@ -1,20 +1,22 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Sweet Home 3D - Interior 2D design application with 3D preview
-Maintainer: Emmanuel Puybaret, eTeks <info@eteks.com>
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Upstream-Name: Sweet Home 3D - Interior 2D design application with 3D preview
+Upstream-Contact: Emmanuel Puybaret, eTeks <info@eteks.com>
 Source: http://www.sweethome3d.com/
 
+Files: *
 Copyright: 2006-2011, Emmanuel Puybaret, eTeks <info@eteks.com>
 License: GPL-2+
-On Debian systems the full text of the GNU General Public 
-License can be found in the `/usr/share/common-licenses/GPL-2'
-file.
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
 
 Files: src/com/eteks/sweethome3d/swing/resources/icons/tango/*
-License: Public domain
+Copyright: Public Domain
+License: public-domain
+ Tango theme toolbar and menus icons included as part of this product are in
+ public domain.
 
 Files: debian/*
 Copyright: 2011, Gabriele Giacone <1o5g4r8o@gmail.com>
 License: GPL-2+
-On Debian systems the full text of the GNU General Public 
-License can be found in the `/usr/share/common-licenses/GPL-2'
-file.
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
diff -Nru sweethome3d-3.3+dfsg/debian/patches/04manifest sweethome3d-3.4+dfsg/debian/patches/04manifest
--- sweethome3d-3.3+dfsg/debian/patches/04manifest	2011-08-07 22:59:57.000000000 +0000
+++ sweethome3d-3.4+dfsg/debian/patches/04manifest	2012-01-28 02:43:50.000000000 +0000
@@ -9,4 +9,4 @@
 -Main-Class: com.eteks.sweethome3d.SweetHome3DBootstrap
 \ No newline at end of file
 +Main-Class: com.eteks.sweethome3d.SweetHome3DBootstrap
-+Class-Path: libjava3d-java libsunflow-java libitext-java libfreehep-graphicsio-svg-java
++Class-Path: /usr/share/java/j3dcore.jar /usr/share/java/j3dutils.jar /usr/share/java/vecmath.jar /usr/share/java/java3ds-fileloader.jar /usr/share/java/sunflow.jar /usr/share/java/itext.jar /usr/share/java/janino.jar /usr/share/java/freehep-util.jar /usr/share/java/freehep-io.jar /usr/share/java/freehep-xml.jar /usr/share/java/freehep-graphics2d.jar /usr/share/java/freehep-graphicsio.jar /usr/share/java/freehep-graphicsio-svg.jar /usr/share/icedtea-web/netx.jar /usr/lib/jvm/java-6-sun/jre/lib/javaws.jar
diff -Nru sweethome3d-3.3+dfsg/debian/README.source sweethome3d-3.4+dfsg/debian/README.source
--- sweethome3d-3.3+dfsg/debian/README.source	2011-08-07 22:59:57.000000000 +0000
+++ sweethome3d-3.4+dfsg/debian/README.source	2012-01-28 02:43:50.000000000 +0000
@@ -29,6 +29,7 @@
 
  o The following binary files have been removed from upstream tarball:
 
+ - lib/batik-svgpathparser-1.7.jar
  - lib/freehep-vectorgraphics-svg-2.1.1.jar
  - lib/iText-2.1.7.jar
  - lib/j3dcore.jar
diff -Nru sweethome3d-3.3+dfsg/debian/sweethome3d.install sweethome3d-3.4+dfsg/debian/sweethome3d.install
--- sweethome3d-3.3+dfsg/debian/sweethome3d.install	2011-08-07 22:59:57.000000000 +0000
+++ sweethome3d-3.4+dfsg/debian/sweethome3d.install	2012-01-28 02:43:50.000000000 +0000
@@ -7,4 +7,3 @@
 debian/icons/48/sweethome3d.png		usr/share/icons/hicolor/48x48/apps
 debian/icons/128/sweethome3d.png	usr/share/icons/hicolor/128x128/apps
 debian/icons/sweethome3d.xpm		usr/share/pixmaps
-
diff -Nru sweethome3d-3.3+dfsg/debian/sweethome3d.sh sweethome3d-3.4+dfsg/debian/sweethome3d.sh
--- sweethome3d-3.3+dfsg/debian/sweethome3d.sh	2011-08-07 22:59:57.000000000 +0000
+++ sweethome3d-3.4+dfsg/debian/sweethome3d.sh	2012-01-28 02:43:50.000000000 +0000
@@ -8,7 +8,7 @@
 
 find_java_runtime java6
 
-find_jars j3dcore j3dutils vecmath java3ds-fileloader
+find_jars j3dcore j3dutils vecmath java3ds-fileloader batik
 find_jars sunflow itext janino freehep-util freehep-io freehep-xml
 find_jars freehep-graphics2d freehep-graphicsio freehep-graphicsio-svg
 find_jars /usr/share/sweethome3d/sweethome3d.jar
diff -Nru sweethome3d-3.3+dfsg/deploy/SweetHome3DApplet.html sweethome3d-3.4+dfsg/deploy/SweetHome3DApplet.html
--- sweethome3d-3.3+dfsg/deploy/SweetHome3DApplet.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/deploy/SweetHome3DApplet.html	2011-12-21 00:48:48.000000000 +0000
@@ -31,7 +31,7 @@
 
 <script>
   var javaMinimumVersion = "1.6.0_10"; // The first version with Java Plugin 2
-  var jars = "lib/SweetHome3DApplet.jar,lib/Loader3DS1_2u.jar,lib/jnlp.jar";
+  var jars = "lib/SweetHome3DApplet.jar,lib/Loader3DS1_2u.jar,lib/batik-svgpathparser-1.7.jar,lib/jnlp.jar";
   // Append Jars depending on the platform
   if (navigator.platform.match("Win.*")) {
     if (navigator.platform.match(".*64")) {
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/deploy/SweetHome3DIcon32x32.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/deploy/SweetHome3DIcon32x32.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/deploy/SweetHome3DIcon48x48.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/deploy/SweetHome3DIcon48x48.png differ
diff -Nru sweethome3d-3.3+dfsg/deploy/SweetHome3D.jnlp sweethome3d-3.4+dfsg/deploy/SweetHome3D.jnlp
--- sweethome3d-3.3+dfsg/deploy/SweetHome3D.jnlp	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/deploy/SweetHome3D.jnlp	2011-12-21 00:48:48.000000000 +0000
@@ -9,6 +9,8 @@
     <description>Sweet Home 3D</description>
     <description kind="short">Arrange the furniture of your house</description>
     <icon href="SweetHome3DIcon.gif"/>
+    <icon kind="shortcut" href="SweetHome3DIcon32x32.png" width="32" height="32"/>
+    <icon kind="shortcut" href="SweetHome3DIcon48x48.png" width="48" height="48"/>
     <icon kind="splash" href="SweetHome3DSplashScreen.jpg"/>
     <offline-allowed/>
     <shortcut online="false">
@@ -56,11 +58,12 @@
   <resources>
     <j2se version="1.5+" max-heap-size="512m"/>
     <jar href="lib/SweetHome3DJavaWebStartBootstrap.jar"/>
-    <jar href="lib/SweetHome3D.jar"     part="SweetHome3D" download="lazy"/>
-    <jar href="lib/Loader3DS1_2u.jar"   part="Loader3DS"   download="lazy"/>
-    <jar href="lib/freehep-vectorgraphics-svg-2.1.1.jar" part="FreeHep" download="lazy"/>
-    <jar href="lib/sunflow-0.07.3g.jar" part="SunFlow"     download="lazy"/>    
-    <jar href="lib/jmf.jar"             part="JMF"         download="lazy"/>    
+    <jar href="lib/SweetHome3D.jar"                      part="SweetHome3D" download="lazy"/>
+    <jar href="lib/Loader3DS1_2u.jar"                    part="Loader3DS"   download="lazy"/>
+    <jar href="lib/batik-svgpathparser-1.7.jar"          part="Batik"       download="lazy"/>
+    <jar href="lib/freehep-vectorgraphics-svg-2.1.1.jar" part="FreeHep"     download="lazy"/>
+    <jar href="lib/sunflow-0.07.3g.jar"                  part="SunFlow"     download="lazy"/>    
+    <jar href="lib/jmf.jar"                              part="JMF"         download="lazy"/>    
     <property name="com.eteks.sweethome3d.deploymentInformation" value="Java Web Start"/>
   </resources>
  
diff -Nru sweethome3d-3.3+dfsg/deploy/SweetHome3DViewer.html sweethome3d-3.4+dfsg/deploy/SweetHome3DViewer.html
--- sweethome3d-3.3+dfsg/deploy/SweetHome3DViewer.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/deploy/SweetHome3DViewer.html	2011-12-21 00:48:48.000000000 +0000
@@ -21,7 +21,7 @@
 </script>
 <script>
   var javaMinimumVersion = "1.6.0_10"; // The first version with Java Plugin 2
-  var jars = "lib/SweetHome3DViewer.jar,lib/Loader3DS1_2u.jar";
+  var jars = "lib/SweetHome3DViewer.jar,lib/Loader3DS1_2u.jar,lib/batik-svgpathparser-1.7.jar";
   // Append Java 3D Jars depending on the platform
   if (navigator.platform.match("Win.*")) {
     if (navigator.platform.match(".*64")) {
diff -Nru sweethome3d-3.3+dfsg/install/linux/SweetHome3D sweethome3d-3.4+dfsg/install/linux/SweetHome3D
--- sweethome3d-3.3+dfsg/install/linux/SweetHome3D	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/install/linux/SweetHome3D	2011-12-21 00:48:48.000000000 +0000
@@ -8,4 +8,4 @@
 PROGRAM_DIR=`dirname "$PROGRAM"`
 
 # Run Sweet Home 3D
-exec "$PROGRAM_DIR"/jre1.6.0_26/bin/java -Xmx1024m -classpath "$PROGRAM_DIR"/lib/SweetHome3D.jar:"$PROGRAM_DIR"/lib/Furniture.jar:"$PROGRAM_DIR"/lib/Textures.jar:"$PROGRAM_DIR"/lib/Help.jar:"$PROGRAM_DIR"/lib/Loader3DS1_2u.jar:"$PROGRAM_DIR"/lib/iText-2.1.7.jar:"$PROGRAM_DIR"/lib/freehep-vectorgraphics-svg-2.1.1.jar:"$PROGRAM_DIR"/lib/sunflow-0.07.3g.jar:"$PROGRAM_DIR"/lib/jmf.jar:"$PROGRAM_DIR"/lib/j3dcore.jar:"$PROGRAM_DIR"/lib/j3dutils.jar:"$PROGRAM_DIR"/lib/vecmath.jar:"$PROGRAM_DIR"/jre1.6.0_26/lib/javaws.jar -Djava.library.path="$PROGRAM_DIR"/lib com.eteks.sweethome3d.SweetHome3D -open $1
+exec "$PROGRAM_DIR"/jre1.6.0_30/bin/java -Xmx1024m -classpath "$PROGRAM_DIR"/lib/SweetHome3D.jar:"$PROGRAM_DIR"/lib/Furniture.jar:"$PROGRAM_DIR"/lib/Textures.jar:"$PROGRAM_DIR"/lib/Help.jar:"$PROGRAM_DIR"/lib/Loader3DS1_2u.jar:"$PROGRAM_DIR"/lib/iText-2.1.7.jar:"$PROGRAM_DIR"/lib/freehep-vectorgraphics-svg-2.1.1.jar:"$PROGRAM_DIR"/lib/sunflow-0.07.3g.jar:"$PROGRAM_DIR"/lib/jmf.jar:"$PROGRAM_DIR"/lib/batik-svgpathparser-1.7.jar:"$PROGRAM_DIR"/lib/j3dcore.jar:"$PROGRAM_DIR"/lib/j3dutils.jar:"$PROGRAM_DIR"/lib/vecmath.jar:"$PROGRAM_DIR"/jre1.6.0_30/lib/javaws.jar -Djava.library.path="$PROGRAM_DIR"/lib com.eteks.sweethome3d.SweetHome3D -open $1
diff -Nru sweethome3d-3.3+dfsg/install/macosx/Sweet Home 3D/Contents/Info.plist sweethome3d-3.4+dfsg/install/macosx/Sweet Home 3D/Contents/Info.plist
--- sweethome3d-3.3+dfsg/install/macosx/Sweet Home 3D/Contents/Info.plist	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/install/macosx/Sweet Home 3D/Contents/Info.plist	2011-12-21 00:48:48.000000000 +0000
@@ -3,11 +3,11 @@
 <plist version="0.9">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Sweet Home 3D 3.3 Copyright 2007-2011 eTeks</string>
+	<string>Sweet Home 3D 3.4 Copyright 2007-2011 eTeks</string>
 	<key>CFBundleVersion</key>
-	<string>3.3</string>
+	<string>3.4</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3</string>
+	<string>3.4</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -231,6 +231,7 @@
 			<string>$JAVAROOT/freehep-vectorgraphics-svg-2.1.1.jar</string>
 			<string>$JAVAROOT/sunflow-0.07.3g.jar</string>
 			<string>$JAVAROOT/Loader3DS1_2u.jar</string>
+			<string>$JAVAROOT/batik-svgpathparser-1.7.jar</string>
 		</array>
 		<key>Properties</key>
 		<dict>
diff -Nru sweethome3d-3.3+dfsg/install/windows/installerInnoSetup.iss sweethome3d-3.4+dfsg/install/windows/installerInnoSetup.iss
--- sweethome3d-3.3+dfsg/install/windows/installerInnoSetup.iss	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/install/windows/installerInnoSetup.iss	2011-12-21 00:48:48.000000000 +0000
@@ -2,7 +2,7 @@
 ;
 ; Sweet Home 3D, Copyright (c) 2007-2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
 ;
-; SweetHome3D-3.3-windows.exe setup program creator
+; SweetHome3D-3.4-windows.exe setup program creator
 ; This script requires Inno setup available at http://www.jrsoftware.org/isinfo.php
 ; and a tmp directory stored in current directory containing :
 ;   a SweetHome3D.exe file built with launch4j
@@ -13,7 +13,7 @@
 
 [Setup]
 AppName=Sweet Home 3D
-AppVerName=Sweet Home 3D version 3.3
+AppVerName=Sweet Home 3D version 3.4
 AppPublisher=eTeks
 AppPublisherURL=http://www.eteks.com
 AppSupportURL=http://sweethome3d.sourceforge.net
@@ -22,12 +22,12 @@
 DefaultGroupName=eTeks Sweet Home 3D
 LicenseFile=..\..\COPYING.TXT
 OutputDir=.
-OutputBaseFilename=..\SweetHome3D-3.3-windows
+OutputBaseFilename=..\SweetHome3D-3.4-windows
 Compression=lzma
 SolidCompression=yes
 ChangesAssociations=yes
-VersionInfoVersion=3.3.0.0
-VersionInfoTextVersion=3.3
+VersionInfoVersion=3.4.0.0
+VersionInfoTextVersion=3.4
 VersionInfoDescription=Sweet Home 3D Setup
 VersionInfoCopyright=Copyright (c) 2007-2011 eTeks
 VersionInfoCompany=eTeks
diff -Nru sweethome3d-3.3+dfsg/install/windows/installerLaunch4j.xml sweethome3d-3.4+dfsg/install/windows/installerLaunch4j.xml
--- sweethome3d-3.3+dfsg/install/windows/installerLaunch4j.xml	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/install/windows/installerLaunch4j.xml	2011-12-21 00:48:48.000000000 +0000
@@ -6,7 +6,7 @@
      This script requires launch4j available at http://launch4j.sourceforge.net/     
      and a SweetHome3D.ico file containing Sweet Home 3D icon.
      It creates a SweetHome3D.exe in tmp directory running with
-     JRE 6 Update 26 stored in jre6 subdirectory 
+     JRE 6 Update 30 stored in jre6 subdirectory 
      + SweetHome3D.jar, Windows Java 3D DLLs and JARs for Java 3D and other required JARs 
        stored in a lib subdirectory -->
 <launch4jConfig>
@@ -30,6 +30,7 @@
     <cp>lib/Textures.jar</cp>
     <cp>lib/Help.jar</cp>
     <cp>lib/Loader3DS1_2u.jar</cp>
+    <cp>lib/batik-svgpathparser-1.7.jar</cp>
     <cp>lib/iText-2.1.7.jar</cp>
     <cp>lib/freehep-vectorgraphics-svg-2.1.1.jar</cp>
     <cp>lib/sunflow-0.07.3g.jar</cp>
@@ -49,12 +50,12 @@
     <opt>-Djava.library.path=lib -Xmx512m</opt>
   </jre>
   <versionInfo>
-    <fileVersion>3.3.0.0</fileVersion>
-    <txtFileVersion>3.3</txtFileVersion>
+    <fileVersion>3.4.0.0</fileVersion>
+    <txtFileVersion>3.4</txtFileVersion>
     <fileDescription>Sweet Home 3D</fileDescription>
     <copyright>Copyright (c) 2007-2011 eTeks</copyright>
-    <productVersion>3.3.0.0</productVersion>
-    <txtProductVersion>3.3</txtProductVersion>
+    <productVersion>3.4.0.0</productVersion>
+    <txtProductVersion>3.4</txtProductVersion>
     <productName>Sweet Home 3D</productName>
     <companyName>eTeks</companyName>
     <internalName>SweetHome3D</internalName>
diff -Nru sweethome3d-3.3+dfsg/LICENSE.TXT sweethome3d-3.4+dfsg/LICENSE.TXT
--- sweethome3d-3.3+dfsg/LICENSE.TXT	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/LICENSE.TXT	2011-12-21 00:48:48.000000000 +0000
@@ -1,4 +1,4 @@
-Sweet Home 3D version 3.3, Copyright (c) 2005-2011 Emmanuel PUYBARET / eTeks
+Sweet Home 3D version 3.4, Copyright (c) 2005-2011 Emmanuel PUYBARET / eTeks
  
 This software is licensed by Emmanuel PUYBARET / eTeks under GNU General Public License.
 Please, read COPYING.TXT file for more details about GNU General Public License.
diff -Nru sweethome3d-3.3+dfsg/README.TXT sweethome3d-3.4+dfsg/README.TXT
--- sweethome3d-3.3+dfsg/README.TXT	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/README.TXT	2011-12-21 00:48:48.000000000 +0000
@@ -1,4 +1,4 @@
-SWEET HOME 3D v 3.3
+SWEET HOME 3D v 3.4
 -------------------
 
 This archive contains source code of Sweet Home 3D, an interior design Java application.
@@ -7,7 +7,7 @@
 
 You may also download this source code with the following CVS command:
 
-cvs -z3 -d:pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d co -P -r V_3_3 SweetHome3D
+cvs -z3 -d:pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d co -P -r V_3_4 SweetHome3D
 
 
 HOW TO USE THIS SOURCE CODE
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/AppletApplication.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/AppletApplication.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/AppletApplication.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/AppletApplication.java	2011-12-21 00:48:50.000000000 +0000
@@ -32,6 +32,7 @@
 import java.beans.PropertyChangeListener;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -126,28 +127,21 @@
 
     URL codeBase = applet.getCodeBase();
 
-    // Force offscreen in 3D view under Plugin 2 and Mac OS X
-    System.setProperty("com.eteks.sweethome3d.j3d.useOffScreen3DView", 
-        String.valueOf(OperatingSystem.isMacOSX()            
-            && applet.getAppletContext() != null
-            && applet.getAppletContext().getClass().getName().startsWith("sun.plugin2.applet.Plugin2Manager")));
-    
-    // If Sweet Home 3D applet is launched from outside of Java Web Start or basic service is unavailable
-    boolean serviceManagerAvailable = ServiceManager.getServiceNames() != null; 
-    if (serviceManagerAvailable) {
-      try { 
-        ServiceManager.lookup("javax.jnlp.BasicService");
-      } catch (UnavailableServiceException ex) {
-        serviceManagerAvailable = false;
-      }
+    try {
+      // Force offscreen in 3D view under Plugin 2 and Mac OS X
+      boolean plugin2 = applet.getAppletContext() != null
+                    && applet.getAppletContext().getClass().getName().startsWith("sun.plugin2.applet.Plugin2Manager");
+      System.setProperty("com.eteks.sweethome3d.j3d.useOffScreen3DView", 
+          String.valueOf(OperatingSystem.isMacOSX() && plugin2));
+      // Use DnD management without transfer handler under Plugin 2 + Mac OS X or OpenJDK + Linux 
+      System.setProperty("com.eteks.sweethome3d.dragAndDropWithoutTransferHandler", 
+          String.valueOf(OperatingSystem.isMacOSX() && plugin2 
+                        || (OperatingSystem.isLinux() && System.getProperty("java.runtime.name", "").startsWith("OpenJDK"))));
+    } catch (AccessControlException ex) {
+      // Unsigned applet
     }
-
-    if (!serviceManagerAvailable) {
-      // Create JNLP services required by Sweet Home 3D 
-      ServiceManager.setServiceManagerStub(
-          new StandaloneServiceManager(applet.getAppletContext(), codeBase));
-      // Caution: setting a new service manager stub won't replace the existing one,
-    }          
+    
+    checkJavaWebStartBasicService(applet, codeBase);          
  
     initLookAndFeel();
    
@@ -213,7 +207,7 @@
         }
       });
   }
-  
+
   /**
    * Deletes open homes and clears all the resources used by this application.
    * This method is called when an applet is destroyed.  
@@ -230,11 +224,16 @@
     }
     // Collect deleted objects (seems to be required under Mac OS X when the applet is being reloaded)
     System.gc();
-    // Stop managers threads
-    IconManager.getInstance().clear();
-    if (!"true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D"))) { 
-      TextureManager.getInstance().clear();
-      ModelManager.getInstance().clear();
+    try {
+      if (!Boolean.getBoolean("com.eteks.sweethome3d.no3D")) { 
+        // Stop managers threads
+        TextureManager.getInstance().clear();
+        ModelManager.getInstance().clear();
+      }
+      IconManager.getInstance().clear();
+    } catch (AccessControlException ex) {
+      // If com.eteks.sweethome3d.no3D property can't be read, 
+      // security manager won't allow to access to Java 3D DLLs required by previous classes too
     }
     // Delete temporary files
     OperatingSystem.deleteTemporaryFiles();
@@ -479,13 +478,23 @@
     addToolBarAction(homeView, HomeView.ActionType.ZOOM_OUT, toolBar);
     addToolBarAction(homeView, HomeView.ActionType.ZOOM_IN, toolBar);
 
-    Action createPhotoAction = getToolBarAction(homeView, HomeView.ActionType.CREATE_PHOTO);
-    if (createPhotoAction != null) {
-      boolean enableCreatePhoto = getAppletBooleanParameter(this.applet, ENABLE_CREATE_PHOTO);
-      controller.getView().setEnabled(HomeView.ActionType.CREATE_PHOTO, enableCreatePhoto);
-      if (enableCreatePhoto) {
-        toolBar.addSeparator();
-        toolBar.add(createPhotoAction);
+    boolean no3D;
+    try {
+      no3D = Boolean.getBoolean("com.eteks.sweethome3d.no3D");
+    } catch (AccessControlException ex) {
+      // If com.eteks.sweethome3d.no3D property can't be read, 
+      // security manager won't allow to access to Java 3D DLLs required to manage 3D too
+      no3D = true;
+    }
+    if (!no3D) {
+      Action createPhotoAction = getToolBarAction(homeView, HomeView.ActionType.CREATE_PHOTO);
+      if (createPhotoAction != null) {
+        boolean enableCreatePhoto = getAppletBooleanParameter(this.applet, ENABLE_CREATE_PHOTO);
+        controller.getView().setEnabled(HomeView.ActionType.CREATE_PHOTO, enableCreatePhoto);
+        if (enableCreatePhoto) {
+          toolBar.addSeparator();
+          toolBar.add(createPhotoAction);
+        }
       }
     }
 
@@ -506,9 +515,9 @@
     controller.getView().setEnabled(HomeView.ActionType.EXPORT_TO_SVG, 
         getAppletBooleanParameter(this.applet, ENABLE_EXPORT_TO_SVG));
     controller.getView().setEnabled(HomeView.ActionType.EXPORT_TO_OBJ, 
-        getAppletBooleanParameter(this.applet, ENABLE_EXPORT_TO_OBJ));
+        getAppletBooleanParameter(this.applet, ENABLE_EXPORT_TO_OBJ) && !no3D);
     controller.getView().setEnabled(HomeView.ActionType.CREATE_VIDEO, 
-        getAppletBooleanParameter(this.applet, ENABLE_CREATE_VIDEO));
+        getAppletBooleanParameter(this.applet, ENABLE_CREATE_VIDEO) && !no3D);
     
     // Add a border
     homeView.setBorder(BorderFactory.createLineBorder(Color.LIGHT_GRAY));
@@ -627,9 +636,13 @@
   public String getVersion() {
     String applicationVersion = getUserPreferences().getLocalizedString(
         AppletApplication.class, "applicationVersion");
-    String versionInformation = System.getProperty("com.eteks.sweethome3d.deploymentInformation");
-    if (versionInformation != null) {
-      applicationVersion += " " + versionInformation;
+    try {
+      String versionInformation = System.getProperty("com.eteks.sweethome3d.deploymentInformation");
+      if (versionInformation != null) {
+        applicationVersion += " " + versionInformation;
+      }
+    } catch (AccessControlException ex) {
+      // Ignore com.eteks.sweethome3d.deploymentInformation property since it can't be read
     }
     return applicationVersion;
   }
@@ -659,21 +672,26 @@
    * to avoid default System exit in case of error during 3D rendering. 
    */
   private void addComponent3DRenderingErrorObserver() {
-    if (!"true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D"))) { 
-      // Instead of adding a RenderingErrorListener directly to VirtualUniverse, 
-      // we add it through Component3DManager, because offscreen rendering needs to check 
-      // rendering errors with its own RenderingErrorListener
-      Component3DManager.getInstance().setRenderingErrorObserver(
-          new Component3DManager.RenderingErrorObserver() {
-            public void errorOccured(int errorCode, String errorMessage) {
-              System.err.print("Error in Java 3D : " + errorCode + " " + errorMessage);
-              EventQueue.invokeLater(new Runnable() {
-                  public void run() {
-                    show3DError();
-                  }
-                });
-            }
-          });
+    try {
+      if (!Boolean.getBoolean("com.eteks.sweethome3d.no3D")) {
+        // Instead of adding a RenderingErrorListener directly to VirtualUniverse, 
+        // we add it through Component3DManager, because offscreen rendering needs to check 
+        // rendering errors with its own RenderingErrorListener
+        Component3DManager.getInstance().setRenderingErrorObserver(
+            new Component3DManager.RenderingErrorObserver() {
+              public void errorOccured(int errorCode, String errorMessage) {
+                System.err.print("Error in Java 3D : " + errorCode + " " + errorMessage);
+                EventQueue.invokeLater(new Runnable() {
+                    public void run() {
+                      show3DError();
+                    }
+                  });
+              }
+            });
+      }
+    } catch (AccessControlException ex) {
+      // If com.eteks.sweethome3d.no3D property can't be read, 
+      // security manager won't allow to access to Java 3D DLLs required by Component3DManager class too
     }
   }
 
@@ -688,6 +706,31 @@
   }
 
   /**
+   * Checks whether Java Web Start basic service is available to be able to display document from the applet.
+   */
+  private void checkJavaWebStartBasicService(final JApplet applet, URL codeBase) {
+    boolean serviceManagerAvailable = ServiceManager.getServiceNames() != null; 
+    if (serviceManagerAvailable) {
+      try { 
+        ServiceManager.lookup("javax.jnlp.BasicService");
+      } catch (Exception ex) {
+        if ("javax.jnlp.UnavailableServiceException".equals(ex.getClass().getName())) {
+          serviceManagerAvailable = false;
+        } else {
+          throw new RuntimeException(ex);
+        }
+      }
+    }
+
+    if (!serviceManagerAvailable) {
+      // Create JNLP services required by Sweet Home 3D 
+      ServiceManager.setServiceManagerStub(
+          new StandaloneServiceManager(applet.getAppletContext(), codeBase));
+      // Caution: setting a new service manager stub won't replace the existing one
+    }
+  }
+
+  /**
    * JNLP <code>ServiceManagerStub</code> implementation for applets 
    * run out of Java Web Start. This service manager supports <code>BasicService</code> only.
    */
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/AppletUserPreferences.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/AppletUserPreferences.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/AppletUserPreferences.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/AppletUserPreferences.java	2011-12-21 00:48:50.000000000 +0000
@@ -71,6 +71,7 @@
   private static final String WALL_PATTERN                     = "wallPattern";
   private static final String NEW_WALL_HEIGHT                  = "newHomeWallHeight";
   private static final String NEW_WALL_THICKNESS               = "newWallThickness";
+  private static final String NEW_FLOOR_THICKNESS              = "newFloorThickness";
   private static final String RECENT_HOMES                     = "recentHomes#";
   private static final String IGNORED_ACTION_TIP               = "ignoredActionTip#";
 
@@ -203,6 +204,8 @@
             String.valueOf(defaultPreferences.getNewWallThickness()))));
     setNewWallHeight(Float.parseFloat(properties.getProperty(NEW_WALL_HEIGHT,
         String.valueOf(defaultPreferences.getNewWallHeight()))));    
+    setNewFloorThickness(Float.parseFloat(properties.getProperty(NEW_FLOOR_THICKNESS, 
+        String.valueOf(defaultPreferences.getNewFloorThickness()))));
     setCurrency(defaultPreferences.getCurrency());    
     // Read recent homes list
     List<String> recentHomes = new ArrayList<String>();
@@ -299,6 +302,7 @@
     properties.setProperty(WALL_PATTERN, getWallPattern().getName());
     properties.setProperty(NEW_WALL_THICKNESS, String.valueOf(getNewWallThickness()));   
     properties.setProperty(NEW_WALL_HEIGHT, String.valueOf(getNewWallHeight()));
+    properties.setProperty(NEW_FLOOR_THICKNESS, String.valueOf(getNewFloorThickness()));   
     // Write recent homes list
     int i = 1;
     for (Iterator<String> it = getRecentHomes().iterator(); it.hasNext() && i <= getRecentHomesMaxCount(); i ++) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/HomeAppletController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/HomeAppletController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/HomeAppletController.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/HomeAppletController.java	2011-12-21 00:48:50.000000000 +0000
@@ -23,10 +23,6 @@
 import java.net.URL;
 import java.util.concurrent.Callable;
 
-import javax.jnlp.BasicService;
-import javax.jnlp.ServiceManager;
-import javax.jnlp.UnavailableServiceException;
-
 import com.eteks.sweethome3d.io.HomeFileRecorder;
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomeApplication;
@@ -34,6 +30,7 @@
 import com.eteks.sweethome3d.model.RecorderException;
 import com.eteks.sweethome3d.plugin.PluginManager;
 import com.eteks.sweethome3d.swing.FileContentManager;
+import com.eteks.sweethome3d.swing.SwingTools;
 import com.eteks.sweethome3d.viewcontroller.ContentManager;
 import com.eteks.sweethome3d.viewcontroller.HomeController;
 import com.eteks.sweethome3d.viewcontroller.HomeView;
@@ -112,12 +109,8 @@
   @Override
   public void help() {
     try { 
-      // Lookup the javax.jnlp.BasicService object 
-      final BasicService service = (BasicService)ServiceManager.lookup("javax.jnlp.BasicService");
       String helpIndex = this.application.getUserPreferences().getLocalizedString(HomeAppletController.class, "helpIndex");
-      service.showDocument(new URL(helpIndex)); 
-    } catch (UnavailableServiceException ex) {
-      // Too bad : service is unavailable             
+      SwingTools.showDocumentInBrowser(new URL(helpIndex)); 
     } catch (MalformedURLException ex) {
       ex.printStackTrace();
     } 
@@ -163,9 +156,14 @@
     new UserPreferencesController(this.application.getUserPreferences(), 
         this.viewFactory, this.contentManager) {
       public boolean isPropertyEditable(UserPreferencesController.Property property) {
-        // No auto recovery with applet
-        return property != UserPreferencesController.Property.AUTO_SAVE_DELAY_FOR_RECOVERY
-            && property != UserPreferencesController.Property.AUTO_SAVE_FOR_RECOVERY_ENABLED;
+        switch (property) {
+          case AUTO_SAVE_DELAY_FOR_RECOVERY :
+          case AUTO_SAVE_FOR_RECOVERY_ENABLED :
+            // No auto recovery with applet
+            return false;
+          default :
+            return super.isPropertyEditable(property);
+        }
       }
     }.displayView(getView());
   }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/package.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/package.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/package.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/package.properties	2011-12-21 00:48:50.000000000 +0000
@@ -23,7 +23,7 @@
 AppletApplication.3DError.title=3D Error
 
 # Note to translators: do not copy the following key in localized file
-AppletApplication.applicationVersion=3.3
+AppletApplication.applicationVersion=3.4
 
 AppletApplication.memoryStatus=Memory used by applet: %d%% out of %d MB
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/SweetHome3DApplet.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/SweetHome3DApplet.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/SweetHome3DApplet.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/SweetHome3DApplet.java	2011-12-21 00:48:50.000000000 +0000
@@ -177,7 +177,7 @@
    
   public void init() {
     if (!isJava5OrSuperior()) {
-      showError(getLocalizedString("requirementsMessage"));
+      showText(getLocalizedString("requirementsMessage"));
     } else {
       createAppletApplication();
     }
@@ -244,16 +244,28 @@
   /**
    * Shows the given text in a label.
    */
-  private void showError(String text) {
+  private void showText(String text) {
     JLabel label = new JLabel(text, JLabel.CENTER);
     setContentPane(label);
   }
   
   /**
+   * Reports the given exception at screen.
+   */
+  private void showError(Throwable ex) {
+    showText("<html>" + getLocalizedString("startError") 
+        + "<br>Exception " + ex.getClass().getName() 
+        + (ex.getMessage() != null ? " " + ex.getMessage() : ""));
+    ex.printStackTrace();
+  }
+
+  /**
    * Creates a new <code>AppletApplication</code> instance that manages this applet content.
    */
   private void createAppletApplication() {
+    String applicationClassName = null;
     try {
+      applicationClassName = getApplicationClassName();
       Class sweetHome3DAppletClass = SweetHome3DApplet.class;
       List java3DFiles = new ArrayList(Arrays.asList(new String [] {
           "j3dcore.jar", // Main Java 3D jars
@@ -288,10 +300,10 @@
           "com.ibm.media",
           "jmpapps.util",
           "com.microcrowd.loader.java3d",
-          "org.sunflow"}));
+          "org.sunflow",
+          "org.apache.batik"}));
       applicationPackages.addAll(getPluginsPackages());
       
-      String applicationClassName = getApplicationClassName();
       if (!applicationClassName.startsWith((String)applicationPackages.get(0))) {
         String [] applicationClassParts = applicationClassName.split("\\.");
         String applicationClassPackageBase = ""; 
@@ -309,21 +321,28 @@
           sweetHome3DAppletClass.getClassLoader(), sweetHome3DAppletClass.getProtectionDomain(),
           (String [])java3DFiles.toArray(new String [java3DFiles.size()]), 
           (String [])applicationPackages.toArray(new String [applicationPackages.size()]));
-      
+      startApplication(applicationClassName, extensionsClassLoader);
+    } catch (AccessControlException ex) {
+      String runWithoutSignature = getParameter("runWithoutSignature");
+      if (runWithoutSignature != null && Boolean.parseBoolean(runWithoutSignature)) {
+        // Try to run application without 3D
+        startApplication(applicationClassName, getClass().getClassLoader());
+      } else {
+        showText(getLocalizedString("signatureError"));
+      }
+    } catch (Throwable ex) {
+      showError(ex);
+    }
+  }
+
+  private void startApplication(String applicationClassName, ClassLoader extensionsClassLoader) {
+    try {
       // Call application constructor with reflection
       Class applicationClass = extensionsClassLoader.loadClass(applicationClassName);
-      Constructor applicationConstructor = 
-          applicationClass.getConstructor(new Class [] {JApplet.class});
+      Constructor applicationConstructor = applicationClass.getConstructor(new Class [] {JApplet.class});
       this.appletApplication = applicationConstructor.newInstance(new Object [] {this});
-    } catch (Throwable ex) {
-      if (ex instanceof AccessControlException) {
-        showError(getLocalizedString("signatureError"));
-      } else {
-        showError("<html>" + getLocalizedString("startError") 
-            + "<br>Exception " + ex.getClass().getName() 
-            + (ex.getMessage() != null ? " " + ex.getMessage() : ""));
-        ex.printStackTrace();
-      }
+    } catch (Exception ex) {
+      showError(ex);
     }
   }
 
@@ -336,6 +355,13 @@
   }  
   
   /**
+   * Returns the application instance created by the applet. 
+   */
+  protected Object getApplication() {
+    return this.appletApplication;
+  }  
+  
+  /**
    * Returns the collection of packages that are found in plugins. 
    */
   private Collection getPluginsPackages() {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/SweetHome3DViewer.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/SweetHome3DViewer.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/SweetHome3DViewer.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/SweetHome3DViewer.java	2011-12-21 00:48:50.000000000 +0000
@@ -156,7 +156,8 @@
           "com.sun.opengl",
           "com.sun.gluegen.runtime",
           "javax.media.opengl",
-          "com.microcrowd.loader.java3d"}));
+          "com.microcrowd.loader.java3d",
+          "org.apache.batik"}));
       
       ClassLoader extensionsClassLoader = new ExtensionsClassLoader(
           sweetHome3DViewerClass.getClassLoader(), sweetHome3DViewerClass.getProtectionDomain(),
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/ViewerHelper.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/ViewerHelper.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/applet/ViewerHelper.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/applet/ViewerHelper.java	2011-12-21 00:48:50.000000000 +0000
@@ -73,6 +73,7 @@
 import com.eteks.sweethome3d.viewcontroller.ImportedFurnitureWizardStepsView;
 import com.eteks.sweethome3d.viewcontroller.ImportedTextureWizardController;
 import com.eteks.sweethome3d.viewcontroller.LabelController;
+import com.eteks.sweethome3d.viewcontroller.LevelController;
 import com.eteks.sweethome3d.viewcontroller.VideoController;
 import com.eteks.sweethome3d.viewcontroller.PageSetupController;
 import com.eteks.sweethome3d.viewcontroller.PhotoController;
@@ -169,6 +170,10 @@
           throw new UnsupportedOperationException();
         }
 
+        public DialogView createLevelView(UserPreferences preferences, LevelController levelController) {
+          throw new UnsupportedOperationException();
+        }
+
         public DialogView createHomeFurnitureView(UserPreferences preferences,
                                                   HomeFurnitureController homeFurnitureController) {
           throw new UnsupportedOperationException();
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/HomeFramePane.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/HomeFramePane.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/HomeFramePane.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/HomeFramePane.java	2011-12-21 00:48:50.000000000 +0000
@@ -48,6 +48,7 @@
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomeApplication;
 import com.eteks.sweethome3d.model.UserPreferences;
+import com.eteks.sweethome3d.swing.SwingTools;
 import com.eteks.sweethome3d.tools.OperatingSystem;
 import com.eteks.sweethome3d.viewcontroller.ContentManager;
 import com.eteks.sweethome3d.viewcontroller.HomeController;
@@ -279,8 +280,8 @@
     if (x != null && y != null 
         && width != null && height != null 
         && screenWidth != null && screenHeight != null
-        && screenWidth >= screenSize.width
-        && screenHeight >= screenSize.height) {
+        && screenWidth <= screenSize.width
+        && screenHeight <= screenSize.height) {
       final Rectangle frameBounds = new Rectangle(x, y, width, height);
       if (maximized != null && maximized) {
         // Display first the frame at its maximum size to keep splitters location 
@@ -298,6 +299,7 @@
       } else {
         // Reuse home bounds
         frame.setBounds(frameBounds);
+        frame.setLocationByPlatform(!SwingTools.isRectangleVisibleAtScreen(frameBounds));
       }
     } else {      
       frame.setLocationByPlatform(true);
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/ContributedFurnitureCatalog.properties	2011-12-21 00:48:50.000000000 +0000
@@ -27,9 +27,10 @@
 model#1=/com/eteks/sweethome3d/io/resources/contributions/spiralStaircase.obj
 width#1=148.4
 depth#1=133.1
-height#1=250
+height#1=271
 movable#1=false
 doorOrWindow#1=false
+staircaseCutOutShape#1=M0,0.35 h0.47 l0.375,-0.35 l0.088,0.118 A0.5,0.5 0 1,1 0,0.35 z
 creator#1=Sheep
 
 id#2=GdB#squareCoffeeTable
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_en_US.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_en_US.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_en_US.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog_en_US.properties	2011-12-21 00:48:50.000000000 +0000
@@ -157,7 +157,7 @@
 name#27=Curve staircase
 width#27=72.39
 depth#27=238.125
-height#27=346.71
+height#27=361.95
 
 name#28=Dishwasher
 width#28=59.69
@@ -207,7 +207,7 @@
 name#37=Staircase
 width#37=72.39
 depth#37=222.25
-height#37=346.71
+height#37=361.95
 
 name#38=Stool
 width#38=40.005
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.java	2011-12-21 00:48:50.000000000 +0000
@@ -26,6 +26,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -191,6 +192,14 @@
      */
     LIGHT_SOURCE_DIAMETER("lightSourceDiameter"),
     /**
+     * The key for the shape used to cut out upper levels when they intersect with a piece   
+     * like a staircase (optional). This shape should be defined with the syntax of 
+     * the d attribute of a <a href="http://www.w3.org/TR/SVG/paths.html">SVG path element</a>
+     * and should fit in a square spreading from (0, 0) to (1, 1) which will be scaled afterwards 
+     * to the real size of the piece. 
+     */
+    STAIRCASE_CUT_OUT_SHAPE("staircaseCutOutShape"),
+    /**
      * The key for the elevation in centimeters of a piece of furniture (optional).
      */
     ELEVATION("elevation"),
@@ -231,7 +240,11 @@
     /**
      * The key for the VAT percentage of a piece of furniture (optional).
      */
-    VALUE_ADDED_TAX_PERCENTAGE("valueAddedTaxPercentage");
+    VALUE_ADDED_TAX_PERCENTAGE("valueAddedTaxPercentage"),
+    /**
+     * The key for the currency ISO 4217 code of the price of a piece of furniture (optional).
+     */
+    CURRENCY("currency");
     
     private String keyPrefix;
 
@@ -291,19 +304,7 @@
         new HashMap<FurnitureCategory, Map<CatalogPieceOfFurniture,Integer>>();
     List<String> identifiedFurniture = new ArrayList<String>();
     
-    // Try to load com.eteks.sweethome3d.io.DefaultFurnitureCatalog property file from classpath 
-    final String defaultFurnitureCatalogFamily = DefaultFurnitureCatalog.class.getName();
-    readFurnitureCatalog(defaultFurnitureCatalogFamily, 
-        preferences, furnitureHomonymsCounter, identifiedFurniture);
-    
-    // Try to load com.eteks.sweethome3d.io.ContributedFurnitureCatalog property file from classpath 
-    String classPackage = defaultFurnitureCatalogFamily.substring(0, defaultFurnitureCatalogFamily.lastIndexOf("."));
-    readFurnitureCatalog(classPackage + "." + CONTRIBUTED_FURNITURE_CATALOG_FAMILY, 
-        preferences, furnitureHomonymsCounter, identifiedFurniture);
-    
-    // Try to load com.eteks.sweethome3d.io.AdditionalFurnitureCatalog property file from classpath
-    readFurnitureCatalog(classPackage + "." + ADDITIONAL_FURNITURE_CATALOG_FAMILY, 
-        preferences, furnitureHomonymsCounter, identifiedFurniture);
+    readDefaultFurnitureCatalogs(preferences, furnitureHomonymsCounter, identifiedFurniture);
     
     if (furniturePluginFolders != null) {
       for (File furniturePluginFolder : furniturePluginFolders) {
@@ -326,7 +327,7 @@
       }
     }
   }
-  
+
   /**
    * Creates a default furniture catalog read only from resources in the given URLs.
    */
@@ -335,7 +336,8 @@
   }
   
   /**
-   * Creates a default furniture catalog read only from resources in the given URLs.
+   * Creates a default furniture catalog read only from resources in the given URLs 
+   * or in the classpath if the security manager doesn't allow to create class loaders.
    * Model and icon URLs will built from <code>furnitureResourcesUrlBase</code> if it isn't <code>null</code>.
    */
   public DefaultFurnitureCatalog(URL [] pluginFurnitureCatalogUrls,
@@ -344,16 +346,27 @@
         new HashMap<FurnitureCategory, Map<CatalogPieceOfFurniture,Integer>>();
     List<String> identifiedFurniture = new ArrayList<String>();
 
-    for (URL pluginFurnitureCatalogUrl : pluginFurnitureCatalogUrls) {
-      try {
-        readFurniture(ResourceBundle.getBundle(PLUGIN_FURNITURE_CATALOG_FAMILY, Locale.getDefault(), 
-                new URLClassLoader(new URL [] {pluginFurnitureCatalogUrl})), 
-            pluginFurnitureCatalogUrl, furnitureResourcesUrlBase, furnitureHomonymsCounter, identifiedFurniture);
-      } catch (MissingResourceException ex) {
-        // Ignore malformed furniture catalog
-      } catch (IllegalArgumentException ex) {
-        // Ignore malformed furniture catalog
+    try {
+      SecurityManager securityManager = System.getSecurityManager();
+      if (securityManager != null) {
+        securityManager.checkCreateClassLoader();
+      }
+
+      for (URL pluginFurnitureCatalogUrl : pluginFurnitureCatalogUrls) {
+        try {        
+          ResourceBundle resource = ResourceBundle.getBundle(PLUGIN_FURNITURE_CATALOG_FAMILY, Locale.getDefault(), 
+              new URLClassLoader(new URL [] {pluginFurnitureCatalogUrl}));
+          readFurniture(resource, pluginFurnitureCatalogUrl, furnitureResourcesUrlBase, furnitureHomonymsCounter, identifiedFurniture);
+        } catch (MissingResourceException ex) {
+          // Ignore malformed furniture catalog
+        } catch (IllegalArgumentException ex) {
+          // Ignore malformed furniture catalog
+        }
       }
+    } catch (AccessControlException ex) {
+      // Use only furniture accessible through classpath
+      ResourceBundle resource = ResourceBundle.getBundle(PLUGIN_FURNITURE_CATALOG_FAMILY, Locale.getDefault());
+      readFurniture(resource, null, furnitureResourcesUrlBase, furnitureHomonymsCounter, identifiedFurniture);
     }
   }
 
@@ -396,6 +409,27 @@
   }
   
   /**
+   * Reads the default furniture described in properties files accessible through classpath.
+   */
+  private void readDefaultFurnitureCatalogs(UserPreferences preferences,
+                                            Map<FurnitureCategory, Map<CatalogPieceOfFurniture, Integer>> furnitureHomonymsCounter,
+                                            List<String> identifiedFurniture) {
+    // Try to load com.eteks.sweethome3d.io.DefaultFurnitureCatalog property file from classpath 
+    String defaultFurnitureCatalogFamily = DefaultFurnitureCatalog.class.getName();
+    readFurnitureCatalog(defaultFurnitureCatalogFamily, 
+        preferences, furnitureHomonymsCounter, identifiedFurniture);
+    
+    // Try to load com.eteks.sweethome3d.io.ContributedFurnitureCatalog property file from classpath 
+    String classPackage = defaultFurnitureCatalogFamily.substring(0, defaultFurnitureCatalogFamily.lastIndexOf("."));
+    readFurnitureCatalog(classPackage + "." + CONTRIBUTED_FURNITURE_CATALOG_FAMILY, 
+        preferences, furnitureHomonymsCounter, identifiedFurniture);
+    
+    // Try to load com.eteks.sweethome3d.io.AdditionalFurnitureCatalog property file from classpath
+    readFurnitureCatalog(classPackage + "." + ADDITIONAL_FURNITURE_CATALOG_FAMILY, 
+        preferences, furnitureHomonymsCounter, identifiedFurniture);
+  }
+  
+  /**
    * Reads furniture of a given catalog family from resources.
    */
   private void readFurnitureCatalog(final String furnitureCatalogFamily,
@@ -496,6 +530,7 @@
     float height = Float.parseFloat(resource.getString(PropertyKey.HEIGHT.getKey(index)));
     boolean movable = Boolean.parseBoolean(resource.getString(PropertyKey.MOVABLE.getKey(index)));
     boolean doorOrWindow = Boolean.parseBoolean(resource.getString(PropertyKey.DOOR_OR_WINDOW.getKey(index)));
+    String staircaseCutOutShape = getOptionalString(resource, PropertyKey.STAIRCASE_CUT_OUT_SHAPE.getKey(index), null);     
     float elevation = getOptionalFloat(resource, PropertyKey.ELEVATION.getKey(index), 0);
     float [][] modelRotation = getModelRotation(resource, PropertyKey.MODEL_ROTATION.getKey(index));
     // By default creator is eTeks
@@ -516,6 +551,7 @@
     } catch (MissingResourceException ex) {
       // By default price is null
     }
+    String currency = getOptionalString(resource, PropertyKey.CURRENCY.getKey(index), null);
 
     if (doorOrWindow) {
       float wallThicknessPercentage = getOptionalFloat(
@@ -526,17 +562,17 @@
       return new CatalogDoorOrWindow(id, name, description, icon, planIcon, model,
           width, depth, height, elevation, movable, 
           wallThicknessPercentage, wallDistancePercentage, sashes, modelRotation, creator, 
-          resizable, deformable, texturable, price, valueAddedTaxPercentage);
+          resizable, deformable, texturable, price, valueAddedTaxPercentage, currency);
     } else {
       LightSource [] lightSources = getLightSources(resource, index, width, depth, height);
       if (lightSources != null) {
         return new CatalogLight(id, name, description, icon, planIcon, model,
-            width, depth, height, elevation, movable, lightSources, modelRotation, creator, 
-            resizable, deformable, texturable, price, valueAddedTaxPercentage);
+            width, depth, height, elevation, movable, lightSources, staircaseCutOutShape, modelRotation, creator, 
+            resizable, deformable, texturable, price, valueAddedTaxPercentage, currency);
       } else {
         return new CatalogPieceOfFurniture(id, name, description, icon, planIcon, model,
-            width, depth, height, elevation, movable, modelRotation, creator, 
-            resizable, deformable, texturable, price, valueAddedTaxPercentage);
+            width, depth, height, elevation, movable, staircaseCutOutShape, modelRotation, creator, 
+            resizable, deformable, texturable, price, valueAddedTaxPercentage, currency);
       }
     }
   }
@@ -584,23 +620,24 @@
             doorOrWindow.getWallDistance(), doorOrWindow.getSashes(), 
             doorOrWindow.getModelRotation(), doorOrWindow.getCreator(),
             doorOrWindow.isResizable(), doorOrWindow.isDeformable(), doorOrWindow.isTexturable(), 
-            doorOrWindow.getPrice(), doorOrWindow.getValueAddedTaxPercentage());
+            doorOrWindow.getPrice(), doorOrWindow.getValueAddedTaxPercentage(), doorOrWindow.getCurrency());
       } else if (piece instanceof CatalogLight) {
         CatalogLight light = (CatalogLight)piece;
         piece = new CatalogLight(light.getId(), suffixedName,
             light.getDescription(), light.getIcon(), light.getPlanIcon(), light.getModel(),
             light.getWidth(), light.getDepth(), light.getHeight(), light.getElevation(), 
-            light.isMovable(), light.getLightSources(), 
+            light.isMovable(), light.getLightSources(), light.getStaircaseCutOutShape(), 
             light.getModelRotation(), light.getCreator(),
             light.isResizable(), light.isDeformable(), light.isTexturable(),
-            light.getPrice(), light.getValueAddedTaxPercentage());
+            light.getPrice(), light.getValueAddedTaxPercentage(), light.getCurrency());
       } else {
         piece = new CatalogPieceOfFurniture(piece.getId(), suffixedName,
             piece.getDescription(), piece.getIcon(), piece.getPlanIcon(), piece.getModel(),
-            piece.getWidth(), piece.getDepth(), piece.getHeight(), piece.getElevation(), 
-            piece.isMovable(), piece.getModelRotation(), piece.getCreator(),
+            piece.getWidth(), piece.getDepth(), piece.getHeight(), 
+            piece.getElevation(), piece.isMovable(), piece.getStaircaseCutOutShape(), 
+            piece.getModelRotation(), piece.getCreator(),
             piece.isResizable(), piece.isDeformable(), piece.isTexturable(),
-            piece.getPrice(), piece.getValueAddedTaxPercentage());
+            piece.getPrice(), piece.getValueAddedTaxPercentage(), piece.getCurrency());
       }
       add(pieceCategory, piece, furnitureHomonymsCounter);
     }
@@ -633,14 +670,15 @@
       // Try first to interpret contentFile as an absolute URL 
       // or an URL relative to resourceUrlBase if it's not null
       URL url;
-      if (resourceUrlBase != null) {
-        if (contentFile.indexOf('!') < 0 || contentFile.startsWith("jar:")) {
-          url = new URL(resourceUrlBase, contentFile);
-        } else {
-          url = new URL("jar:" + new URL(resourceUrlBase, contentFile));
-        }
-      } else {
+      if (resourceUrlBase == null) {
         url = new URL(contentFile);
+      } else {
+        url = contentFile.startsWith("?") 
+            ? new URL(resourceUrlBase + contentFile)
+            : new URL(resourceUrlBase, contentFile);
+        if (contentFile.indexOf('!') >= 0 && !contentFile.startsWith("jar:")) {
+          url = new URL("jar:" + url);
+        }
       }
       return new URLContent(url);
     } catch (MalformedURLException ex) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultFurnitureCatalog.properties	2011-12-21 00:48:50.000000000 +0000
@@ -371,9 +371,10 @@
 model#27=/com/eteks/sweethome3d/io/resources/curveStaircase.obj
 width#27=72
 depth#27=238
-height#27=347
+height#27=362
 movable#27=false
 doorOrWindow#27=false
+staircaseCutOutShape#27=M0,0 v1 h1 v-1 z
 creator#27=eTeks
 
 name#28=Dishwasher
@@ -481,9 +482,10 @@
 model#37=/com/eteks/sweethome3d/io/resources/staircase.obj
 width#37=72
 depth#37=222
-height#37=347
+height#37=362
 movable#37=false
 doorOrWindow#37=false
+staircaseCutOutShape#37=M0,0 v1 h1 v-1 z
 creator#37=eTeks
 
 name#38=Stool
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultTexturesCatalog.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultTexturesCatalog.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultTexturesCatalog.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultTexturesCatalog.java	2011-12-21 00:48:50.000000000 +0000
@@ -25,6 +25,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -145,15 +146,7 @@
         new HashMap<TexturesCategory, Map<CatalogTexture,Integer>>();
     List<String> identifiedTextures = new ArrayList<String>();
     
-    // Try to load com.eteks.sweethome3d.io.DefaultTexturesCatalog property file from classpath 
-    final String defaultTexturesCatalogFamily = DefaultTexturesCatalog.class.getName();
-    readTexturesCatalog(defaultTexturesCatalogFamily, 
-        preferences, textureHomonymsCounter, identifiedTextures);
-
-    // Try to load com.eteks.sweethome3d.io.AdditionalTexturesCatalog property file from classpath 
-    String classPackage = defaultTexturesCatalogFamily.substring(0, defaultTexturesCatalogFamily.lastIndexOf("."));
-    readTexturesCatalog(classPackage + "." + ADDITIONAL_TEXTURES_CATALOG_FAMILY, 
-        preferences, textureHomonymsCounter, identifiedTextures);
+    readDefaultTexturesCatalogs(preferences, textureHomonymsCounter, identifiedTextures);
 
     if (texturesPluginFolders != null) {
       for (File texturesPluginFolder : texturesPluginFolders) {
@@ -176,7 +169,7 @@
       }
     }
   }
-  
+
   /**
    * Creates a default textures catalog read only from resources in the given URLs.
    */
@@ -194,16 +187,27 @@
         new HashMap<TexturesCategory, Map<CatalogTexture,Integer>>();
     List<String> identifiedTextures = new ArrayList<String>();
 
-    for (URL pluginTexturesCatalogUrl : pluginTexturesCatalogUrls) {
-      try {
-        readTextures(ResourceBundle.getBundle(PLUGIN_TEXTURES_CATALOG_FAMILY, Locale.getDefault(),
-                new URLClassLoader(new URL [] {pluginTexturesCatalogUrl})),
-            pluginTexturesCatalogUrl, texturesResourcesUrlBase, textureHomonymsCounter, identifiedTextures);
-      } catch (MissingResourceException ex) {
-        // Ignore malformed textures catalog
-      } catch (IllegalArgumentException ex) {
-        // Ignore malformed textures catalog
+    try {
+      SecurityManager securityManager = System.getSecurityManager();
+      if (securityManager != null) {
+        securityManager.checkCreateClassLoader();
       }
+
+      for (URL pluginTexturesCatalogUrl : pluginTexturesCatalogUrls) {
+        try {
+          ResourceBundle resource = ResourceBundle.getBundle(PLUGIN_TEXTURES_CATALOG_FAMILY, Locale.getDefault(),
+                  new URLClassLoader(new URL [] {pluginTexturesCatalogUrl}));
+          readTextures(resource, pluginTexturesCatalogUrl, texturesResourcesUrlBase, textureHomonymsCounter, identifiedTextures);
+        } catch (MissingResourceException ex) {
+          // Ignore malformed textures catalog
+        } catch (IllegalArgumentException ex) {
+          // Ignore malformed textures catalog
+        }
+      }
+    } catch (AccessControlException ex) {
+      // Use only textures accessible through classpath
+      ResourceBundle resource = ResourceBundle.getBundle(PLUGIN_TEXTURES_CATALOG_FAMILY, Locale.getDefault());
+      readTextures(resource, null, texturesResourcesUrlBase, textureHomonymsCounter, identifiedTextures);
     }
   }
 
@@ -246,6 +250,23 @@
   }
   
   /**
+   * Reads the default textures described in properties files accessible through classpath.
+   */
+  private void readDefaultTexturesCatalogs(final UserPreferences preferences,
+                                           Map<TexturesCategory, Map<CatalogTexture, Integer>> textureHomonymsCounter,
+                                           List<String> identifiedTextures) {
+    // Try to load com.eteks.sweethome3d.io.DefaultTexturesCatalog property file from classpath 
+    final String defaultTexturesCatalogFamily = DefaultTexturesCatalog.class.getName();
+    readTexturesCatalog(defaultTexturesCatalogFamily, 
+        preferences, textureHomonymsCounter, identifiedTextures);
+
+    // Try to load com.eteks.sweethome3d.io.AdditionalTexturesCatalog property file from classpath 
+    String classPackage = defaultTexturesCatalogFamily.substring(0, defaultTexturesCatalogFamily.lastIndexOf("."));
+    readTexturesCatalog(classPackage + "." + ADDITIONAL_TEXTURES_CATALOG_FAMILY, 
+        preferences, textureHomonymsCounter, identifiedTextures);
+  }
+  
+  /**
    * Reads textures of a given catalog family from resources.
    */
   private void readTexturesCatalog(final String texturesCatalogFamily,
@@ -372,10 +393,12 @@
       // Try first to interpret contentFile as an absolute URL 
       // or an URL relative to resourceUrlBase if it's not null
       URL url;
-      if (resourceUrlBase != null) {
-        url = new URL(resourceUrlBase, contentFile);
-      } else {
+      if (resourceUrlBase == null) {
         url = new URL(contentFile);
+      } else {
+        url = contentFile.startsWith("?") 
+            ? new URL(resourceUrlBase + contentFile)
+            : new URL(resourceUrlBase, contentFile);
       }
       return new URLContent(url);
     } catch (MalformedURLException ex) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_bg.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_bg.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_bg.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_bg.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,7 +18,6 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
-
+autoCompletionStrings#RoomName=\u0411\u0430\u043d\u044f, \u0421\u043f\u0430\u043b\u043d\u044f, \u041a\u0443\u0445\u043d\u044f, \u0412\u0441\u0435\u043a\u0438\u0434\u043d\u0435\u0432\u043d\u0430
+autoCompletionStrings#LevelName=\u041C\u0430\u0437\u0435, \u041F\u0430\u0440\u0442\u0435\u0440\u0435\u043D \u0435\u0442\u0430\u0436, 1-\u0432\u0438 \u0435\u0442\u0430\u0436, 2-\u0440\u0438 \u0435\u0442\u0430\u0436, 3-\u0442\u0438 \u0435\u0442\u0430\u0436
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_cs.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_cs.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_cs.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_cs.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,5 +18,5 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
+autoCompletionStrings#RoomName=Koupelna, Lo\u017enice, Kuchyn\u011b, Ob\u00fdvac\u00ed pokoj
+autoCompletionStrings#LevelName=Sklep, P\u0159\u00edzem\u00ed, 1. podla\u017e\u00ed, 2. podla\u017e\u00ed, 3. podla\u017e\u00ed
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_de.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_de.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_de.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_de.properties	2011-12-21 00:48:50.000000000 +0000
@@ -1,8 +1,8 @@
 # DefaultUserPreferences_de.properties 14 Oct 2007
 #
-# Translated to German by Sebastian Breuer
+# Translated to German by Sebastian Breuer and Florian Haag
 #
-# Sweet Home 3D, Copyright (c) 2007 Emmanuel PUYBARET / eTeks <info@eteks.com>
+# Sweet Home 3D, Copyright (c) 2007-2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -18,6 +18,6 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
+autoCompletionStrings#RoomName=Badezimmer, Schlafzimmer, K�che, Wohnzimmer
+autoCompletionStrings#LevelName=Untergeschoss, Erdgeschoss, 1. Stock, 2. Stock, 3. Stock
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_el.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_el.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_el.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_el.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,7 +18,6 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
-
+autoCompletionStrings#RoomName=\u039c\u03c0\u03ac\u03bd\u03b9\u03bf, \u03a5\u03c0\u03bd\u03bf\u03b4\u03c9\u03bc\u03ac\u03c4\u03b9\u03bf, \u039a\u03bf\u03c5\u03b6\u03af\u03bd\u03b1, \u03a3\u03b1\u03bb\u03cc\u03bd\u03b9
+autoCompletionStrings#LevelName=\u03A5\u03C0\u03CC\u03B3\u03B5\u03B9\u03BF, \u0399\u03C3\u03CC\u03B3\u03B5\u03B9\u03BF, 1\u03BF\u03C2 \u03CC\u03C1\u03BF\u03C6\u03BF\u03C2, 2\u03BF\u03C2 \u03CC\u03C1\u03BF\u03C6\u03BF\u03C2, 3\u03BF\u03C2 \u03CC\u03C1\u03BF\u03C6\u03BF\u03C2 
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_en_US.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_en_US.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_en_US.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_en_US.properties	2011-12-21 00:48:50.000000000 +0000
@@ -1,7 +1,6 @@
 # DefaultUserPreferences_en_US.properties 21 mai 2006
 # 
-# Copyright (c) 2006 Emmanuel PUYBARET / eTeks <info@eteks.com>. All Rights
-# Reserved.
+# Sweet Home 3D, Copyright (c) 2006 Emmanuel PUYBARET / eTeks <info@eteks.com>
 # 
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_es.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_es.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_es.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_es.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,6 +18,6 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
+autoCompletionStrings#RoomName=Cuarto de Ba�o, Dormitorio, Cocina, Sal�n
+autoCompletionStrings#LevelName=S�tano, Planta baja, 1� planta, 2� planta, 3� planta
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_fr.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_fr.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_fr.properties	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_fr.properties	2011-12-21 00:48:50.000000000 +0000
@@ -0,0 +1,21 @@
+# DefaultUserPreferences_fr.properties 7 aout 2011
+#
+# Sweet Home 3D, Copyright (c) 2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA
+
+autoCompletionStrings#LevelName=Sous-sol, Rez-de-chauss�e, 1er �tage, 2�me �tage, 3�me �tage 
+autoCompletionStrings#RoomName=Salle de bain, Chambre, Cuisine, Salon, Salle � manger, Entr�e
+
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_hu.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_hu.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_hu.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_hu.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,6 +18,4 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
-
+autoCompletionStrings#RoomName=F\u00fcrd\u0151szoba, H\u00e1l\u00f3szoba, Konyha, Nappali
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_it.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_it.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_it.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_it.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,6 +18,5 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
-
+autoCompletionStrings#RoomName=Bagno, Stanza da letto, Cucina, Soggiorno
+autoCompletionStrings#LevelName=Seminterrato, Piano terra, 1 piano, II piano, III piano
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_ja.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_ja.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_ja.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_ja.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,7 +18,4 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
-
-
+autoCompletionStrings#RoomName=\u6d74\u5ba4, \u5bdd\u5ba4, \u30ad\u30c3\u30c1\u30f3, \u30ea\u30d3\u30f3\u30b0\u30eb\u30fc\u30e0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences.java	2011-12-21 00:48:50.000000000 +0000
@@ -19,14 +19,20 @@
  */
 package com.eteks.sweethome3d.io;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import com.eteks.sweethome3d.model.Content;
+import com.eteks.sweethome3d.model.FurnitureCatalog;
 import com.eteks.sweethome3d.model.LengthUnit;
 import com.eteks.sweethome3d.model.PatternsCatalog;
 import com.eteks.sweethome3d.model.RecorderException;
 import com.eteks.sweethome3d.model.TextureImage;
+import com.eteks.sweethome3d.model.TexturesCatalog;
 import com.eteks.sweethome3d.model.UserPreferences;
 import com.eteks.sweethome3d.tools.ResourceURLContent;
 
@@ -36,46 +42,83 @@
  */
 public class DefaultUserPreferences extends UserPreferences {
   /**
-   * Creates default user preferences read from resource files.
+   * Creates default user preferences read from resource files in the default language.
    */
   public DefaultUserPreferences() {
+    this(true, null);
+  }
+  
+  /**
+   * Creates default user preferences read from resource files.
+   * @param readCatalogs          if <code>false</code> furniture and texture catalog won't be read
+   * @param localizedPreferences  preferences used to read localized resource files
+   */
+  DefaultUserPreferences(boolean readCatalogs,
+                         UserPreferences localizedPreferences) {
+    if (localizedPreferences == null) {
+      localizedPreferences = this;
+    } else {
+      setLanguage(localizedPreferences.getLanguage());
+    }
     // Read default furniture catalog
-    setFurnitureCatalog(new DefaultFurnitureCatalog());
+    setFurnitureCatalog(readCatalogs 
+        ? new DefaultFurnitureCatalog(localizedPreferences, (File)null) 
+        : new FurnitureCatalog() { });
     // Read default textures catalog
-    setTexturesCatalog(new DefaultTexturesCatalog());
+    setTexturesCatalog(readCatalogs 
+        ? new DefaultTexturesCatalog(localizedPreferences, (File)null)
+        : new TexturesCatalog() { });
     // Build default patterns catalog
     List<TextureImage> patterns = new ArrayList<TextureImage>();
-    patterns.add(new PatternTexture("foreground"));
-    patterns.add(new PatternTexture("hatchUp"));
-    patterns.add(new PatternTexture("hatchDown"));
-    patterns.add(new PatternTexture("crossHatch"));
-    patterns.add(new PatternTexture("background"));
+    patterns.add(new DefaultPatternTexture("foreground"));
+    patterns.add(new DefaultPatternTexture("hatchUp"));
+    patterns.add(new DefaultPatternTexture("hatchDown"));
+    patterns.add(new DefaultPatternTexture("crossHatch"));
+    patterns.add(new DefaultPatternTexture("background"));
     PatternsCatalog patternsCatalog = new PatternsCatalog(patterns);
     setPatternsCatalog(patternsCatalog);
     // Read other preferences from resource bundle
     setFurnitureCatalogViewedInTree(Boolean.parseBoolean(
-        getLocalizedString(DefaultUserPreferences.class, "furnitureCatalogViewedInTree")));
-    setNavigationPanelVisible(Boolean.parseBoolean(getLocalizedString(DefaultUserPreferences.class, "navigationPanelVisible")));    
-    setUnit(LengthUnit.valueOf(getLocalizedString(DefaultUserPreferences.class, "unit").toUpperCase()));
-    setRulersVisible(Boolean.parseBoolean(getLocalizedString(DefaultUserPreferences.class, "rulersVisible")));
-    setGridVisible(Boolean.parseBoolean(getLocalizedString(DefaultUserPreferences.class, "gridVisible")));
-    setFurnitureViewedFromTop(Boolean.parseBoolean(getLocalizedString(DefaultUserPreferences.class, "furnitureViewedFromTop")));
-    setFloorColoredOrTextured(Boolean.parseBoolean(getLocalizedString(DefaultUserPreferences.class, "roomFloorColoredOrTextured")));
-    setWallPattern(patternsCatalog.getPattern(getLocalizedString(DefaultUserPreferences.class, "wallPattern")));
-    setNewWallThickness(Float.parseFloat(getLocalizedString(DefaultUserPreferences.class, "newWallThickness")));
-    setNewWallHeight(Float.parseFloat(getLocalizedString(DefaultUserPreferences.class, "newHomeWallHeight")));
+        localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "furnitureCatalogViewedInTree")));
+    setNavigationPanelVisible(Boolean.parseBoolean(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "navigationPanelVisible")));    
+    setUnit(LengthUnit.valueOf(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "unit").toUpperCase()));
+    setRulersVisible(Boolean.parseBoolean(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "rulersVisible")));
+    setGridVisible(Boolean.parseBoolean(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "gridVisible")));
+    setFurnitureViewedFromTop(Boolean.parseBoolean(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "furnitureViewedFromTop")));
+    setFloorColoredOrTextured(Boolean.parseBoolean(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "roomFloorColoredOrTextured")));
+    setWallPattern(patternsCatalog.getPattern(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "wallPattern")));
+    setNewWallThickness(Float.parseFloat(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "newWallThickness")));
+    setNewWallHeight(Float.parseFloat(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "newHomeWallHeight")));
+    try {
+      setNewFloorThickness(Float.parseFloat(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "newFloorThickness")));
+    } catch (IllegalArgumentException ex) {
+      setNewFloorThickness(12);
+    }
     try {
-      setAutoSaveDelayForRecovery(Integer.parseInt(getLocalizedString(DefaultUserPreferences.class, "autoSaveDelayForRecovery")));
+      setAutoSaveDelayForRecovery(Integer.parseInt(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "autoSaveDelayForRecovery")));
     } catch (IllegalArgumentException ex) {
       // Disable auto save
       setAutoSaveDelayForRecovery(0);
     }
     setRecentHomes(new ArrayList<String>());
     try {
-      setCurrency(getLocalizedString(DefaultUserPreferences.class, "currency"));
+      setCurrency(localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "currency"));
     } catch (IllegalArgumentException ex) {
       // Don't use currency and prices in program
     }
+    for (String property : new String [] {"LevelName", "HomePieceOfFurnitureName", "RoomName", "LabelText"}) {
+      try {
+        String [] autoCompletionStrings = localizedPreferences.getLocalizedString(DefaultUserPreferences.class, "autoCompletionStrings#" + property).trim().split(",");
+        if (autoCompletionStrings.length > 0) {
+          for (int i = 0; i < autoCompletionStrings.length; i++) {
+            autoCompletionStrings [i] = autoCompletionStrings [i].trim();
+          }
+          setAutoCompletionStrings(property, Arrays.asList(autoCompletionStrings));
+        }
+      } catch (IllegalArgumentException ex) {
+        // No default auto completion strings
+      }
+    }
   }
 
   /**
@@ -134,33 +177,71 @@
   public void addTexturesLibrary(String name) throws RecorderException {
     throw new RecorderException("Default user preferences can't manage textures libraries");
   }
+}
+
+/**
+ * A pattern built from resources.
+ * @since 3.3
+ */
+class DefaultPatternTexture implements TextureImage {
+  private static final long serialVersionUID = 1L;
+
+  private final String      name;
+  private transient Content image;
+  
+  public DefaultPatternTexture(String name) {
+    this.name = name;
+    this.image = new ResourceURLContent(DefaultPatternTexture.class, "resources/patterns/" + this.name + ".png");
+  }
   
   /**
-   * A fixed sized pattern.
+   * Initializes transient fields and reads pattern from <code>in</code> stream with default reading method.
    */
-  private static class PatternTexture implements TextureImage {
-    private final String name;
-    private final Content image;
-
-    public PatternTexture(String name) {
-      this.name = name;
-      this.image = new ResourceURLContent(PatternTexture.class, "resources/patterns/" + name + ".png");
+  private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    in.defaultReadObject();
+    try {
+      this.image = new ResourceURLContent(DefaultPatternTexture.class, "resources/patterns/" + this.name + ".png");
+    } catch (IllegalArgumentException ex) {
+      this.image = new ResourceURLContent(DefaultPatternTexture.class, "resources/patterns/foreground.png");
     }
+  }
 
-    public String getName() {
-      return this.name;
-    }
+  public String getName() {
+    return this.name;
+  }
 
-    public Content getImage() {
-      return this.image;
-    }
-    
-    public float getWidth() {
-      return 10;
-    }
-    
-    public float getHeight() {
-      return 10;
+  public Content getImage() {
+    return this.image;
+  }
+  
+  public float getWidth() {
+    return 10;
+  }
+  
+  public float getHeight() {
+    return 10;
+  }
+
+  /**
+   * Returns <code>true</code> if the object in parameter is equal to this pattern.
+   */
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    } else if (obj instanceof DefaultPatternTexture) {
+      DefaultPatternTexture pattern = (DefaultPatternTexture)obj;
+      return pattern.name.equals(this.name);
+    } else {
+      return false;
     }
   }
+  
+  /**
+   * Returns a hash code for this pattern.
+   */
+  @Override
+  public int hashCode() {
+    return this.name.hashCode();
+  }
 }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_pl.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_pl.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_pl.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_pl.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,6 +18,4 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
-
+autoCompletionStrings#RoomName=\u0141azienka, Sypialnia, Kuchnia, Pok\u00f3j dzienny
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,8 +18,10 @@
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
 
-# Note to translators: do not localize this file
- 
+autoCompletionStrings#LevelName=Basement, Ground floor, 1st floor, 2nd floor, 3rd floor 
+autoCompletionStrings#RoomName=Bathroom, Bedroom, Kitchen, Living room
+
+# Note to translators: do not copy the remaining keys in localized file
 unit=centimeter
 furnitureCatalogViewedInTree=true
 navigationPanelVisible=true
@@ -30,7 +32,8 @@
 wallPattern=hatchUp
 newWallThickness=7.5
 newHomeWallHeight=250
+newFloorThickness=12
 autoSaveDelayForRecovery=600000
 
-# Uncomment currency line to use prices in application
-#currency=EUR
\ No newline at end of file
+# Uncomment default currency line to use prices in application
+# currency=EUR
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_pt.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_pt.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_pt.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_pt.properties	2011-12-21 00:48:50.000000000 +0000
@@ -1,6 +1,6 @@
 # DefaultUserPreferences_pt.properties 18 Sep 2007
 #
-# Translated to Portuguese by Roberto Rocha
+# Translated to Portuguese by Lucas Germano
 #
 # Sweet Home 3D, Copyright (c) 2007 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
@@ -18,6 +18,5 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
-
+autoCompletionStrings#RoomName=Banheiro, Quarto, Cozinha, Sala de estar
+autoCompletionStrings#LevelName=Base, Ch�o do Primeiro N�vel, Primeiro Andar, Segundo Andar, Terceiro Andar
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_ru.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_ru.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_ru.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_ru.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,6 +18,5 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
-
+autoCompletionStrings#RoomName=\u0412\u0430\u043d\u043d\u0430\u044f \u043a\u043e\u043c\u043d\u0430\u0442\u0430, \u0421\u043f\u0430\u043b\u044c\u043d\u044f, \u041a\u0443\u0445\u043d\u044f, \u0416\u0438\u043b\u0430\u044f \u043a\u043e\u043c\u043d\u0430\u0442\u0430
+autoCompletionStrings#LevelName=\u0424\u0443\u043D\u0434\u0430\u043C\u0435\u043D\u0442, \u0446\u043E\u043A\u043E\u043B\u044C\u043D\u044B\u0439 \u044D\u0442\u0430\u0436, 1-\u044B\u0439 \u044D\u0442\u0430\u0436, 2-\u044B\u0439 \u044D\u0442\u0430\u0436, 3-\u044B\u0439 \u044D\u0442\u0430\u0436
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_sv.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_sv.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_sv.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_sv.properties	2011-12-21 00:48:50.000000000 +0000
@@ -19,5 +19,5 @@
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
 newWallThickness=10
-newHomeWallHeight=250
-
+autoCompletionStrings#RoomName=Badrum, Sovrum, K�k, Vardagsrum
+autoCompletionStrings#LevelName=K�llare, Bottenv�ning, F�rsta v�ningen, Andra v�ningen, Tredje v�ningen
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_vi.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_vi.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_vi.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_vi.properties	2011-12-21 00:48:50.000000000 +0000
@@ -18,6 +18,5 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
-
+autoCompletionStrings#RoomName=Ph\u00f2ng t\u1eafm, Ph\u00f2ng ng\u1ee7, Nh\u00e0 b\u1ebfp, Ph\u00f2ng kh\u00e1ch
+autoCompletionStrings#LevelName=T\u1EA7ng h\u1EA7m, T\u1EA7ng tr\u1EC7t, t\u1EA7ng 1, t\u1EA7ng 2, t\u1EA7ng 3
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_zh_CN.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_zh_CN.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_zh_CN.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/DefaultUserPreferences_zh_CN.properties	2011-12-21 00:48:50.000000000 +0000
@@ -19,5 +19,5 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-newWallThickness=7.5
-newHomeWallHeight=250
+autoCompletionStrings#RoomName=\u536b\u751f\u95f4, \u5367\u5ba4, \u53a8\u623f, \u8d77\u5c45\u5ba4
+autoCompletionStrings#LevelName=\u5730\u4E0B\u5BA4, \u5E95\u697C, \u4E00\u697C, 1 \u697C, \u4E8C\u697C, 2 \u697C, \u4E09\u697C, 3 \u697C, \u56DB\u697C, 4 \u697C
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/FileUserPreferences.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/FileUserPreferences.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/io/FileUserPreferences.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/io/FileUserPreferences.java	2011-12-21 00:48:50.000000000 +0000
@@ -40,6 +40,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
@@ -88,7 +89,10 @@
   private static final String WALL_PATTERN                          = "wallPattern";
   private static final String NEW_WALL_HEIGHT                       = "newHomeWallHeight";
   private static final String NEW_WALL_THICKNESS                    = "newWallThickness";
+  private static final String NEW_FLOOR_THICKNESS                   = "newFloorThickness";
   private static final String AUTO_SAVE_DELAY_FOR_RECOVERY          = "autoSaveDelayForRecovery";
+  private static final String AUTO_COMPLETION_PROPERTY              = "autoCompletionProperty#";
+  private static final String AUTO_COMPLETION_STRINGS               = "autoCompletionStrings#";
   private static final String RECENT_HOMES                          = "recentHomes#";
   private static final String IGNORED_ACTION_TIP                    = "ignoredActionTip#";  
 
@@ -104,6 +108,7 @@
   private static final String FURNITURE_ELEVATION                   = "furnitureElevation#";
   private static final String FURNITURE_COLOR                       = "furnitureColor#";
   private static final String FURNITURE_MODEL_ROTATION              = "furnitureModelRotation#";
+  private static final String FURNITURE_STAIRCASE_CUT_OUT_SHAPE           = "furnitureStaircaseCutOutShape#"; 
   private static final String FURNITURE_BACK_FACE_SHOWN             = "furnitureBackFaceShown#";
   private static final String FURNITURE_ICON_YAW                    = "furnitureIconYaw#";
   private static final String FURNITURE_PROPORTIONAL                = "furnitureProportional#";
@@ -125,7 +130,6 @@
   
   private final Map<String, Boolean> ignoredActionTips = new HashMap<String, Boolean>();
   private List<ClassLoader>          resourceClassLoaders;
-  private String []                  supportedLanguages;
   private final File                 preferencesFolder;
   private final File []              applicationFolders;
   private Preferences                preferences;
@@ -175,7 +179,12 @@
       preferences = portablePreferences;
     }
     
-    setLanguage(preferences.get(LANGUAGE, getLanguage()));    
+    String language = preferences.get(LANGUAGE, getLanguage());
+    // Check language is still supported
+    if (!Arrays.asList(getSupportedLanguages()).contains(language)) {
+      language = Locale.ENGLISH.getLanguage();  
+    }
+    setLanguage(language);    
     
     // Fill default furniture catalog 
     setFurnitureCatalog(new DefaultFurnitureCatalog(this, getFurnitureLibrariesPluginFolders()));
@@ -187,9 +196,7 @@
     // Read additional textures
     readTexturesCatalog(preferences);
 
-    DefaultUserPreferences defaultPreferences = new DefaultUserPreferences();
-    // Share same language settings 
-    defaultPreferences.setLanguage(getLanguage());
+    DefaultUserPreferences defaultPreferences = new DefaultUserPreferences(false, this);
     
     // Fill default patterns catalog 
     PatternsCatalog patternsCatalog = defaultPreferences.getPatternsCatalog();
@@ -222,8 +229,10 @@
         defaultPreferences.getNewWallThickness()));
     setNewWallHeight(preferences.getFloat(NEW_WALL_HEIGHT,
         defaultPreferences.getNewWallHeight()));    
+    setNewFloorThickness(preferences.getFloat(NEW_FLOOR_THICKNESS, 
+        defaultPreferences.getNewFloorThickness()));
     setAutoSaveDelayForRecovery(preferences.getInt(AUTO_SAVE_DELAY_FOR_RECOVERY,
-        defaultPreferences.getAutoSaveDelayForRecovery()));    
+        defaultPreferences.getAutoSaveDelayForRecovery()));
     setCurrency(defaultPreferences.getCurrency());    
     // Read recent homes list
     List<String> recentHomes = new ArrayList<String>();
@@ -243,11 +252,26 @@
         this.ignoredActionTips.put(ignoredActionTip, true);
       }
     }
+    // Get default auto completion strings
+    for (String property : defaultPreferences.getAutoCompletedProperties()) {
+      setAutoCompletionStrings(property, defaultPreferences.getAutoCompletionStrings(property));
+    }
+    // Read auto completion strings list
+    for (int i = 1; ; i++) {
+      String autoCompletionProperty = preferences.get(AUTO_COMPLETION_PROPERTY + i, null);
+      String autoCompletionStrings = preferences.get(AUTO_COMPLETION_STRINGS + i, null);
+      if (autoCompletionProperty != null && autoCompletionStrings != null) {
+        setAutoCompletionStrings(autoCompletionProperty, Arrays.asList(autoCompletionStrings.split(",")));
+      } else {
+        break;
+      }
+    }
     
     addPropertyChangeListener(Property.LANGUAGE, new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
+        public void propertyChange(PropertyChangeEvent ev) {
           updateFurnitureDefaultCatalog();
           updateTexturesDefaultCatalog();
+          updateAutoCompletionStrings();
         }
       });
     
@@ -263,7 +287,7 @@
    */
   private void updateSupportedLanguages() {
     List<ClassLoader> resourceClassLoaders = new ArrayList<ClassLoader>();
-    String [] defaultSupportedLanguages = super.getSupportedLanguages();
+    String [] defaultSupportedLanguages = getDefaultSupportedLanguages();
     Set<String> supportedLanguages = new TreeSet<String>(Arrays.asList(defaultSupportedLanguages));
    
     File [] languageLibrariesPluginFolders = getLanguageLibrariesPluginFolders();
@@ -300,9 +324,7 @@
     resourceClassLoaders.addAll(super.getResourceClassLoaders());
     this.resourceClassLoaders = Collections.unmodifiableList(resourceClassLoaders);
     if (defaultSupportedLanguages.length < supportedLanguages.size()) {
-      this.supportedLanguages = supportedLanguages.toArray(new String [supportedLanguages.size()]);
-    } else {
-      this.supportedLanguages = defaultSupportedLanguages;
+      setSupportedLanguages(supportedLanguages.toArray(new String [supportedLanguages.size()]));
     }
   }
 
@@ -341,14 +363,6 @@
   }
   
   /**
-   * Returns the default languages supported in Sweet Home 3D and languages in plugin libraries.
-   */
-  @Override
-  public String [] getSupportedLanguages() {    
-    return this.supportedLanguages;
-  }
-  
-  /**
    * Returns the default class loader of user preferences and the class loaders that
    * give access to resources in language libraries plugin folder. 
    */
@@ -414,6 +428,18 @@
   }
 
   /**
+   * Adds to auto completion strings the default strings of the new chosen language.
+   */
+  private void updateAutoCompletionStrings() {
+    DefaultUserPreferences defaultPreferences = new DefaultUserPreferences(false, this);
+    for (String property : defaultPreferences.getAutoCompletedProperties()) {
+      for (String autoCompletionString : defaultPreferences.getAutoCompletionStrings(property)) {
+        addAutoCompletionString(property, autoCompletionString);
+      }
+    }
+  }
+
+  /**
    * Read furniture catalog from preferences.
    */
   private void readFurnitureCatalog(Preferences preferences) {
@@ -436,6 +462,7 @@
       Integer color = colorString != null 
           ? Integer.valueOf(colorString) : null; 
       float [][] modelRotation = getModelRotation(preferences, FURNITURE_MODEL_ROTATION + i);
+      String staircaseCutOutShape = preferences.get(FURNITURE_STAIRCASE_CUT_OUT_SHAPE + i, null);
       boolean backFaceShown = preferences.getBoolean(FURNITURE_BACK_FACE_SHOWN + i, false);
       float iconYaw = preferences.getFloat(FURNITURE_ICON_YAW + i, 0);
       boolean proportional = preferences.getBoolean(FURNITURE_PROPORTIONAL + i, true);
@@ -449,7 +476,7 @@
       } else {
         piece = new CatalogPieceOfFurniture(name, icon, model,
             width, depth, height, elevation, movable, 
-            color, modelRotation, backFaceShown, iconYaw, proportional);
+            staircaseCutOutShape, color, modelRotation, backFaceShown, iconYaw, proportional);
       }
       try {        
         getFurnitureCatalog().add(pieceCategory, piece);
@@ -572,6 +599,7 @@
     preferences.put(WALL_PATTERN, getWallPattern().getName());
     preferences.putFloat(NEW_WALL_THICKNESS, getNewWallThickness());   
     preferences.putFloat(NEW_WALL_HEIGHT, getNewWallHeight());
+    preferences.putFloat(NEW_FLOOR_THICKNESS, getNewFloorThickness());   
     preferences.putInt(AUTO_SAVE_DELAY_FOR_RECOVERY, getAutoSaveDelayForRecovery());
     // Write recent homes list
     int i = 1;
@@ -595,6 +623,28 @@
     for ( ; i <= this.ignoredActionTips.size(); i++) {
       preferences.remove(IGNORED_ACTION_TIP + i);
     }
+    // Write auto completion strings lists
+    i = 1;
+    for (String property : getAutoCompletedProperties()) {
+      StringBuilder autoCompletionStrings = new StringBuilder();
+      Iterator<String> it = getAutoCompletionStrings(property).iterator();
+      for (int j = 0; j < 1000 && it.hasNext(); j++) {
+        String autoCompletionString = it.next();
+        // As strings are comma separated, accept only the ones without a comma 
+        if (autoCompletionString.indexOf(',') < 0) {
+          if (autoCompletionStrings.length() > 0) {
+            autoCompletionStrings.append(",");
+          } 
+          autoCompletionStrings.append(autoCompletionString);
+        }
+      }
+      preferences.put(AUTO_COMPLETION_PROPERTY + i, property);
+      preferences.put(AUTO_COMPLETION_STRINGS + i++, autoCompletionStrings.toString());
+    }
+    for ( ; preferences.get(AUTO_COMPLETION_PROPERTY + i, null) != null; i++) {
+      preferences.remove(AUTO_COMPLETION_PROPERTY + i);
+      preferences.remove(AUTO_COMPLETION_STRINGS + i);
+    }
     
     try {
       // Write preferences 
@@ -632,9 +682,12 @@
           }
           float [][] modelRotation = piece.getModelRotation();
           preferences.put(FURNITURE_MODEL_ROTATION + i, 
-              modelRotation[0][0] + " " + modelRotation[0][1] + " " + modelRotation[0][2] + " "
-              + modelRotation[1][0] + " " + modelRotation[1][1] + " " + modelRotation[1][2] + " "
-              + modelRotation[2][0] + " " + modelRotation[2][1] + " " + modelRotation[2][2]);
+              floatToString(modelRotation[0][0]) + " " + floatToString(modelRotation[0][1]) + " " + floatToString(modelRotation[0][2]) + " "
+              + floatToString(modelRotation[1][0]) + " " + floatToString(modelRotation[1][1]) + " " + floatToString(modelRotation[1][2]) + " "
+              + floatToString(modelRotation[2][0]) + " " + floatToString(modelRotation[2][1]) + " " + floatToString(modelRotation[2][2]));
+          if (piece.getStaircaseCutOutShape() != null) {
+            preferences.put(FURNITURE_STAIRCASE_CUT_OUT_SHAPE + i, piece.getStaircaseCutOutShape());
+          }
           preferences.putBoolean(FURNITURE_BACK_FACE_SHOWN + i, piece.isBackFaceShown());
           preferences.putFloat(FURNITURE_ICON_YAW + i, piece.getIconYaw());
           preferences.putBoolean(FURNITURE_PROPORTIONAL + i, piece.isProportional());
@@ -656,6 +709,7 @@
       preferences.remove(FURNITURE_ELEVATION + i);
       preferences.remove(FURNITURE_COLOR + i);
       preferences.remove(FURNITURE_MODEL_ROTATION + i);
+      preferences.remove(FURNITURE_STAIRCASE_CUT_OUT_SHAPE + i);
       preferences.remove(FURNITURE_BACK_FACE_SHOWN + i);
       preferences.remove(FURNITURE_ICON_YAW + i);
       preferences.remove(FURNITURE_PROPORTIONAL + i);
@@ -664,6 +718,21 @@
   }
 
   /**
+   * Returns the string value of the given float, except for -1.0, 1.0 or 0.0 where -1, 1 and 0 is returned.
+   */
+  private String floatToString(float f) {
+    if (Math.abs(f) < 1E-6) {
+      return "0";
+    } else if (Math.abs(f - 1f) < 1E-6) {
+      return "1";
+    } else if (Math.abs(f + 1f) < 1E-6) {
+      return "-1";
+    } else {
+      return String.valueOf(f);
+    }
+  }
+    
+  /**
    * Writes textures catalog in <code>preferences</code>.
    */
   private void writeTexturesCatalog(Preferences preferences) throws RecorderException {
@@ -973,11 +1042,6 @@
       File languageLibraryFile = new File(languageLibraryName);
       copyToLibraryFolder(languageLibraryFile, languageLibrariesPluginFolders [0]);
       updateSupportedLanguages();
-      // Switch automatically to the first language contained in library
-      Set<String> languages = getLanguages(languageLibraryFile);
-      if (!languages.isEmpty()) {
-        setLanguage(languages.iterator().next());
-      }
     } catch (IOException ex) {
       throw new RecorderException(
           "Can't write " + languageLibraryName +  " in language libraries plugin folder", ex);
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Component3DManager.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Component3DManager.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Component3DManager.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Component3DManager.java	2011-12-21 00:48:52.000000000 +0000
@@ -21,6 +21,7 @@
 
 import java.awt.GraphicsConfigTemplate;
 import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.image.BufferedImage;
 import java.util.concurrent.CountDownLatch;
@@ -55,36 +56,41 @@
   // (use Object class to ensure Component3DManager class can run with Java 3D 1.3.1)
   private Object                 renderingErrorListener; 
   private Boolean                offScreenImageSupported;
-  private GraphicsConfiguration  configuration;
-
+  private GraphicsConfiguration  defaultScreenConfiguration;
 
   private Component3DManager() {
     if (!GraphicsEnvironment.isHeadless()) {
-      // Retrieve graphics configuration once 
-      GraphicsConfigTemplate3D template = new GraphicsConfigTemplate3D();
-      // Try to get antialiasing
-      template.setSceneAntialiasing(GraphicsConfigTemplate3D.PREFERRED);
-      
-      // From http://www.java.net/node/683852
-      // Check if the user has set the Java 3D stereo option.
-      String stereo = System.getProperty("j3d.stereo");
-      if (stereo != null) {
-        if ("REQUIRED".equals(stereo))
-          template.setStereo(GraphicsConfigTemplate.REQUIRED);
-        else if ("PREFERRED".equals(stereo))
-          template.setStereo(GraphicsConfigTemplate.PREFERRED);
-      }
-      
-      this.configuration = GraphicsEnvironment.getLocalGraphicsEnvironment().
-              getDefaultScreenDevice().getBestConfiguration(template);
-      if (this.configuration == null) {
-        this.configuration = GraphicsEnvironment.getLocalGraphicsEnvironment().
-            getDefaultScreenDevice().getBestConfiguration(new GraphicsConfigTemplate3D());
+      GraphicsConfigTemplate3D template = createGraphicsConfigurationTemplate3D();
+      GraphicsDevice defaultScreenDevice = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+      this.defaultScreenConfiguration = defaultScreenDevice.getBestConfiguration(template);
+      if (this.defaultScreenConfiguration == null) {
+        this.defaultScreenConfiguration = defaultScreenDevice.getBestConfiguration(new GraphicsConfigTemplate3D());
       }
     } else {
       this.offScreenImageSupported = Boolean.FALSE;
     }
   }
+
+  /**
+   * Returns the template to configure the graphics of canvas 3D.
+   */
+  private GraphicsConfigTemplate3D createGraphicsConfigurationTemplate3D() {
+    // Retrieve graphics configuration once 
+    GraphicsConfigTemplate3D template = new GraphicsConfigTemplate3D();
+    // Try to get antialiasing
+    template.setSceneAntialiasing(GraphicsConfigTemplate3D.PREFERRED);
+    
+    // From http://www.java.net/node/683852
+    // Check if the user has set the Java 3D stereo option.
+    String stereo = System.getProperty("j3d.stereo");
+    if (stereo != null) {
+      if ("REQUIRED".equals(stereo))
+        template.setStereo(GraphicsConfigTemplate.REQUIRED);
+      else if ("PREFERRED".equals(stereo))
+        template.setStereo(GraphicsConfigTemplate.PREFERRED);
+    }
+    return template;
+  }
   
   /**
    * Returns an instance of this singleton. 
@@ -101,10 +107,11 @@
    */
   public void setRenderingErrorObserver(RenderingErrorObserver observer) {
     try {
+      Class.forName("javax.media.j3d.RenderingErrorListener");
       this.renderingErrorListener = RenderingErrorListenerManager.setRenderingErrorObserver(
           observer, this.renderingErrorListener);
       this.renderingErrorObserver = observer;
-    } catch (LinkageError ex) {
+    } catch (ClassNotFoundException ex) {
       // As RenderingErrorListener and addRenderingErrorListener are available since Java 3D 1.5, 
       // use the default rendering error reporting if Sweet Home 3D is linked to a previous version
     }
@@ -158,16 +165,30 @@
    * methods during the rendering loop.
    * @throws IllegalRenderingStateException  if the canvas 3D couldn't be created.
    */
-  private Canvas3D getCanvas3D(boolean offscreen,
+  private Canvas3D getCanvas3D(GraphicsConfiguration deviceConfiguration,
+                               boolean offscreen,
                                final RenderingObserver renderingObserver) {
-    if (this.configuration == null) {
+    GraphicsConfiguration configuration;
+    if (GraphicsEnvironment.isHeadless()) {
+      configuration = null;
+    } else if (deviceConfiguration == null
+               || deviceConfiguration.getDevice() == this.defaultScreenConfiguration.getDevice()) {
+      configuration = this.defaultScreenConfiguration;
+    } else {
+      GraphicsConfigTemplate3D template = createGraphicsConfigurationTemplate3D();      
+      configuration = deviceConfiguration.getDevice().getBestConfiguration(template);
+      if (configuration == null) {
+        configuration = deviceConfiguration.getDevice().getBestConfiguration(new GraphicsConfigTemplate3D());
+      }
+    }
+    if (configuration == null) {
       throw new IllegalRenderingStateException("Can't create graphics environment for Canvas 3D");
     }
     try {
       // Ensure unused canvases are freed
       System.gc();
       // Create a Java 3D canvas  
-      return new Canvas3D(this.configuration, offscreen) {
+      return new Canvas3D(configuration, offscreen) {
           @Override
           public void preRender() {
             if (renderingObserver != null) {
@@ -195,9 +216,10 @@
       throw ex2;
     }
   }
-  
+
   /**
-   * Returns a new on screen <code>canva3D</code> instance.
+   * Returns a new on screen <code>canva3D</code> instance. The returned canvas 3D will be associated 
+   * with the graphics configuration of the default screen device. 
    * @throws IllegalRenderingStateException  if the canvas 3D couldn't be created.
    */
   public Canvas3D getOnscreenCanvas3D() {
@@ -206,22 +228,35 @@
   
   /**
    * Returns a new on screen <code>canva3D</code> instance which rendering will be observed
-   * with the given rendering observer.
+   * with the given rendering observer. The returned canvas 3D will be associated with the 
+   * graphics configuration of the default screen device. 
    * @param renderingObserver an observer of the 3D rendering process of the returned canvas.
    *            Caution: The methods of the observer will be called in 3D rendering loop thread. 
    * @throws IllegalRenderingStateException  if the canvas 3D couldn't be created.
    */
   public Canvas3D getOnscreenCanvas3D(RenderingObserver renderingObserver) {
-    return getCanvas3D(false, renderingObserver);
+    return getCanvas3D(null, false, renderingObserver);
   }
   
   /**
+   * Returns a new on screen <code>canva3D</code> instance which rendering will be observed
+   * with the given rendering observer.  
+   * @param renderingObserver an observer of the 3D rendering process of the returned canvas.
+   *            Caution: The methods of the observer will be called in 3D rendering loop thread. 
+   * @throws IllegalRenderingStateException  if the canvas 3D couldn't be created.
+   */
+  public Canvas3D getOnscreenCanvas3D(GraphicsConfiguration deviceConfiguration, 
+                                      RenderingObserver renderingObserver) {
+    return getCanvas3D(deviceConfiguration, false, renderingObserver);
+  }
+
+  /**
    * Returns a new off screen <code>canva3D</code> at the given size. 
    * @throws IllegalRenderingStateException  if the canvas 3D couldn't be created.
    *    To avoid this exception, call {@link #isOffScreenImageSupported() isOffScreenImageSupported()} first.
    */
   public Canvas3D getOffScreenCanvas3D(int width, int height) {
-    Canvas3D offScreenCanvas = getCanvas3D(true, null);
+    Canvas3D offScreenCanvas = getCanvas3D(null, true, null);
     // Configure canvas 3D for offscreen
     Screen3D screen3D = offScreenCanvas.getScreen3D();
     screen3D.setSize(width, height);
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Ground3D.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Ground3D.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Ground3D.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Ground3D.java	2011-12-21 00:48:52.000000000 +0000
@@ -22,8 +22,16 @@
 import java.awt.Color;
 import java.awt.geom.Area;
 import java.awt.geom.PathIterator;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 import javax.media.j3d.Appearance;
 import javax.media.j3d.ColoringAttributes;
@@ -34,8 +42,11 @@
 import javax.vecmath.TexCoord2f;
 
 import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.HomeTexture;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.Room;
+import com.eteks.sweethome3d.model.Wall;
 import com.sun.j3d.utils.geometry.GeometryInfo;
 
 /**
@@ -94,7 +105,7 @@
   }
   
   /**
-   * Updates ground coloring and texture attributes from home ground color and texture.
+   * Updates the geometry and attributes of ground and sublevels.
    */
   private void update(boolean waitTextureLoadingEnd) {
     Home home = (Home)getUserData();
@@ -117,117 +128,302 @@
       groundAppearance.setTexture(null);
     }
     
-    // Create ground geometry
-    List<Point3f> coords = new ArrayList<Point3f>();
-    List<Integer> stripCounts = new ArrayList<Integer>();
-    // First add the coordinates of the ground rectangle
-    coords.add(new Point3f(this.originX, 0, this.originY)); 
-    coords.add(new Point3f(this.originX, 0, this.originY + this.depth));
-    coords.add(new Point3f(this.originX + this.width, 0, this.originY + this.depth));
-    coords.add(new Point3f(this.originX + this.width, 0, this.originY));
-    // Compute ground texture coordinates if necessary
-    List<TexCoord2f> textureCoords = new ArrayList<TexCoord2f>();
-    if (groundTexture != null) {
-      textureCoords.add(new TexCoord2f(0, 0));
-      textureCoords.add(new TexCoord2f(0, -this.depth / groundTexture.getHeight()));
-      textureCoords.add(new TexCoord2f(this.width / groundTexture.getWidth(), -this.depth / groundTexture.getHeight()));
-      textureCoords.add(new TexCoord2f(this.width / groundTexture.getWidth(), 0));
-    }
-    stripCounts.add(4);
-
-    // Compute the union of the rooms
-    Area roomsArea = new Area();
+    Area areaRemovedFromGround = new Area();
+    // Compute the union of the rooms, the underground walls and furniture areas 
+    Comparator<Level> levelComparator = new Comparator<Level>() {
+        public int compare(Level level1, Level level2) {
+          return -Float.compare(level1.getElevation(), level2.getElevation());
+        }
+      };
+    Map<Level, Area> undergroundAreas = new TreeMap<Level, Area>(levelComparator);
+    Map<Level, Area> roomAreas = new TreeMap<Level, Area>(levelComparator);
     for (Room room : home.getRooms()) {
+      Level roomLevel = room.getLevel();
       if (room.isFloorVisible()) {
-        float [][] points = room.getPoints();
-        if (points.length > 2) {
-          roomsArea.add(new Area(getShape(points)));
+        float [][] roomPoints = room.getPoints();
+        if (roomPoints.length > 2) {
+          Area roomArea = null;
+          if (roomLevel == null
+              || (roomLevel.getElevation() <= 0
+                  && roomLevel.isVisible())) {
+            roomArea = new Area(getShape(roomPoints));
+            areaRemovedFromGround.add(roomArea);
+            updateUndergroundAreas(roomAreas, room.getLevel(), roomPoints, roomArea);
+          }
+          updateUndergroundAreas(undergroundAreas, room.getLevel(), roomPoints, roomArea);
         }
       }
     }
+    
+    // Search all items at negative levels that could dig the ground 
+    for (HomePieceOfFurniture piece : home.getFurniture()) {
+      updateUndergroundAreas(undergroundAreas, piece.getLevel(), piece.getPoints(), null);
+    }
+    Map<Level, Area> wallAreas = new HashMap<Level, Area>();
+    for (Wall wall : home.getWalls()) {
+      updateUndergroundAreas(wallAreas, wall.getLevel(), wall.getPoints(), null);
+    }
+    // Consider that walls around a closed area define a hole 
+    for (Map.Entry<Level, Area> wallAreaEntry : wallAreas.entrySet()) {
+      for (float [][] points : getAreaPoints(wallAreaEntry.getValue())) {
+        if (!new Room(points).isClockwise()) {
+          updateUndergroundAreas(undergroundAreas, wallAreaEntry.getKey(), points, null);
+        }
+      }
+    }
+    
+    Map<Level, Area> undergroundSideAreas = new TreeMap<Level, Area>(levelComparator);
+    Map<Level, Area> upperLevelAreas = new HashMap<Level, Area>();
+    for (Map.Entry<Level, Area> undergroundAreaEntry : undergroundAreas.entrySet()) {
+      Level level = undergroundAreaEntry.getKey();
+      Area area = undergroundAreaEntry.getValue();
+      undergroundSideAreas.put(level, (Area)area.clone());
+      upperLevelAreas.put(level, new Area());
+      // Remove lower levels areas from the area at the current level
+      for (Map.Entry<Level, Area> otherUndergroundAreaEntry : undergroundAreas.entrySet()) {
+        if (otherUndergroundAreaEntry.getKey().getElevation() < level.getElevation()) {
+          for (float [][] points : getAreaPoints(otherUndergroundAreaEntry.getValue())) {
+            if (!new Room(points).isClockwise()) {
+              Area pointsArea = new Area(getShape(points));
+              area.subtract(pointsArea);
+              undergroundSideAreas.get(level).add(pointsArea);
+            }
+          }
+        }
+      }      
+      // Add underground area to ground area at ground level
+      for (float [][] points : getAreaPoints(area)) {
+        if (new Room(points).isClockwise()) {
+          upperLevelAreas.get(level).add(new Area(getShape(points)));
+        } else {
+          areaRemovedFromGround.add(new Area(getShape(points)));
+        }
+      }
+    }
+    // Remove room areas 
+    for (Map.Entry<Level, Area> undergroundAreaEntry : undergroundAreas.entrySet()) {
+      Level level = undergroundAreaEntry.getKey();
+      Area area = undergroundAreaEntry.getValue();
+      Area roomArea = roomAreas.get(level);
+      if (roomArea != null) {
+        area.subtract(roomArea);
+      }
+    }
+    
+    // Define ground and underground levels surfaces
+    Area groundArea = new Area(getShape(new float [][] {
+        {this.originX, this.originY}, 
+        {this.originX, this.originY + this.depth},
+        {this.originX + this.width, this.originY + this.depth},
+        {this.originX + this.width, this.originY}}));
+    Rectangle2D removedAreaBounds = areaRemovedFromGround.getBounds2D();
+    if (!groundArea.getBounds2D().equals(removedAreaBounds)) {
+      Area outsideGroundArea = groundArea;
+      if (areaRemovedFromGround.isEmpty()) {
+        removedAreaBounds = new Rectangle2D.Float(Math.max(-5E3f, this.originX), Math.max(-5E3f, this.originY), 0, 0);
+        removedAreaBounds.add(Math.min(5E3f, this.originX + this.width), 
+            Math.min(5E3f, this.originY + this.depth));            
+      } else {
+        removedAreaBounds.add(Math.max(removedAreaBounds.getMinX() - 5E3, this.originX), 
+            Math.max(removedAreaBounds.getMinY() - 5E3, this.originY));
+        removedAreaBounds.add(Math.min(removedAreaBounds.getMaxX() + 5E3, this.originX + this.width), 
+            Math.min(removedAreaBounds.getMaxY() + 5E3, this.originY + this.depth));
+      }
+      groundArea = new Area(removedAreaBounds);
+      outsideGroundArea.subtract(groundArea);
+      // Divide the ground at level 0 in two geometries to limit visual artifacts on large zone  
+      addAreaGeometry(groundShape, groundTexture, outsideGroundArea, 0);
+    }
+    groundArea.subtract(areaRemovedFromGround);
+    undergroundAreas.put(new Level("Ground", 0, 0, 0), groundArea);
+    float previousLevelElevation = 0;
+    for (Map.Entry<Level, Area> undergroundAreaEntry : undergroundAreas.entrySet()) {
+      Level level = undergroundAreaEntry.getKey();
+      float elevation = level.getElevation();
+      addAreaGeometry(groundShape, groundTexture, undergroundAreaEntry.getValue(), elevation);
+      if (previousLevelElevation - elevation > 0) {
+        for (float [][] points : getAreaPoints(undergroundSideAreas.get(level))) {
+          addAreaSidesGeometry(groundShape, groundTexture, points, elevation, previousLevelElevation - elevation);
+        }
+        for (float [][] points : getAreaPoints(upperLevelAreas.get(level))) {
+          addAreaGeometry(groundShape, groundTexture, points, null, previousLevelElevation);
+        }
+      }
+      previousLevelElevation = elevation;
+    }
+
+    // Remove old geometries
+    for (int i = currentGeometriesCount - 1; i >= 0; i--) {
+      groundShape.removeGeometry(i);
+    }
+  }
 
-    // Retrieve points
-    List<float [][]> roomParts = new ArrayList<float [][]>();
-    List<float []>   roomPart  = new ArrayList<float[]>();
+  /**
+   * Returns the list of points that defines the given area.
+   */
+  private List<float [][]> getAreaPoints(Area area) {
+    List<float [][]> areaPoints = new ArrayList<float [][]>();
+    List<float []>   areaPartPoints  = new ArrayList<float[]>();
     float [] previousRoomPoint = null;
-    for (PathIterator it = roomsArea.getPathIterator(null); !it.isDone(); ) {
+    for (PathIterator it = area.getPathIterator(null); !it.isDone(); ) {
       float [] roomPoint = new float[2];
       if (it.currentSegment(roomPoint) == PathIterator.SEG_CLOSE) {
-        if (roomPart.get(0) [0] == previousRoomPoint [0] 
-            && roomPart.get(0) [1] == previousRoomPoint [1]) {
-          roomPart.remove(roomPart.size() - 1);
+        if (areaPartPoints.get(0) [0] == previousRoomPoint [0] 
+            && areaPartPoints.get(0) [1] == previousRoomPoint [1]) {
+          areaPartPoints.remove(areaPartPoints.size() - 1);
         }
-        if (roomPart.size() > 2) {
-          roomParts.add(roomPart.toArray(new float [roomPart.size()][]));
+        if (areaPartPoints.size() > 2) {
+          areaPoints.add(areaPartPoints.toArray(new float [areaPartPoints.size()][]));
         }
-        roomPart.clear();
+        areaPartPoints.clear();
         previousRoomPoint = null;
       } else {
         if (previousRoomPoint == null
             || roomPoint [0] != previousRoomPoint [0] 
             || roomPoint [1] != previousRoomPoint [1]) {
-          roomPart.add(roomPoint);
+          areaPartPoints.add(roomPoint);
         }
         previousRoomPoint = roomPoint;
       }
       it.next();
     }
-    
-    for (float [][] points : roomParts) {
-      if (!new Room(points).isClockwise()) {
-        // Define a hole in ground
-        for (float [] point : points) {
-          coords.add(new Point3f(point [0], 0, point [1]));
-          if (groundTexture != null) {
-            textureCoords.add(new TexCoord2f((point [0] - this.originX) / groundTexture.getWidth(), 
-                (this.originY - point [1]) / groundTexture.getHeight()));
-          }
-        }
-        stripCounts.add(points.length);
+    return areaPoints;
+  }
+
+  /**
+   * Adds the given area to the underground areas for level below zero.
+   */
+  private void updateUndergroundAreas(Map<Level, Area> undergroundAreas, 
+                                      Level      level, 
+                                      float [][] points, 
+                                      Area       area) {
+    if (level != null 
+        && level.getElevation() < 0) {
+      Area itemsArea = undergroundAreas.get(level);
+      if (itemsArea == null) {
+        itemsArea = new Area();
+        undergroundAreas.put(level, itemsArea);
+      }
+      itemsArea.add(area != null
+          ? area
+          : new Area(getShape(points)));
+    }
+  }
+
+  /**
+   * Adds to ground shape the geometry matching the given area.
+   */
+  public void addAreaGeometry(Shape3D groundShape, HomeTexture groundTexture, Area area, float elevation) {
+    List<float [][]> levelHolesPoints = new ArrayList<float[][]>();
+    for (float [][] points : getAreaPoints(area)) {
+      if (new Room(points).isClockwise()) {
+        levelHolesPoints.add(points);
       } else {
-        // Define an inner surface in ground
-        Point3f [] innerSurfaceCoords = new Point3f [points.length];
-        TexCoord2f [] innerSurfaceTextureCoords = groundTexture != null 
-            ? new TexCoord2f [points.length]
-            : null;
-        for (int i = 0, j = points.length - 1; i < points.length; i++, j--) {
-          float [] point = points [i];
-          innerSurfaceCoords [j] = new Point3f(point [0], 0, point [1]);
-          if (groundTexture != null) {
-            innerSurfaceTextureCoords [j] = new TexCoord2f((point [0] - this.originX) / groundTexture.getWidth(), 
-                (this.originY - point [1]) / groundTexture.getHeight());
-          }
-        }
-        GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY);
-        geometryInfo.setCoordinates (innerSurfaceCoords);
+        addAreaGeometry(groundShape, groundTexture, points, levelHolesPoints, elevation);
+        levelHolesPoints.clear();
+      }
+    }
+  }
+
+  /**
+   * Adds to ground shape the geometry matching the area defined by the given points and hole points.
+   */
+  private void addAreaGeometry(Shape3D groundShape, 
+                               HomeTexture groundTexture, 
+                               float [][] areaPoints,
+                               List<float [][]> holesPoints, 
+                               float elevation) {
+    if (holesPoints == null) {
+      holesPoints = Collections.emptyList();
+    }
+    int pointCount = areaPoints.length;    
+    for (float [][] holePoints : holesPoints) {
+      pointCount += holePoints.length;
+    }
+    Point3f [] geometryCoords = new Point3f [pointCount];
+    int [] stripCounts = new int [1 + holesPoints.size()];
+    int [] contourCounts = new int [stripCounts.length - holesPoints.size()];    
+    TexCoord2f [] geometryTextureCoords = groundTexture != null 
+        ? new TexCoord2f [pointCount]
+        : null;
+    
+    stripCounts [0] = areaPoints.length;
+    Arrays.fill(contourCounts, 1);
+    for (int i = 0; i < holesPoints.size(); i++) {
+      stripCounts [i + 1] = holesPoints.get(i).length;
+      contourCounts [0]++;
+    }
+    int j = 0;
+    for (int i = 0; i < areaPoints.length; i++, j++) {
+      float [] point = areaPoints [i];
+      geometryCoords [j] = new Point3f(point [0], elevation, point [1]);
+      if (groundTexture != null) {
+        geometryTextureCoords [j] = new TexCoord2f((point [0] - this.originX) / groundTexture.getWidth(), 
+            (this.originY - point [1]) / groundTexture.getHeight());
+      }
+    }
+    for (float [][] holePoints : holesPoints) {
+      for (int i = 0; i < holePoints.length; i++, j++) {
+        float [] point = holePoints [i];
+        geometryCoords [j] = new Point3f(point [0], elevation, point [1]);
         if (groundTexture != null) {
-          geometryInfo.setTextureCoordinateParams(1, 2);
-          geometryInfo.setTextureCoordinates(0, innerSurfaceTextureCoords);
+          geometryTextureCoords [j] = new TexCoord2f((point [0] - this.originX) / groundTexture.getWidth(), 
+              (this.originY - point [1]) / groundTexture.getHeight());
         }
-        geometryInfo.setStripCounts(new int [] {points.length});
-        geometryInfo.setContourCounts(new int [] {1});
-        groundShape.addGeometry(geometryInfo.getIndexedGeometryArray());
       }
     }
-
+    
     GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY);
-    geometryInfo.setCoordinates (coords.toArray(new Point3f [coords.size()]));
-    int [] stripCountsArray = new int [stripCounts.size()];
-    for (int i = 0; i < stripCountsArray.length; i++) {
-      stripCountsArray [i] = stripCounts.get(i);
+    geometryInfo.setCoordinates (geometryCoords);
+    if (groundTexture != null) {
+      geometryInfo.setTextureCoordinateParams(1, 2);
+      geometryInfo.setTextureCoordinates(0, geometryTextureCoords);
+    }
+    geometryInfo.setStripCounts(stripCounts);
+    geometryInfo.setContourCounts(contourCounts);
+    groundShape.addGeometry(geometryInfo.getIndexedGeometryArray());
+  }
+
+  /**
+   * Adds to ground shape the geometry matching the given area sides.
+   */
+  private void addAreaSidesGeometry(Shape3D groundShape, 
+                                    HomeTexture groundTexture, 
+                                    float [][] areaPoints,
+                                    float elevation, 
+                                    float sideHeight) {
+    Point3f [] geometryCoords = new Point3f [areaPoints.length * 4];
+    int [] stripCounts = new int [areaPoints.length];
+    int [] contourCounts = new int [stripCounts.length];    
+    TexCoord2f [] geometryTextureCoords = groundTexture != null 
+        ? new TexCoord2f [geometryCoords.length]
+        : null;
+    Arrays.fill(stripCounts, 4);
+    Arrays.fill(contourCounts, 1);
+    for (int i = 0, j = 0; i < areaPoints.length; i++) {
+      float [] point = areaPoints [i];
+      float [] nextPoint = areaPoints [i < areaPoints.length - 1 ? i + 1 : 0];
+      geometryCoords [j++] = new Point3f(point [0], elevation, point [1]);
+      geometryCoords [j++] = new Point3f(point [0], elevation + sideHeight, point [1]);
+      geometryCoords [j++] = new Point3f(nextPoint [0], elevation + sideHeight, nextPoint [1]);
+      geometryCoords [j++] = new Point3f(nextPoint [0], elevation, nextPoint [1]);
+      if (groundTexture != null) {
+        float distance = (float)Point2D.distance(point [0], point [1], nextPoint [0], nextPoint [1]);
+        geometryTextureCoords [j - 4] = new TexCoord2f(point [0] / groundTexture.getWidth(), elevation / groundTexture.getHeight());
+        geometryTextureCoords [j - 3] = new TexCoord2f(point [0] / groundTexture.getWidth(), (elevation + sideHeight) / groundTexture.getHeight());
+        geometryTextureCoords [j - 2] = new TexCoord2f((point [0] - distance) / groundTexture.getWidth(), (elevation + sideHeight) / groundTexture.getHeight());
+        geometryTextureCoords [j - 1] = new TexCoord2f((point [0] - distance) / groundTexture.getWidth(), elevation / groundTexture.getHeight());
+      }
     }
-    geometryInfo.setStripCounts(stripCountsArray);
-    geometryInfo.setContourCounts(new int [] {stripCountsArray.length});
 
+    GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY);
+    geometryInfo.setCoordinates (geometryCoords);
     if (groundTexture != null) {
       geometryInfo.setTextureCoordinateParams(1, 2);
-      geometryInfo.setTextureCoordinates(0, textureCoords.toArray(new TexCoord2f [textureCoords.size()]));
-    }    
-    groundShape.addGeometry(geometryInfo.getIndexedGeometryArray());
-    
-    // Remove old geometries
-    for (int i = currentGeometriesCount - 1; i >= 0; i--) {
-      groundShape.removeGeometry(i);
+      geometryInfo.setTextureCoordinates(0, geometryTextureCoords);
     }
+    geometryInfo.setStripCounts(stripCounts);
+    geometryInfo.setContourCounts(contourCounts);
+    groundShape.addGeometry(geometryInfo.getIndexedGeometryArray());
   }
 }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/HomePieceOfFurniture3D.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/HomePieceOfFurniture3D.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/HomePieceOfFurniture3D.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/HomePieceOfFurniture3D.java	2011-12-21 00:48:52.000000000 +0000
@@ -27,7 +27,9 @@
 import java.util.Set;
 
 import javax.media.j3d.Appearance;
+import javax.media.j3d.BoundingBox;
 import javax.media.j3d.BranchGroup;
+import javax.media.j3d.CapabilityNotSetException;
 import javax.media.j3d.Geometry;
 import javax.media.j3d.GeometryArray;
 import javax.media.j3d.Group;
@@ -44,6 +46,7 @@
 import javax.media.j3d.TransformGroup;
 import javax.media.j3d.TransparencyAttributes;
 import javax.vecmath.Color3f;
+import javax.vecmath.Point3d;
 import javax.vecmath.Vector3d;
 import javax.vecmath.Vector3f;
 import javax.vecmath.Vector4f;
@@ -188,8 +191,11 @@
     orientation.mul(scale);
     // Translate it to its location
     Transform3D pieceTransform = new Transform3D();
-    pieceTransform.setTranslation(new Vector3f(
-        piece.getX(), piece.getElevation() + piece.getHeight() / 2, piece.getY()));      
+    float z = piece.getElevation() + piece.getHeight() / 2;
+    if (piece.getLevel() != null) {
+      z += piece.getLevel().getElevation();
+    }
+    pieceTransform.setTranslation(new Vector3f(piece.getX(), z, piece.getY()));      
     pieceTransform.mul(orientation);
     
     // Change model transformation      
@@ -203,16 +209,16 @@
     HomePieceOfFurniture piece = (HomePieceOfFurniture)getUserData();
     Node filledModelNode = getFilledModelNode();
     if (piece.getColor() != null) {
-      setColorAndTexture(filledModelNode, piece.getColor(), null, piece.getShininess(), 
-          false, null, null, new HashSet<Appearance>());
+      setColorAndTexture(filledModelNode, piece.getColor(), null, piece.getShininess(), false, 
+          null, null, new HashSet<Appearance>());
     } else if (piece.getTexture() != null) {
-      setColorAndTexture(filledModelNode, null, piece.getTexture(), piece.getShininess(),
-          waitTextureLoadingEnd, new Vector3f(piece.getWidth(), piece.getHeight(), piece.getDepth()),
-          ModelManager.getInstance().getSize(((Group)filledModelNode).getChild(0)), new HashSet<Appearance>());
+      setColorAndTexture(filledModelNode, null, piece.getTexture(), piece.getShininess(), waitTextureLoadingEnd,
+          new Vector3f(piece.getWidth(), piece.getHeight(), piece.getDepth()), ModelManager.getInstance().getBounds(((Group)filledModelNode).getChild(0)),
+          new HashSet<Appearance>());
     } else {
       // Set default material and texture of model
-      setColorAndTexture(filledModelNode, null, null, piece.getShininess(), 
-          false, null, null, new HashSet<Appearance>());
+      setColorAndTexture(filledModelNode, null, null, piece.getShininess(), false, 
+          null, null, new HashSet<Appearance>());
     }
   }
 
@@ -251,13 +257,16 @@
       drawingMode = null; 
     }
     // Update visibility of filled model shapes
-    setVisible(getFilledModelNode(), piece.isVisible()
+    boolean visible = piece.isVisible() 
+        && (piece.getLevel() == null
+            || piece.getLevel().isVisible()); 
+    setVisible(getFilledModelNode(), visible
         && (drawingMode == null
             || drawingMode == HomeEnvironment.DrawingMode.FILL 
             || drawingMode == HomeEnvironment.DrawingMode.FILL_AND_OUTLINE));
     if (outlineModelNode != null) {
       // Update visibility of outline model shapes
-      setVisible(outlineModelNode, piece.isVisible()
+      setVisible(outlineModelNode, visible
           && (drawingMode == HomeEnvironment.DrawingMode.OUTLINE
               || drawingMode == HomeEnvironment.DrawingMode.FILL_AND_OUTLINE));
     }
@@ -423,19 +432,22 @@
    * Sets the material and texture attribute of all <code>Shape3D</code> children nodes of <code>node</code> 
    * from the given <code>color</code> and <code>texture</code>. 
    */
-  private void setColorAndTexture(Node node, Integer color, HomeTexture texture, 
-                                  Float shininess, boolean waitTextureLoadingEnd,
-                                  Vector3f pieceSize, Vector3f modelSize, Set<Appearance> modifiedAppearances) {
+  private void setColorAndTexture(Node node, Integer color, 
+                                  HomeTexture texture, Float shininess, 
+                                  boolean waitTextureLoadingEnd, Vector3f pieceSize,
+                                  BoundingBox modelBounds, Set<Appearance> modifiedAppearances) {
     if (node instanceof Group) {
       // Set material and texture of all children
       Enumeration<?> enumeration = ((Group)node).getAllChildren(); 
       while (enumeration.hasMoreElements()) {
-        setColorAndTexture((Node)enumeration.nextElement(), color, texture, shininess, waitTextureLoadingEnd,
-            pieceSize, modelSize, modifiedAppearances);
+        setColorAndTexture((Node)enumeration.nextElement(), color, 
+            texture, shininess, waitTextureLoadingEnd, pieceSize,
+            modelBounds, modifiedAppearances);
       }
     } else if (node instanceof Link) {
-      setColorAndTexture(((Link)node).getSharedGroup(), color, texture, shininess, waitTextureLoadingEnd,
-          pieceSize, modelSize, modifiedAppearances);
+      setColorAndTexture(((Link)node).getSharedGroup(), color,
+          texture, shininess, waitTextureLoadingEnd, pieceSize,
+          modelBounds, modifiedAppearances);
     } else if (node instanceof Shape3D) {
       final Shape3D shape = (Shape3D)node;
       String shapeName = (String)shape.getUserData();
@@ -470,13 +482,25 @@
             appearance.setTexCoordGeneration(defaultMaterialAndTexture.getTexCoordGeneration());
             appearance.setTextureAttributes(defaultMaterialAndTexture.getTextureAttributes());
             appearance.setTexture(null);
-          } else if (color == null && texture != null) {
+          } else if (color == null && texture != null) {            
             // Change material to white then texture
             appearance.setMaterial(getMaterial(DEFAULT_COLOR, DEFAULT_AMBIENT_COLOR, materialShininess));
+            Point3d lower = new Point3d();
+            modelBounds.getLower(lower);
+            Point3d upper = new Point3d();
+            modelBounds.getUpper(upper);
+            float minimumSize = ModelManager.getInstance().getMinimumSize();
+            float sx = pieceSize.x / (float)Math.max(upper.x - lower.x, minimumSize) / texture.getWidth();
+            float sw = texture.isLeftToRightOriented()  
+                ? (float)-lower.x * sx  
+                : 0;
+            float ty = pieceSize.y / (float)Math.max(upper.y - lower.y, minimumSize) / texture.getHeight();
+            float tz = pieceSize.z / (float)Math.max(upper.z - lower.z, minimumSize) / texture.getHeight();
+            float tw = texture.isLeftToRightOriented()  
+                ? (float)(-lower.y * ty + upper.z * tz)
+                : 0;
             TexCoordGeneration texCoordGeneration = new TexCoordGeneration(TexCoordGeneration.OBJECT_LINEAR,
-                TexCoordGeneration.TEXTURE_COORDINATE_2,
-                new Vector4f(-pieceSize.x / modelSize.x / texture.getWidth(), 0, 0, 0), 
-                new Vector4f(0, pieceSize.y / modelSize.y / texture.getHeight(), pieceSize.z / modelSize.z / texture.getHeight(), 0));
+                TexCoordGeneration.TEXTURE_COORDINATE_2, new Vector4f(sx, 0, 0, sw), new Vector4f(0, ty, -tz, tw));
             appearance.setTexCoordGeneration(texCoordGeneration);
             appearance.setTextureAttributes(MODULATE_TEXTURE_ATTRIBUTES);
             TextureManager.getInstance().loadTexture(texture.getImage(), waitTextureLoadingEnd,
@@ -594,8 +618,13 @@
       }
       
       // Change cull face 
-      if (polygonAttributes.getCullFace() != PolygonAttributes.CULL_NONE) {
-        polygonAttributes.setCullFace(cullFace);
+      try {
+        if (polygonAttributes.getCullFace() != PolygonAttributes.CULL_NONE) {
+          polygonAttributes.setCullFace(cullFace);
+        }
+      } catch (CapabilityNotSetException ex) {
+        // Shouldn't happen since capability is set but happens though with Java 3D 1.3
+        ex.printStackTrace();
       }
     }
   }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/ModelManager.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/ModelManager.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/ModelManager.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/ModelManager.java	2011-12-21 00:48:52.000000000 +0000
@@ -204,33 +204,59 @@
   }
   
   /**
-   * Returns the size of 3D shapes under <code>node</code>.
+   * Returns the minimum size of a model.
+   */
+  float getMinimumSize() {
+    return MINIMUM_SIZE;
+  }
+  
+  /**
+   * Returns the size of 3D shapes of <code>node</code>.
    * This method computes the exact box that contains all the shapes,
    * contrary to <code>node.getBounds()</code> that returns a bounding 
    * sphere for a scene.
    */
   public Vector3f getSize(Node node) {
-    BoundingBox bounds = getBounds(node);
+    return getSize(node, new Transform3D());
+  }
+  
+  /**
+   * Returns the size of 3D shapes of <code>node</code> after an additional <code>transformation</code>.
+   * This method computes the exact box that contains all the shapes,
+   * contrary to <code>node.getBounds()</code> that returns a bounding 
+   * sphere for a scene.
+   */
+  public Vector3f getSize(Node node, Transform3D transformation) {
+    BoundingBox bounds = getBounds(node, transformation);
     Point3d lower = new Point3d();
     bounds.getLower(lower);
     Point3d upper = new Point3d();
     bounds.getUpper(upper);
-    return new Vector3f(Math.max(MINIMUM_SIZE, (float)(upper.x - lower.x)), 
-        Math.max(MINIMUM_SIZE, (float)(upper.y - lower.y)), 
-        Math.max(MINIMUM_SIZE, (float)(upper.z - lower.z)));
+    return new Vector3f(Math.max(getMinimumSize(), (float)(upper.x - lower.x)), 
+        Math.max(getMinimumSize(), (float)(upper.y - lower.y)), 
+        Math.max(getMinimumSize(), (float)(upper.z - lower.z)));
   }
   
   /**
-   * Returns the bounds of 3D shapes under <code>node</code>.
+   * Returns the bounds of the 3D shapes of <code>node</code>.
    * This method computes the exact box that contains all the shapes,
    * contrary to <code>node.getBounds()</code> that returns a bounding 
    * sphere for a scene.
    */
   public BoundingBox getBounds(Node node) {
+    return getBounds(node, new Transform3D());
+  }
+  
+  /**
+   * Returns the bounds of the 3D shapes of <code>node</code> with an additional <code>transformation</code>.
+   * This method computes the exact box that contains all the shapes, contrary to <code>node.getBounds()</code> 
+   * that returns a bounding sphere for a scene.
+   */
+  public BoundingBox getBounds(Node node, Transform3D transformation) {
     BoundingBox objectBounds = new BoundingBox(
         new Point3d(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY),
         new Point3d(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY));
-    computeBounds(node, objectBounds, new Transform3D());
+    computeBounds(node, objectBounds, transformation, !isOrthogonalRotation(transformation));
     Point3d lower = new Point3d();
     objectBounds.getLower(lower);
     if (lower.x == Double.POSITIVE_INFINITY) {
@@ -239,7 +265,28 @@
     return objectBounds;
   }
   
-  private void computeBounds(Node node, BoundingBox bounds, Transform3D parentTransformations) {
+  /**
+   * Returns <code>true</code> if the rotation matrix matches only rotations of 
+   * a multiple of 90� degrees around x, y or z axis.
+   */
+  private boolean isOrthogonalRotation(Transform3D transformation) {
+    Matrix3f matrix = new Matrix3f();
+    transformation.get(matrix);
+    for (int i = 0; i < 3; i++) {
+      for (int j = 0; j < 3; j++) {
+        // Return false if the matrix contains a value different from 0 1 or -1
+        if (Math.abs(matrix.getElement(i, j)) > 1E-6
+            && Math.abs(matrix.getElement(i, j) - 1) > 1E-6
+            && Math.abs(matrix.getElement(i, j) + 1) > 1E-6) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  private void computeBounds(Node node, BoundingBox bounds, 
+                             Transform3D parentTransformations, boolean transformShapeGeometry) {
     if (node instanceof Group) {
       if (node instanceof TransformGroup) {
         parentTransformations = new Transform3D(parentTransformations);
@@ -250,57 +297,147 @@
       // Compute the bounds of all the node children
       Enumeration<?> enumeration = ((Group)node).getAllChildren();
       while (enumeration.hasMoreElements ()) {
-        computeBounds((Node)enumeration.nextElement(), bounds, parentTransformations);
+        computeBounds((Node)enumeration.nextElement(), bounds, parentTransformations, transformShapeGeometry);
       }
     } else if (node instanceof Link) {
-      computeBounds(((Link)node).getSharedGroup(), bounds, parentTransformations);
+      computeBounds(((Link)node).getSharedGroup(), bounds, parentTransformations, transformShapeGeometry);
     } else if (node instanceof Shape3D) {
-      Bounds shapeBounds = ((Shape3D)node).getBounds();
-      shapeBounds.transform(parentTransformations);
+      Shape3D shape = (Shape3D)node;
+      Bounds shapeBounds;
+      if (transformShapeGeometry) {
+        shapeBounds = computeTransformedGeometryBounds(shape, parentTransformations);
+      } else {
+        shapeBounds = shape.getBounds();
+        shapeBounds.transform(parentTransformations);
+      }
       bounds.combine(shapeBounds);
     }
   }
 
+  private Bounds computeTransformedGeometryBounds(Shape3D shape, Transform3D transformation) {
+    Point3d lower = new Point3d(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
+    Point3d upper = new Point3d(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);    
+    for (int i = 0, n = shape.numGeometries(); i < n; i++) {
+      Geometry geometry = shape.getGeometry(i);
+      if (geometry instanceof GeometryArray) {
+        GeometryArray geometryArray = (GeometryArray)geometry;      
+        int vertexCount = geometryArray.getVertexCount();
+        Point3f vertex = new Point3f();
+        if ((geometryArray.getVertexFormat() & GeometryArray.BY_REFERENCE) != 0) {
+          if ((geometryArray.getVertexFormat() & GeometryArray.INTERLEAVED) != 0) {
+            float [] vertexData = geometryArray.getInterleavedVertices();
+            int vertexSize = vertexData.length / vertexCount;
+            for (int index = 0, j = vertexSize - 3; index < vertexCount; j += vertexSize, index++) {
+              vertex.x = vertexData [j];
+              vertex.y = vertexData [j + 1];
+              vertex.z = vertexData [j + 2];
+              updateBounds(vertex, transformation, lower, upper);
+            }
+          } else {
+            float [] vertexCoordinates = geometryArray.getCoordRefFloat();
+            for (int index = 0, j = 0; index < vertexCount; j += 3, index++) {
+              vertex.x = vertexCoordinates [j];
+              vertex.y = vertexCoordinates [j + 1];
+              vertex.z = vertexCoordinates [j + 2];
+              updateBounds(vertex, transformation, lower, upper);
+            }
+          }
+        } else {
+          for (int index = 0; index < vertexCount; index++) {
+            geometryArray.getCoordinate(index, vertex);
+            updateBounds(vertex, transformation, lower, upper);
+          }
+        }
+      } else {
+        Bounds shapeBounds = shape.getBounds();
+        shapeBounds.transform(transformation);
+        return shapeBounds;
+      }
+    }
+    Bounds shapeBounds = new BoundingBox(lower, upper);
+    return shapeBounds;
+  }
+
+  private void updateBounds(Point3f vertex, Transform3D transformation, Point3d lower, Point3d upper) {
+    transformation.transform(vertex);
+    if (lower.x > vertex.x) {
+      lower.x = vertex.x;
+    }
+    if (lower.y > vertex.y) {
+      lower.y = vertex.y;
+    }
+    if (lower.z > vertex.z) {
+      lower.z = vertex.z;
+    }
+    if (upper.x < vertex.x) {
+      upper.x = vertex.x;
+    }
+    if (upper.y < vertex.y) {
+      upper.y = vertex.y;
+    }
+    if (upper.z < vertex.z) {
+      upper.z = vertex.z;
+    }
+  }
+
   /**
    * Returns a transform group that will transform the model <code>node</code>
    * to let it fill a box of the given <code>width</code> centered on the origin.
    * @param node     the root of a model with any size and location
-   * @param modelRotation the rotation applied to the model at the end 
+   * @param modelRotation the rotation applied to the model before normalization 
    *                 or <code>null</code> if no transformation should be applied to node.
    * @param width    the width of the box
    */
   public TransformGroup getNormalizedTransformGroup(Node node, float [][] modelRotation, float width) {
-    // Get model bounding box size
+    return new TransformGroup(getNormalizedTransform(node, modelRotation, width));
+  }
+  
+  /**
+   * Returns a transform that will transform the model <code>node</code>
+   * to let it fill a box of the given <code>width</code> centered on the origin.
+   * @param node     the root of a model with any size and location
+   * @param modelRotation the rotation applied to the model before normalization 
+   *                 or <code>null</code> if no transformation should be applied to node.
+   * @param width    the width of the box
+   */
+  public Transform3D getNormalizedTransform(Node node, float [][] modelRotation, float width) {
+    // Get model bounding box size 
     BoundingBox modelBounds = getBounds(node);
     Point3d lower = new Point3d();
     modelBounds.getLower(lower);
     Point3d upper = new Point3d();
     modelBounds.getUpper(upper);
-    
     // Translate model to its center
     Transform3D translation = new Transform3D();
     translation.setTranslation(
         new Vector3d(-lower.x - (upper.x - lower.x) / 2, 
             -lower.y - (upper.y - lower.y) / 2, 
-            -lower.z - (upper.z - lower.z) / 2));      
-    // Scale model to make it fill a 1 unit wide box
-    Transform3D scaleOneTransform = new Transform3D();
-    scaleOneTransform.setScale (
-        new Vector3d(width / Math.max(MINIMUM_SIZE, upper.x -lower.x), 
-            width / Math.max(MINIMUM_SIZE, upper.y - lower.y), 
-            width / Math.max(MINIMUM_SIZE, upper.z - lower.z)));
-    scaleOneTransform.mul(translation);
-    Transform3D modelTransform = new Transform3D();
+            -lower.z - (upper.z - lower.z) / 2));
+    
+    Transform3D modelTransform;
     if (modelRotation != null) {
-      // Apply model rotation
+      // Get model bounding box size with model rotation
       Matrix3f modelRotationMatrix = new Matrix3f(modelRotation [0][0], modelRotation [0][1], modelRotation [0][2],
           modelRotation [1][0], modelRotation [1][1], modelRotation [1][2],
           modelRotation [2][0], modelRotation [2][1], modelRotation [2][2]);
+      modelTransform = new Transform3D();
       modelTransform.setRotation(modelRotationMatrix);
+      modelTransform.mul(translation);
+      BoundingBox rotatedModelBounds = getBounds(node, modelTransform);
+      rotatedModelBounds.getLower(lower);
+      rotatedModelBounds.getUpper(upper);
+    } else {
+      modelTransform = translation;
     }
-    modelTransform.mul(scaleOneTransform);
-    
-    return new TransformGroup(modelTransform);
+
+    // Scale model to make it fill a 1 unit wide box
+    Transform3D scaleOneTransform = new Transform3D();
+    scaleOneTransform.setScale (
+        new Vector3d(width / Math.max(getMinimumSize(), upper.x -lower.x), 
+            width / Math.max(getMinimumSize(), upper.y - lower.y), 
+            width / Math.max(getMinimumSize(), upper.z - lower.z)));
+    scaleOneTransform.mul(modelTransform);
+    return scaleOneTransform;
   }
   
   /**
@@ -471,8 +608,9 @@
         try {
           // Check magic number 0x4D4D
           InputStream in = url.openStream();
-          if (in.read() != 0x4D
-              && in.read() != 0x4D) {
+          int b1 = in.read();
+          int b2 = in.read();
+          if (b1 != 0x4D || b2 != 0x4D) {
             throw new IncorrectFormatException("Bad magic number");
           }
           in.close();
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Object3DBranch.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Object3DBranch.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Object3DBranch.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Object3DBranch.java	2011-12-21 00:48:52.000000000 +0000
@@ -21,8 +21,10 @@
 
 import java.awt.Shape;
 import java.awt.geom.GeneralPath;
+import java.awt.geom.Rectangle2D;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.WeakHashMap;
 
 import javax.media.j3d.BranchGroup;
 import javax.media.j3d.ColoringAttributes;
@@ -31,6 +33,10 @@
 import javax.media.j3d.PolygonAttributes;
 import javax.vecmath.Color3f;
 
+import org.apache.batik.parser.AWTPathProducer;
+import org.apache.batik.parser.ParseException;
+import org.apache.batik.parser.PathParser;
+
 /**
  * Root of a branch that matches a home object. 
  */
@@ -48,6 +54,7 @@
   protected static final Material DEFAULT_MATERIAL      = new Material();
 
   private static final Map<Long, Material> materials = new HashMap<Long, Material>();
+  private static final Map<String, Shape>  parsedShapes = new WeakHashMap<String, Shape>();
 
   static {
     DEFAULT_MATERIAL.setCapability(Material.ALLOW_COMPONENT_READ);
@@ -98,4 +105,39 @@
       return getMaterial(DEFAULT_COLOR, DEFAULT_AMBIENT_COLOR, shininess);
     }
   }
+
+  /**
+   * Returns the AWT shape matching the given <a href="http://www.w3.org/TR/SVG/paths.html">SVG path shape</a>.  
+   */
+  protected Shape parseShape(String svgPathShape) {
+    Shape shape = parsedShapes.get(svgPathShape);
+    if (shape == null) {
+      try {
+        shape = SVGPathSupport.parsePathShape(svgPathShape);
+      } catch (LinkageError ex) {
+        // Fallback to default square shape if batik classes aren't in classpath
+        shape = new Rectangle2D.Float(0, 0, 1, 1);
+      }
+      parsedShapes.put(svgPathShape, shape);
+    }
+    return shape;
+  }
+  
+  /**
+   * Separated static class to be able to exclude Batik library from classpath. 
+   */
+  private static class SVGPathSupport {
+    public static Shape parsePathShape(String svgPathShape) {
+      try {
+        AWTPathProducer pathProducer = new AWTPathProducer();
+        PathParser pathParser = new PathParser();
+        pathParser.setPathHandler(pathProducer);
+        pathParser.parse(svgPathShape);
+        return pathProducer.getShape();
+      } catch (ParseException ex) {
+        // Fallback to default square shape if shape is incorrect
+        return new Rectangle2D.Float(0, 0, 1, 1);
+      }
+    }
+  }
 }
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/OBJLoader.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/OBJLoader.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/OBJLoader.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/OBJLoader.java	2011-12-21 00:48:52.000000000 +0000
@@ -1265,21 +1265,31 @@
                                URL baseUrl) throws IOException {
     if ("v".equals(tokenizer.sval)) {
       // Read vertex v x y z
-      this.vertices.add(new Point3f(
-          parseNumber(tokenizer), parseNumber(tokenizer), parseNumber(tokenizer)));
+      float x = parseNumber(tokenizer);
+      skipBackSlash(tokenizer);
+      float y = parseNumber(tokenizer);
+      skipBackSlash(tokenizer);
+      float z = parseNumber(tokenizer);
+      this.vertices.add(new Point3f(x, y, z));
       // Skip next number if it exists
       if (tokenizer.nextToken() == StreamTokenizer.TT_EOL) {
         tokenizer.pushBack();
       }
     } else if ("vn".equals(tokenizer.sval)) {
       // Read normal vn x y z
-      this.normals.add(new Vector3f(
-          parseNumber(tokenizer), parseNumber(tokenizer), parseNumber(tokenizer)));      
+      float x = parseNumber(tokenizer);
+      skipBackSlash(tokenizer);
+      float y = parseNumber(tokenizer);
+      skipBackSlash(tokenizer);
+      float z = parseNumber(tokenizer);
+      this.normals.add(new Vector3f(x, y, z));      
     } else if ("vt".equals(tokenizer.sval)) {
       // Read texture coordinate vt x y 
       //                       or vt x y z
-      this.textureCoodinates.add(new TexCoord2f(
-          parseNumber(tokenizer), parseNumber(tokenizer)));    
+      float x = parseNumber(tokenizer);
+      skipBackSlash(tokenizer);
+      float y = parseNumber(tokenizer);
+      this.textureCoodinates.add(new TexCoord2f(x, y));    
       // Skip next number if it exists
       if (tokenizer.nextToken() == StreamTokenizer.TT_EOL) {
         tokenizer.pushBack();
@@ -1290,8 +1300,18 @@
       //        or l v/vt    v/vt    v/vt    ...
       List<Integer> vertexIndices = new ArrayList<Integer>(2);
       List<Integer> textureCoordinateIndices = new ArrayList<Integer>(2); 
-      while (tokenizer.nextToken() != StreamTokenizer.TT_EOL) {      
-        tokenizer.pushBack();        
+      boolean first = true;
+      while (true) {      
+        if (first) {
+          first = false;
+        } else {
+          skipBackSlash(tokenizer);
+        }
+        if (tokenizer.nextToken() == StreamTokenizer.TT_EOL) {
+          break;
+        } else {
+          tokenizer.pushBack();
+        }
         // Read vertex index
         int vertexIndex = parseInteger(tokenizer) - 1;
         if (vertexIndex < 0) {
@@ -1331,8 +1351,18 @@
       List<Integer> vertexIndices = new ArrayList<Integer>(4);
       List<Integer> textureCoordinateIndices = new ArrayList<Integer>(4); 
       List<Integer> normalIndices = new ArrayList<Integer>(4);
-      while (tokenizer.nextToken() != StreamTokenizer.TT_EOL) {      
-        tokenizer.pushBack();        
+      boolean first = true;
+      while (true) {
+        if (first) {
+          first = false;
+        } else {
+          skipBackSlash(tokenizer);
+        }
+        if (tokenizer.nextToken() == StreamTokenizer.TT_EOL) {
+          break;
+        } else {
+          tokenizer.pushBack();
+        }
         // Read vertex index
         int vertexIndex = parseInteger(tokenizer) - 1;
         if (vertexIndex < 0) {
@@ -1502,6 +1532,21 @@
   }
 
   /**
+   * Skips the back slash in the next token if it's followed by a new line.  
+   */
+  private static void skipBackSlash(StreamTokenizer tokenizer) throws IOException {
+    tokenizer.ordinaryChar('\\');
+    if (tokenizer.nextToken() == '\\') {
+      if (tokenizer.nextToken() != StreamTokenizer.TT_EOL) {
+        throw new IncorrectFormatException("Expected new line after \\ character");
+      }
+    } else {
+      tokenizer.pushBack();
+    }
+    tokenizer.wordChars('\\', '\\');
+  }
+
+  /**
    * Parses appearances from the given material file.
    */
   private void parseMaterial(String file, URL baseUrl) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/OBJWriter.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/OBJWriter.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/OBJWriter.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/OBJWriter.java	2011-12-21 00:48:52.000000000 +0000
@@ -339,8 +339,9 @@
       Appearance appearance = shape.getAppearance();
       RenderingAttributes renderingAttributes = appearance != null 
           ? appearance.getRenderingAttributes() : null;
-      if (renderingAttributes == null
-          || renderingAttributes.getVisible()) {
+      if (shape.numGeometries() >= 1 
+          && (renderingAttributes == null
+              || renderingAttributes.getVisible())) {
         // Build a unique human readable object name
         String objectName = "";
         if (accept(nodeName)) {
@@ -725,8 +726,8 @@
   private TexCoord2f generateTextureCoordinates(float x, float y, float z, 
                                                 Vector4f planeS, 
                                                 Vector4f planeT) {
-    return new TexCoord2f(x * planeS.x + y * planeS.y + z * planeS.z, 
-        x * planeT.x + y * planeT.y + z * planeT.z);
+    return new TexCoord2f(x * planeS.x + y * planeS.y + z * planeS.z + planeS.w, 
+        x * planeT.x + y * planeT.y + z * planeT.z + planeT.w);
   }
 
   /**
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/PhotoRenderer.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/PhotoRenderer.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/PhotoRenderer.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/PhotoRenderer.java	2011-12-21 00:48:52.000000000 +0000
@@ -101,6 +101,7 @@
 import com.eteks.sweethome3d.model.HomeLight;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.HomeTexture;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.LightSource;
 import com.eteks.sweethome3d.model.ObserverCamera;
 import com.eteks.sweethome3d.model.Room;
@@ -146,7 +147,7 @@
         new Object3DBranchFactory() {
           public Object createObject3D(Home home, Selectable item, boolean waitForLoading) {
             if (item instanceof Room) {
-              // Never display ceiling whit top camera
+              // Never display ceiling with top camera
               return new Room3D((Room)item, home, home.getCamera() == home.getTopCamera(), true, waitForLoading);
             } else {
               return super.createObject3D(home, item, waitForLoading);
@@ -185,11 +186,8 @@
     for (Room room : home.getRooms()) {
       exportNode((Node)object3DFactory.createObject3D(home, room, true), true, false, silk);
     } 
-    // Create a dummy home to export a ground 3D not cut by rooms and large enough to join the sky at the horizon  
-    Home groundHome = new Home();
-    groundHome.getEnvironment().setGroundColor(home.getEnvironment().getGroundColor());
-    groundHome.getEnvironment().setGroundTexture(home.getEnvironment().getGroundTexture());
-    Ground3D ground = new Ground3D(groundHome, -1E7f / 2, -1E7f / 2, 1E7f, 1E7f, true);
+    // Create a 3D ground large enough to join the sky at the horizon  
+    Ground3D ground = new Ground3D(home, -1E7f / 2, -1E7f / 2, 1E7f, 1E7f, true);
     Transform3D translation = new Transform3D();
     translation.setTranslation(new Vector3f(0, -0.1f, 0));
     TransformGroup groundTransformGroup = new TransformGroup(translation);
@@ -227,29 +225,41 @@
     if (ceillingLightColor > 0) {
       // Add lights at the top of each room 
       for (Room room : home.getRooms()) {
-        if (room.isCeilingVisible()) {
+        Level roomLevel = room.getLevel();
+        if (room.isCeilingVisible() 
+            && (roomLevel == null || roomLevel.isVisible())) {
           float xCenter = room.getXCenter();
           float yCenter = room.getYCenter();
           
           double smallestDistance = Float.POSITIVE_INFINITY;
-          float roomHeight = home.getWallHeight();
-          
-          // Search the height of the wall closest to the point xCenter, yCenter
-          for (Wall wall : home.getWalls()) {
-            Float wallHeightAtStart = wall.getHeight();
-            float [][] points = wall.getPoints();
-            for (int i = 0; i < points.length; i++) {
-              double distanceToWallPoint = Point2D.distanceSq(points [i][0], points [i][1], xCenter, yCenter);
-              if (distanceToWallPoint < smallestDistance) {
-                smallestDistance = distanceToWallPoint; 
-                if (i == 0 || i == 3) { // Wall start
-                  roomHeight = wallHeightAtStart != null 
-                      ? wallHeightAtStart 
-                      : home.getWallHeight();
-                } else { // Wall end
-                  roomHeight = wall.isTrapezoidal() 
-                      ? wall.getHeightAtEnd() 
-                      : (wallHeightAtStart != null ? wallHeightAtStart : home.getWallHeight());
+          float roomElevation = roomLevel != null
+              ? roomLevel.getElevation()
+              : 0;
+          float roomHeight = roomElevation + 
+              (roomLevel == null ? home.getWallHeight() : roomLevel.getHeight());
+          List<Level> levels = home.getLevels();
+          if (roomLevel == null || levels.indexOf(roomLevel) == levels.size() - 1) {
+            // Search the height of the wall closest to the point xCenter, yCenter
+            for (Wall wall : home.getWalls()) {
+              if (wall.isAtLevel(roomLevel)) {
+                float wallElevation = wall.getLevel() == null ? 0 : wall.getLevel().getElevation();
+                Float wallHeightAtStart = wall.getHeight();
+                float [][] points = wall.getPoints();
+                for (int i = 0; i < points.length; i++) {
+                  double distanceToWallPoint = Point2D.distanceSq(points [i][0], points [i][1], xCenter, yCenter);
+                  if (distanceToWallPoint < smallestDistance) {
+                    smallestDistance = distanceToWallPoint; 
+                    if (i == 0 || i == points.length - 1) { // Wall start
+                      roomHeight = wallHeightAtStart != null 
+                          ? wallHeightAtStart 
+                          : home.getWallHeight();
+                    } else { // Wall end
+                      roomHeight = wall.isTrapezoidal() 
+                          ? wall.getHeightAtEnd() 
+                          : (wallHeightAtStart != null ? wallHeightAtStart : home.getWallHeight());
+                    }
+                    roomHeight += wallElevation;
+                  }
                 }
               }
             }
@@ -271,8 +281,11 @@
     // Add visible and turned on lights
     for (HomeLight light : getLights(home.getFurniture())) {
       float lightPower = light.getPower();
+      Level level = light.getLevel();
       if (light.isVisible()
-          && lightPower > 0f) {
+          && lightPower > 0f
+          && (level == null
+              || level.isVisible())) {
         float angle = light.getAngle();
         float cos = (float)Math.cos(angle);
         float sin = (float)Math.sin(angle);
@@ -288,9 +301,10 @@
               power * (lightColor & 0xFF) * (this.homeLightColor & 0xFF));
           float xLightSourceInLight = -light.getWidth() / 2 + (lightSource.getX() * light.getWidth());
           float yLightSourceInLight = light.getDepth() / 2 - (lightSource.getY() * light.getDepth());
+          float lightElevation = light.getGroundElevation();
           this.sunflow.parameter("center",
               new Point3(light.getX() + xLightSourceInLight * cos - yLightSourceInLight * sin,
-                  light.getElevation() + (lightSource.getZ() * light.getHeight()),
+                  lightElevation + (lightSource.getZ() * light.getHeight()),
                   light.getY() + xLightSourceInLight * sin + yLightSourceInLight * cos));                    
           this.sunflow.parameter("radius", lightRadius);
           this.sunflow.parameter("samples", 4);
@@ -490,7 +504,7 @@
   }
 
   /**
-   * Exports the given Java 3D <code>node</code> and its children to Sunflow API.  
+   * Exports the given Java 3D <code>node</code> and its children with SunFlow API.  
    */
   private void exportNode(Node node, boolean ignoreTransparency, 
                           boolean ignoreConstantShader, boolean silk) throws IOException {
@@ -498,7 +512,7 @@
   }
 
   /**
-   * Exports all the 3D shapes children of <code>node</code> at OBJ format.
+   * Exports all the 3D shapes children of <code>node</code> with SunFlow API.
    */ 
   private void exportNode(Node node, 
                           boolean ignoreTransparency,
@@ -565,7 +579,7 @@
   }
   
   /**
-   * Returns the names of the exported 3D geometries in Sunflow API.
+   * Returns the names of the exported 3D geometries with SunFlow API.
    */
   private String [] exportNodeGeometry(Geometry geometry, 
                                        Transform3D parentTransformations, 
@@ -574,7 +588,7 @@
     if (geometry instanceof GeometryArray) {
       GeometryArray geometryArray = (GeometryArray)geometry;
       
-      // Create vertices indices array depending on geometry class
+      // Create vertices indices array according to geometry class
       int [] verticesIndices = null;
       int [] stripVertexCount = null;
       if (geometryArray instanceof IndexedGeometryArray) {
@@ -752,7 +766,7 @@
           }
         }
 
-        // Export lines, triangles or quadrilaterals depending on the geometry
+        // Export lines, triangles or quadrilaterals according to the geometry
         if (geometryArray instanceof IndexedGeometryArray) {
           int [] normalsIndices = normals != null
               ? new int [verticesIndices.length]
@@ -821,7 +835,7 @@
           if (normalsIndices != null && !Arrays.equals(verticesIndices, normalsIndices)
               || uvsIndices != null && !Arrays.equals(verticesIndices, uvsIndices)) {
             // Remove indirection in verticesIndices, normals and uvsIndices
-            // because SunFlow use only verticesIndices
+            // because SunFlow uses only verticesIndices
             float [] directVertices = new float [verticesIndices.length * 3];
             float [] directNormals =  normalsIndices != null
                 ? new float [verticesIndices.length * 3]
@@ -988,8 +1002,8 @@
   private TexCoord2f generateTextureCoordinates(float x, float y, float z, 
                                                 Vector4f planeS, 
                                                 Vector4f planeT) {
-    return new TexCoord2f(x * planeS.x + y * planeS.y + z * planeS.z, 
-        x * planeT.x + y * planeT.y + z * planeT.z);
+    return new TexCoord2f(x * planeS.x + y * planeS.y + z * planeS.z + planeS.w, 
+        x * planeT.x + y * planeT.y + z * planeT.z + planeT.w);
   }
 
   /**
@@ -1095,7 +1109,7 @@
   }
     
   /**
-   * Stores in <code>verticesIndices</code> the indices vertexIndex1, vertexIndex2, vertexIndex3. 
+   * Stores in <code>verticesIndices</code> the indices vertexIndex1 and vertexIndex2. 
    */
   private void exportLine(GeometryArray geometryArray, 
                           int vertexIndex1, int vertexIndex2, 
@@ -1123,7 +1137,7 @@
   }
     
   /**
-   * Stores an appearance as a Sunflow shader.  
+   * Exports a Java3D appearance as a SunFlow shader.  
    */
   private void exportAppearance(Appearance appearance,
                                 String appearanceName, 
@@ -1326,8 +1340,8 @@
 
     public synchronized void imageFill(int x, int y, int width, int height, Color c, float alpha) {
       int rgba = c.copy().mul(1.0f / alpha).toNonLinear().toRGBA(alpha);
-      for (int j = 0, index = 0; j < height; j++) {
-        for (int i = 0; i < width; i++, index++) {
+      for (int j = 0; j < height; j++) {
+        for (int i = 0; i < width; i++) {
           this.image.setRGB(x + i, y + j, rgba);
         }
       }
@@ -1360,7 +1374,7 @@
   }
   
   /**
-   * A triangle used to remove faces cited for that once (opposite faces included).
+   * A triangle used to remove faces cited more that once (opposite faces included).
    */
   private static class Triangle {
     private float [] point1;
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Room3D.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Room3D.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Room3D.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Room3D.java	2011-12-21 00:48:52.000000000 +0000
@@ -19,7 +19,10 @@
  */
 package com.eteks.sweethome3d.j3d;
 
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Area;
+import java.awt.geom.GeneralPath;
 import java.awt.geom.PathIterator;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
@@ -37,11 +40,15 @@
 import javax.media.j3d.Shape3D;
 import javax.media.j3d.Texture;
 import javax.media.j3d.TextureAttributes;
+import javax.media.j3d.TransparencyAttributes;
 import javax.vecmath.Point3f;
 import javax.vecmath.TexCoord2f;
 
 import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.HomeFurnitureGroup;
+import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.HomeTexture;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.Room;
 import com.eteks.sweethome3d.model.Wall;
 import com.sun.j3d.utils.geometry.GeometryInfo;
@@ -115,6 +122,11 @@
 
     Appearance roomAppearance = new Appearance();
     roomShape.setAppearance(roomAppearance);
+    roomAppearance.setCapability(Appearance.ALLOW_TRANSPARENCY_ATTRIBUTES_READ);
+    TransparencyAttributes transparencyAttributes = new TransparencyAttributes();
+    transparencyAttributes.setCapability(TransparencyAttributes.ALLOW_VALUE_WRITE);
+    transparencyAttributes.setCapability(TransparencyAttributes.ALLOW_MODE_WRITE);
+    roomAppearance.setTransparencyAttributes(transparencyAttributes);
     roomAppearance.setCapability(Appearance.ALLOW_RENDERING_ATTRIBUTES_READ);
     RenderingAttributes renderingAttributes = new RenderingAttributes();
     renderingAttributes.setCapability(RenderingAttributes.ALLOW_VISIBLE_WRITE);
@@ -146,8 +158,11 @@
   private void updateRoomPartGeometry(int roomPart, HomeTexture texture) {
     Shape3D roomShape = (Shape3D)getChild(roomPart);
     int currentGeometriesCount = roomShape.numGeometries();
-    for (Geometry roomGeometry : createRoomGeometries(roomPart, texture)) {
-      roomShape.addGeometry(roomGeometry);
+    Room room = (Room)getUserData();
+    if (room.getLevel() == null || room.getLevel().isVisible()) {
+      for (Geometry roomGeometry : createRoomGeometries(roomPart, texture)) {
+        roomShape.addGeometry(roomGeometry);
+      }
     }
     for (int i = currentGeometriesCount - 1; i >= 0; i--) {
       roomShape.removeGeometry(i);
@@ -163,77 +178,89 @@
     if ((roomPart == FLOOR_PART && room.isFloorVisible()
          || roomPart == CEILING_PART && room.isCeilingVisible())
         && points.length > 2) {
+      Level roomLevel = room.getLevel();
+      List<Level> levels = this.home.getLevels();
+      boolean lastLevel = isLastLevel(roomLevel, levels);
+      float floorBottomElevation;
+      float roomElevation;
+      if (roomLevel != null) {
+        roomElevation = roomLevel.getElevation();
+        floorBottomElevation = roomElevation - roomLevel.getFloorThickness();
+      } else {
+        roomElevation = 0;
+        floorBottomElevation = 0;
+      }
+
+      float firstLevelElevation;
+      if (levels.size() == 0) {
+        firstLevelElevation = 0;
+      } else {
+        firstLevelElevation = levels.get(0).getElevation();
+      }
+      boolean floorBottomVisible = roomPart == FLOOR_PART 
+          && roomLevel != null 
+          && roomElevation != firstLevelElevation;
+
+      // Find rooms at the same elevation 
+      /// and room ceilings at same elevation as the floor bottom  
+      List<Room> roomsAtSameElevation = new ArrayList<Room>();
+      List<Room> ceilingsAtSameFloorBottomElevation = new ArrayList<Room>();
+      for (Room homeRoom : this.home.getRooms()) {
+        Level homeRoomLevel = homeRoom.getLevel();
+        if (room == homeRoom // Store also the room itself to know its order among rooms at same elevation
+            || roomLevel == homeRoomLevel
+                && (roomPart == FLOOR_PART && homeRoom.isFloorVisible()
+                    || roomPart == CEILING_PART && homeRoom.isCeilingVisible()) 
+            || roomLevel != null 
+                && homeRoomLevel != null 
+                && (roomPart == FLOOR_PART 
+                        && homeRoom.isFloorVisible()
+                        && Math.abs(roomElevation - homeRoomLevel.getElevation()) < 1E-5
+                    || roomPart == CEILING_PART 
+                        && homeRoom.isCeilingVisible()
+                        && !lastLevel
+                        && !isLastLevel(homeRoomLevel, levels)
+                        && Math.abs(roomElevation + roomLevel.getHeight() - (homeRoomLevel.getElevation() + homeRoomLevel.getHeight())) < 1E-5)) {         
+          roomsAtSameElevation.add(homeRoom);
+        } else if (floorBottomVisible 
+                    && homeRoomLevel != null 
+                    && homeRoom.isCeilingVisible() 
+                    && !isLastLevel(homeRoomLevel, levels) 
+                    && Math.abs(floorBottomElevation - (homeRoomLevel.getElevation() + homeRoomLevel.getHeight())) < 1E-5) {
+          ceilingsAtSameFloorBottomElevation.add(homeRoom);
+        }
+      }
+      
+      List<HomePieceOfFurniture> visibleStaircases;
+      if (roomLevel == null
+          || roomPart == CEILING_PART
+              && lastLevel) {
+        visibleStaircases = Collections.emptyList();
+      } else {
+        visibleStaircases = getVisibleStaircases(this.home.getFurniture(), roomPart, roomLevel, 
+            roomLevel.getElevation() == firstLevelElevation);
+      }
+
+      // Retrieve room points
+      List<float [][]> roomPoints;
+      Map<Integer, List<float [][]>> roomHoles;
+      Area roomVisibleArea;
       // If room isn't singular retrieve all the points of its different polygons 
-      List<float [][]> roomPoints = new ArrayList<float[][]>();
-      Map<Integer, List<float [][]>> roomHoles = new HashMap<Integer, List<float [][]>>();
-      List<Room> homeRooms = this.home.getRooms();
-      if (!room.isSingular() || homeRooms.get(homeRooms.size() - 1) != room) {        
-        Area roomArea = new Area(getShape(points));
-        if (homeRooms.contains(room)) {
+      if (!room.isSingular() 
+          || roomsAtSameElevation.get(roomsAtSameElevation.size() - 1) != room
+          || visibleStaircases.size() > 0) {        
+        roomVisibleArea = new Area(getShape(points));
+        if (roomsAtSameElevation.contains(room)) {
           // Remove other rooms surface that may overlap the current room
-          for (int i = homeRooms.size() - 1; i > 0 && homeRooms.get(i) != room; i--) {
-            Room otherRoom = homeRooms.get(i);
-            if (roomPart == FLOOR_PART && otherRoom.isFloorVisible()
-                || roomPart == CEILING_PART && otherRoom.isCeilingVisible()) {
-              roomArea.subtract(new Area(getShape(otherRoom.getPoints())));
-            }
+          for (int i = roomsAtSameElevation.size() - 1; i > 0 && roomsAtSameElevation.get(i) != room; i--) {
+            Room otherRoom = roomsAtSameElevation.get(i);
+            roomVisibleArea.subtract(new Area(getShape(otherRoom.getPoints())));
           }
-        }
-        // Retrieve the points of the different polygons 
-        // and reverse their points order if necessary
-        List<float []> currentPathPoints = new ArrayList<float[]>();
+        }        
+        removeStaircasesFromArea(visibleStaircases, roomVisibleArea);
         roomPoints = new ArrayList<float[][]>();
-        float [] previousRoomPoint = null;
-        int i = 0;
-        for (PathIterator it = roomArea.getPathIterator(null); !it.isDone(); ) {
-          float [] roomPoint = new float[2];
-          switch (it.currentSegment(roomPoint)) {
-            case PathIterator.SEG_MOVETO :
-            case PathIterator.SEG_LINETO : 
-              if (previousRoomPoint == null
-                  || roomPoint [0] != previousRoomPoint [0] 
-                  || roomPoint [1] != previousRoomPoint [1]) {
-                currentPathPoints.add(roomPoint);
-              }
-              previousRoomPoint = roomPoint;
-              break;
-            case PathIterator.SEG_CLOSE :
-              if (currentPathPoints.get(0) [0] == previousRoomPoint [0] 
-                  && currentPathPoints.get(0) [1] == previousRoomPoint [1]) {
-                currentPathPoints.remove(currentPathPoints.size() - 1);
-              }
-              if (currentPathPoints.size() > 2) {
-                float [][] pathPoints = 
-                    currentPathPoints.toArray(new float [currentPathPoints.size()][]);
-                Room subRoom = new Room(pathPoints);
-                if (subRoom.getArea() > 0) {
-                  boolean pathPointsClockwise = subRoom.isClockwise();
-                  if (pathPointsClockwise) {
-                    // Store counter clockwise points as holes
-                    if (roomPart != CEILING_PART) {
-                      pathPoints = getReversedArray(pathPoints);
-                    }
-                    List<float [][]> holes = roomHoles.get(i);
-                    if (holes == null) {
-                      holes = new ArrayList<float [][]>(1);
-                      roomHoles.put(i, holes);
-                    }
-                    holes.add(pathPoints);
-                  } else {
-                    if (roomPart == CEILING_PART) {
-                      pathPoints = getReversedArray(pathPoints);
-                    }
-                    roomPoints.add(pathPoints);
-                    i++;
-                  }
-                }
-              }
-              currentPathPoints.clear();
-              previousRoomPoint = null;
-              break;
-          }
-          it.next();        
-        }
+        roomHoles = new HashMap<Integer, List<float [][]>>();
+        getAreaPoints(roomVisibleArea, roomPart == CEILING_PART, roomPoints, roomHoles);
       } else {
         boolean clockwise = room.isClockwise();
         if (clockwise && roomPart == FLOOR_PART
@@ -242,55 +269,154 @@
           points = getReversedArray(points);
         }
         roomPoints = Arrays.asList(new float [][][] {points});
+        roomHoles = Collections.emptyMap();
+        roomVisibleArea = null;
       }
       
-      Geometry [] geometries = new Geometry [roomPoints.size()];
-      for (int i = 0; i < geometries.length; i++) {
+      // Retrieve points of the room floor bottom
+      List<float [][]> floorBottomPoints;
+      Map<Integer, List<float [][]>> floorBottomHoles;
+      if (floorBottomVisible) {
+        if (roomVisibleArea != null 
+            || ceilingsAtSameFloorBottomElevation.size() > 0) {        
+          Area floorBottomVisibleArea = roomVisibleArea != null ? roomVisibleArea : new Area(getShape(points));
+          // Remove other rooms surface that may overlap the floor bottom
+          for (Room otherRoom : ceilingsAtSameFloorBottomElevation) {
+            floorBottomVisibleArea.subtract(new Area(getShape(otherRoom.getPoints())));
+          }          
+          floorBottomPoints = new ArrayList<float[][]>();
+          floorBottomHoles = new HashMap<Integer, List<float [][]>>();
+          getAreaPoints(floorBottomVisibleArea, true, floorBottomPoints, floorBottomHoles);
+        } else {
+          floorBottomPoints = Arrays.asList(new float [][][] {getReversedArray(points)});
+          floorBottomHoles = Collections.emptyMap();
+        }
+      } else {
+        floorBottomPoints = Collections.emptyList();
+        floorBottomHoles = Collections.emptyMap();
+      }      
+      
+      Geometry [] geometries = new Geometry [roomPoints.size() + floorBottomPoints.size()];
+      boolean computeFloorBorder = roomLevel != null
+          && roomPart == FLOOR_PART 
+          && roomLevel.getElevation() != firstLevelElevation;
+      // Compute room and border geometries
+      int i = 0;      
+      for ( ; i < roomPoints.size(); i++) {
         float [][] geometryPoints = roomPoints.get(i);
         List<float [][]> geometryHoles = roomHoles.get(i);
         if (geometryHoles == null) {
           geometryHoles = Collections.emptyList();
         }
-        int vertexCount = geometryPoints.length;
-        int [] stripCounts = new int [1 + geometryHoles.size()];
+        int geometryHolesPointCount = 0;
+        for (float [][] geometryHole : geometryHoles) {
+          geometryHolesPointCount += geometryHole.length;
+        }
+        
+        int contourLength = 1;
+        if (computeFloorBorder) {
+          contourLength += geometryPoints.length + geometryHolesPointCount;
+        }
+        int [] contourCounts = new int [contourLength];
+        int [] stripCounts = new int [contourCounts.length + geometryHoles.size()];
         int j = 0;
+        int vertexCount = geometryPoints.length;
+        if (computeFloorBorder) {
+          vertexCount *= 5;
+          vertexCount += geometryHolesPointCount * 4;
+          Arrays.fill(contourCounts, 0, j = geometryPoints.length + geometryHolesPointCount, 1);
+          Arrays.fill(stripCounts, 0, j, 4);
+        }
+        contourCounts [contourCounts.length - 1] = 1 + geometryHoles.size();
         stripCounts [j++] = geometryPoints.length;
         for (float [][] geometryHole : geometryHoles) {
           vertexCount += geometryHole.length;
           stripCounts [j++] = geometryHole.length;
         }
-        // Compute room coordinates
+        
+        j = 0;
         Point3f [] coords = new Point3f [vertexCount];
-        for (j = 0; j < geometryPoints.length; j++) {
+        if (computeFloorBorder) {
+          // Compute room borders coordinates
+          for (int k = 0; k < geometryPoints.length; k++) {
+            coords [j++] = new Point3f(geometryPoints [k][0], roomElevation, geometryPoints [k][1]);
+            coords [j++] = new Point3f(geometryPoints [k][0], floorBottomElevation, geometryPoints [k][1]);
+            int nextPoint = k < geometryPoints.length - 1  
+                ? k + 1
+                : 0;
+            coords [j++] = new Point3f(geometryPoints [nextPoint][0], floorBottomElevation, geometryPoints [nextPoint][1]);
+            coords [j++] = new Point3f(geometryPoints [nextPoint][0], roomElevation, geometryPoints [nextPoint][1]);
+          }
+          // Compute holes borders coordinates
+          for (float [][] geometryHole : geometryHoles) {
+            for (int k = 0; k < geometryHole.length; k++) {
+              coords [j++] = new Point3f(geometryHole [k][0], roomElevation, geometryHole [k][1]);
+              int nextPoint = k < geometryHole.length - 1  
+                  ? k + 1
+                  : 0;
+              coords [j++] = new Point3f(geometryHole [nextPoint][0], roomElevation, geometryHole [nextPoint][1]);
+              coords [j++] = new Point3f(geometryHole [nextPoint][0], floorBottomElevation, geometryHole [nextPoint][1]);
+              coords [j++] = new Point3f(geometryHole [k][0], floorBottomElevation, geometryHole [k][1]);
+            }
+          }
+        }
+        // Compute room coordinates
+        for (int k = 0; k < geometryPoints.length; k++) {
           float y = roomPart == FLOOR_PART 
-              ? 0 
-              : getRoomHeightAt(geometryPoints [j][0], geometryPoints [j][1]);
-          coords [j] = new Point3f(geometryPoints [j][0], y, geometryPoints [j][1]);
+              ? roomElevation 
+              : getRoomHeightAt(geometryPoints [k][0], geometryPoints [k][1]);
+          coords [j++] = new Point3f(geometryPoints [k][0], y, geometryPoints [k][1]);
         }
         for (float [][] geometryHole : geometryHoles) {
-          for (int k = 0; k < geometryHole.length; k++, j++) {
+          for (int k = 0; k < geometryHole.length; k++) {
             float y = roomPart == FLOOR_PART 
-                ? 0 
+                ? roomElevation 
                 : getRoomHeightAt(geometryHole [k][0], geometryHole [k][1]);
-            coords [j] = new Point3f(geometryHole [k][0], y, geometryHole [k][1]);
+            coords [j++] = new Point3f(geometryHole [k][0], y, geometryHole [k][1]);
           }
         }
         GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY);
-        geometryInfo.setCoordinates (coords);
+        geometryInfo.setCoordinates(coords);
         geometryInfo.setStripCounts(stripCounts);
-        geometryInfo.setContourCounts(new int [] {stripCounts.length});
-        // Compute room texture coordinates
+        geometryInfo.setContourCounts(contourCounts);
+        
         if (texture != null) {
           TexCoord2f [] textureCoords = new TexCoord2f [vertexCount];
-          for (j = 0; j < geometryPoints.length; j++) {
-            textureCoords [j] = new TexCoord2f(geometryPoints [j][0] / texture.getWidth(), 
+          j = 0;
+          if (computeFloorBorder) {
+            // Compute room border texture coordinates
+            for (int k = 0; k < geometryPoints.length; k++) {
+              textureCoords [j++] = new TexCoord2f(geometryPoints [k][0] / texture.getWidth(), -geometryPoints [k][1] / texture.getHeight());
+              textureCoords [j++] = new TexCoord2f(geometryPoints [k][0] / texture.getWidth(), -(geometryPoints [k][1] - roomLevel.getFloorThickness()) / texture.getHeight());
+              int nextPoint = k < geometryPoints.length - 1  
+                  ? k + 1
+                  : 0;
+              textureCoords [j++] = new TexCoord2f(geometryPoints [nextPoint][0] / texture.getWidth(), -(geometryPoints [nextPoint][1] - roomLevel.getFloorThickness()) / texture.getHeight());
+              textureCoords [j++] = new TexCoord2f(geometryPoints [nextPoint][0] / texture.getWidth(), -geometryPoints [nextPoint][1] / texture.getHeight());
+            }
+            // Compute holes borders texture coordinates
+            for (float [][] geometryHole : geometryHoles) {
+              for (int k = 0; k < geometryHole.length; k++) {
+                textureCoords [j++] = new TexCoord2f(geometryHole [k][0] / texture.getWidth(), -geometryHole [k][1] / texture.getHeight());
+                int nextPoint = k < geometryHole.length - 1  
+                    ? k + 1
+                    : 0;
+                textureCoords [j++] = new TexCoord2f(geometryHole [nextPoint][0] / texture.getWidth(), -geometryHole [nextPoint][1] / texture.getHeight());
+                textureCoords [j++] = new TexCoord2f(geometryHole [nextPoint][0] / texture.getWidth(), -(geometryHole [nextPoint][1] - roomLevel.getFloorThickness()) / texture.getHeight());
+                textureCoords [j++] = new TexCoord2f(geometryHole [k][0] / texture.getWidth(), -(geometryHole [k][1] - roomLevel.getFloorThickness()) / texture.getHeight());
+              }
+            }
+          }
+          // Compute room texture coordinates
+          for (int k = 0; k < geometryPoints.length; k++) {
+            textureCoords [j++] = new TexCoord2f(geometryPoints [k][0] / texture.getWidth(), 
                 roomPart == FLOOR_PART 
-                    ? -geometryPoints [j][1] / texture.getHeight()
-                    : geometryPoints [j][1] / texture.getHeight());
+                    ? -geometryPoints [k][1] / texture.getHeight()
+                    : geometryPoints [k][1] / texture.getHeight());
           }
           for (float [][] geometryHole : geometryHoles) {
-            for (int k = 0; k < geometryHole.length; k++, j++) {
-              textureCoords [j] = new TexCoord2f(geometryHole [k][0] / texture.getWidth(), 
+            for (int k = 0; k < geometryHole.length; k++) {
+              textureCoords [j++] = new TexCoord2f(geometryHole [k][0] / texture.getWidth(), 
                   roomPart == FLOOR_PART 
                       ? -geometryHole [k][1] / texture.getHeight()
                       : geometryHole [k][1] / texture.getHeight());
@@ -301,23 +427,216 @@
         }
         
         // Generate normals
-        new NormalGenerator(0).generateNormals(geometryInfo);
+        new NormalGenerator(Math.PI / 8).generateNormals(geometryInfo);
         geometries [i] = geometryInfo.getIndexedGeometryArray();
       }
+
+      // Compute floor bottom geometry
+      for (int l = 0 ; l < floorBottomPoints.size(); l++, i++) {
+        float [][] geometryPoints = floorBottomPoints.get(l);
+        List<float [][]> geometryHoles = floorBottomHoles.get(l);
+        if (geometryHoles == null) {
+          geometryHoles = Collections.emptyList();
+        }
+        int [] contourCounts = new int [1];
+        int [] stripCounts = new int [1 + geometryHoles.size()];
+        int j = 0;
+        int vertexCount = geometryPoints.length;
+        contourCounts [contourCounts.length - 1] = 1 + geometryHoles.size();
+        stripCounts [j++] = geometryPoints.length;
+        for (float [][] geometryHole : geometryHoles) {
+          vertexCount += geometryHole.length;
+          stripCounts [j++] = geometryHole.length;
+        }
+        
+        j = 0;
+        Point3f [] coords = new Point3f [vertexCount];
+        // Compute floor bottom coordinates
+        for (int k = 0; k < geometryPoints.length; k++) {
+          coords [j++] = new Point3f(geometryPoints [k][0], floorBottomElevation, geometryPoints [k][1]);
+        }
+        for (float [][] geometryHole : geometryHoles) {
+          for (int k = 0; k < geometryHole.length; k++) {
+            coords [j++] = new Point3f(geometryHole [k][0], floorBottomElevation, geometryHole [k][1]);
+          }
+        }
+        GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY);
+        geometryInfo.setCoordinates(coords);
+        geometryInfo.setStripCounts(stripCounts);
+        geometryInfo.setContourCounts(contourCounts);
+        
+        if (texture != null) {
+          TexCoord2f [] textureCoords = new TexCoord2f [vertexCount];
+          j = 0;
+          // Compute floor bottom texture coordinates
+          for (int k = 0; k < geometryPoints.length; k++) {
+            textureCoords [j++] = new TexCoord2f(geometryPoints [k][0] / texture.getWidth(), geometryPoints [k][1] / texture.getHeight());
+          }
+          for (float [][] geometryHole : geometryHoles) {
+            for (int k = 0; k < geometryHole.length; k++) {
+              textureCoords [j++] = new TexCoord2f(geometryHole [k][0] / texture.getWidth(), geometryHole [k][1] / texture.getHeight());
+            }
+          }
+          geometryInfo.setTextureCoordinateParams(1, 2);
+          geometryInfo.setTextureCoordinates(0, textureCoords);
+        }
+        
+        // Generate normals
+        new NormalGenerator().generateNormals(geometryInfo);
+        geometries [i] = geometryInfo.getIndexedGeometryArray();
+      }
+
       return geometries;
     } else {
       return new Geometry [0];
     }
   }
-  
+
+  private void removeStaircasesFromArea(List<HomePieceOfFurniture> visibleStaircases, Area area) {
+    // Remove from room area all the staircases that intersect it
+    for (HomePieceOfFurniture staircase : visibleStaircases) {
+      Shape shape = parseShape(staircase.getStaircaseCutOutShape());
+      Area staircaseArea = new Area(shape);
+      if (staircase.isModelMirrored()) {
+        staircaseArea = getMirroredArea(staircaseArea);
+      }
+      AffineTransform staircaseTransform = AffineTransform.getTranslateInstance(
+          staircase.getX() - staircase.getWidth() / 2, 
+          staircase.getY() - staircase.getDepth() / 2);
+      staircaseTransform.concatenate(AffineTransform.getRotateInstance(staircase.getAngle(),
+          staircase.getWidth() / 2, staircase.getDepth() / 2));
+      staircaseTransform.concatenate(AffineTransform.getScaleInstance(staircase.getWidth(), staircase.getDepth()));
+      staircaseArea.transform(staircaseTransform);
+      area.subtract(staircaseArea);
+    }
+  }
+
+  /**
+   * Returns the mirror area of the given <code>area</code>.
+   */
+  private Area getMirroredArea(Area area) {
+    // As applying a -1 scale transform reverses the holes / non holes interpretation of the points, 
+    // we have to create a mirrored shape by parsing points
+    GeneralPath mirrorPath = new GeneralPath();
+    float [] point = new float[6];
+    for (PathIterator it = area.getPathIterator(null); !it.isDone(); it.next()) {
+      switch (it.currentSegment(point)) {
+        case PathIterator.SEG_MOVETO :
+          mirrorPath.moveTo(1 - point[0], point[1]);
+          break;
+        case PathIterator.SEG_LINETO : 
+          mirrorPath.lineTo(1 - point[0], point[1]);
+          break;
+        case PathIterator.SEG_QUADTO : 
+          mirrorPath.quadTo(1 - point[0], point[1], 1 - point[2], point[3]);
+          break;
+        case PathIterator.SEG_CUBICTO : 
+          mirrorPath.curveTo(1 - point[0], point[1], 1 - point[2], point[3], 1 - point[4], point[5]);
+          break;
+        case PathIterator.SEG_CLOSE :
+          mirrorPath.closePath();
+          break;
+      }
+    }
+    return new Area(mirrorPath);
+  }
+
+  /**
+   * Returns the visible staircases among the given <code>furniture</code>.  
+   */
+  private List<HomePieceOfFurniture> getVisibleStaircases(List<HomePieceOfFurniture> furniture, 
+                                                          int roomPart, Level roomLevel,
+                                                          boolean firstLevel) {
+    List<HomePieceOfFurniture> visibleStaircases = new ArrayList<HomePieceOfFurniture>(furniture.size());
+    for (HomePieceOfFurniture piece : furniture) {
+      if (piece.isVisible()) {
+        if (piece instanceof HomeFurnitureGroup) {
+          visibleStaircases.addAll(getVisibleStaircases(((HomeFurnitureGroup)piece).getFurniture(), roomPart, roomLevel, firstLevel));
+        } else if (piece.getStaircaseCutOutShape() != null
+            && !"false".equalsIgnoreCase(piece.getStaircaseCutOutShape())
+            && ((roomPart == FLOOR_PART 
+                    && piece.getGroundElevation() < roomLevel.getElevation()
+                    && piece.getGroundElevation() + piece.getHeight() >= roomLevel.getElevation() - (firstLevel ? 0 : roomLevel.getFloorThickness())
+                || roomPart == CEILING_PART
+                    && piece.getGroundElevation() < roomLevel.getElevation() + roomLevel.getHeight()
+                    && piece.getGroundElevation() + piece.getHeight() >= roomLevel.getElevation() + roomLevel.getHeight()))) {
+          visibleStaircases.add(piece);
+        }
+      }
+    }
+    return visibleStaircases;
+  }
+
+  /**
+   * Fills <code>areaPoints</code> and <code>areaHoles</code> from the given area.
+   */
+  private void getAreaPoints(Area area, 
+                             boolean reversed, 
+                             List<float [][]> areaPoints,
+                             Map<Integer, List<float [][]>> areaHoles) {
+    // Retrieve the points of the different polygons 
+    // and reverse their points order if necessary
+    List<float []> currentPathPoints = new ArrayList<float[]>();
+    float [] previousRoomPoint = null;
+    int i = 0;
+    for (PathIterator it = area.getPathIterator(null, 1); !it.isDone(); it.next()) {
+      float [] roomPoint = new float[2];
+      switch (it.currentSegment(roomPoint)) {
+        case PathIterator.SEG_MOVETO :
+        case PathIterator.SEG_LINETO : 
+          if (previousRoomPoint == null
+              || roomPoint [0] != previousRoomPoint [0] 
+              || roomPoint [1] != previousRoomPoint [1]) {
+            currentPathPoints.add(roomPoint);
+          }
+          previousRoomPoint = roomPoint;
+          break;
+        case PathIterator.SEG_CLOSE :
+          if (currentPathPoints.get(0) [0] == previousRoomPoint [0] 
+              && currentPathPoints.get(0) [1] == previousRoomPoint [1]) {
+            currentPathPoints.remove(currentPathPoints.size() - 1);
+          }
+          if (currentPathPoints.size() > 2) {
+            float [][] pathPoints = 
+                currentPathPoints.toArray(new float [currentPathPoints.size()][]);
+            Room subRoom = new Room(pathPoints);
+            if (subRoom.getArea() > 0) {
+              boolean pathPointsClockwise = subRoom.isClockwise();
+              if (pathPointsClockwise) {
+                // Store counter clockwise points as holes
+                if (!reversed) {
+                  pathPoints = getReversedArray(pathPoints);
+                }
+                List<float [][]> holes = areaHoles.get(i);
+                if (holes == null) {
+                  holes = new ArrayList<float [][]>(1);
+                  areaHoles.put(i, holes);
+                }
+                holes.add(pathPoints);
+              } else {
+                if (reversed) {
+                  pathPoints = getReversedArray(pathPoints);
+                }
+                areaPoints.add(pathPoints);
+                i++;
+              }
+            }
+          }
+          currentPathPoints.clear();
+          previousRoomPoint = null;
+          break;
+      }
+    }
+  }
+
   /**
    * Returns an array that cites <code>points</code> in reverse order.
    */
   private float [][] getReversedArray(float [][] points) {
+    points = points.clone();
     List<float []> pointList = Arrays.asList(points);
     Collections.reverse(pointList);
-    points = pointList.toArray(points);
-    return points;
+    return pointList.toArray(points);
   }
   
   /**
@@ -325,39 +644,62 @@
    */
   private float getRoomHeightAt(float x, float y) {
     double smallestDistance = Float.POSITIVE_INFINITY;
-    float roomHeight = this.home.getWallHeight();
-    // Search the closest wall point to x, y
-    for (Wall wall : this.home.getWalls()) {
-      Float wallHeightAtStart = wall.getHeight();
-      float [][] points = wall.getPoints();
-      for (int i = 0; i < points.length; i++) {
-        double distanceToWallPoint = Point2D.distanceSq(points [i][0], points [i][1], x, y);
-        if (distanceToWallPoint < smallestDistance) {
-          smallestDistance = distanceToWallPoint; 
-          if (i == 0 || i == 3) { // Wall start
-            roomHeight = wallHeightAtStart != null 
-                ? wallHeightAtStart 
-                : this.home.getWallHeight();
-          } else { // Wall end
-            roomHeight = wall.isTrapezoidal() 
-                ? wall.getHeightAtEnd() 
-                : (wallHeightAtStart != null ? wallHeightAtStart : this.home.getWallHeight());
+    Room room = (Room)getUserData();
+    Level roomLevel = room.getLevel();
+    float roomElevation = roomLevel != null
+        ? roomLevel.getElevation()
+        : 0;
+    float roomHeight = roomElevation + 
+        (roomLevel == null ? this.home.getWallHeight() : roomLevel.getHeight());
+    List<Level> levels = this.home.getLevels();
+    if (roomLevel == null || isLastLevel(roomLevel, levels)) {
+      // Search the closest wall point to x, y at last level
+      for (Wall wall : this.home.getWalls()) {
+        if (wall.isAtLevel(roomLevel)) {
+          float wallElevation = wall.getLevel() == null ? 0 : wall.getLevel().getElevation();
+          Float wallHeightAtStart = wall.getHeight();
+          float [][] points = wall.getPoints();
+          for (int i = 0; i < points.length; i++) {
+            double distanceToWallPoint = Point2D.distanceSq(points [i][0], points [i][1], x, y);
+            if (distanceToWallPoint < smallestDistance) {
+              smallestDistance = distanceToWallPoint; 
+              if (i == 0 || i == points.length - 1) { // Wall start
+                roomHeight = wallHeightAtStart != null 
+                    ? wallHeightAtStart 
+                    : this.home.getWallHeight();
+              } else { // Wall end
+                roomHeight = wall.isTrapezoidal() 
+                    ? wall.getHeightAtEnd() 
+                    : (wallHeightAtStart != null ? wallHeightAtStart : this.home.getWallHeight());
+              }
+              roomHeight += wallElevation;
+            }
           }
         }
       }
     }
     return roomHeight;
   }
+  
+  /**
+   * Returns <code>true</code> if the given level is the last level in home.
+   */
+  private boolean isLastLevel(Level level, List<Level> levels) {
+    return levels.indexOf(level) == levels.size() - 1;
+  }
 
   /**
    * Sets room appearance with its color, texture.
    */
   private void updateRoomAppearance(boolean waitTextureLoadingEnd) {
     Room room = (Room)getUserData();
+    boolean ignoreFloorTransparency = room.getLevel() == null || room.getLevel().getElevation() <= 0;
     updateRoomPartAppearance(((Shape3D)getChild(FLOOR_PART)).getAppearance(), 
-        room.getFloorTexture(), waitTextureLoadingEnd, room.getFloorColor(), room.getFloorShininess(), room.isFloorVisible());
+        room.getFloorTexture(), waitTextureLoadingEnd, room.getFloorColor(), room.getFloorShininess(), room.isFloorVisible(), ignoreFloorTransparency);
+    // Ignore ceiling transparency for rooms without level for backward compatibility 
+    boolean ignoreCeillingTransparency = room.getLevel() == null; 
     updateRoomPartAppearance(((Shape3D)getChild(CEILING_PART)).getAppearance(), 
-        room.getCeilingTexture(), waitTextureLoadingEnd, room.getCeilingColor(), room.getCeilingShininess(), room.isCeilingVisible());
+        room.getCeilingTexture(), waitTextureLoadingEnd, room.getCeilingColor(), room.getCeilingShininess(), room.isCeilingVisible(), ignoreCeillingTransparency);
   }
   
   /**
@@ -368,7 +710,8 @@
                                         boolean waitTextureLoadingEnd,
                                         Integer roomPartColor,
                                         float shininess,
-                                        boolean visible) {
+                                        boolean visible,
+                                        boolean ignoreTransparency) {
     if (roomPartTexture == null) {
       roomPartAppearance.setMaterial(getMaterial(roomPartColor, roomPartColor, shininess));
       roomPartAppearance.setTexture(null);
@@ -383,6 +726,16 @@
               }
             });
     }
+    if (!ignoreTransparency) { 
+      // Update room part transparency
+      float upperRoomsAlpha = this.home.getEnvironment().getWallsAlpha();
+      TransparencyAttributes transparencyAttributes = roomPartAppearance.getTransparencyAttributes();
+      transparencyAttributes.setTransparency(upperRoomsAlpha);
+      // If alpha is equal to zero, turn off transparency to get better results 
+      transparencyAttributes.setTransparencyMode(upperRoomsAlpha == 0 
+          ? TransparencyAttributes.NONE 
+          : TransparencyAttributes.NICEST);
+    }
     // Update room part visibility
     RenderingAttributes renderingAttributes = roomPartAppearance.getRenderingAttributes();
     renderingAttributes.setVisible(visible);
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/TextureManager.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/TextureManager.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/TextureManager.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/TextureManager.java	2011-12-21 00:48:52.000000000 +0000
@@ -145,7 +145,7 @@
     TextureKey textureKey;
     synchronized (this.textures) { // Use one mutex for both maps
       textureKey = this.contentTextureKeys.get(content);
-      if (textureKey == null) {
+      if (textureKey != null) {
         texture = this.textures.get(textureKey);
       } else {
         texture = null;
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Wall3D.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Wall3D.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/j3d/Wall3D.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/j3d/Wall3D.java	2011-12-21 00:48:52.000000000 +0000
@@ -47,6 +47,7 @@
 import com.eteks.sweethome3d.model.HomeFurnitureGroup;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.HomeTexture;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.Wall;
 import com.sun.j3d.utils.geometry.GeometryInfo;
 import com.sun.j3d.utils.geometry.NormalGenerator;
@@ -56,6 +57,7 @@
  */
 public class Wall3D extends Object3DBranch {
   private static final TextureAttributes MODULATE_TEXTURE_ATTRIBUTES = new TextureAttributes();
+  private static final float LEVEL_ELEVATION_SHIFT = 0.1f;
   
   static {
     MODULATE_TEXTURE_ATTRIBUTES.setTextureMode(TextureAttributes.MODULATE);
@@ -158,11 +160,14 @@
         ? (Shape3D)getChild(wallSide + 2)
         : null; 
     int currentGeometriesCount = wallFilledShape.numGeometries();
-    for (Geometry wallGeometry : createWallGeometries(wallSide, texture)) {
-      if (wallGeometry != null) {
-        wallFilledShape.addGeometry(wallGeometry);
-        if (wallOutlineShape != null) {
-          wallOutlineShape.addGeometry(wallGeometry);
+    Wall wall = (Wall)getUserData();
+    if (wall.getLevel() == null || wall.getLevel().isVisible()) {
+      for (Geometry wallGeometry : createWallGeometries(wallSide, texture)) {
+        if (wallGeometry != null) {
+          wallFilledShape.addGeometry(wallGeometry);
+          if (wallOutlineShape != null) {
+            wallOutlineShape.addGeometry(wallGeometry);
+          }
         }
       }
     }
@@ -185,10 +190,11 @@
         : wallSidePoints [wallSidePoints.length - 1];
     Shape wallShape = getShape(wallSidePoints);
     Area wallArea = new Area(wallShape);
+    float wallElevation = getWallElevation();
     float wallHeightAtStart = getWallHeightAtStart();
     float wallHeightAtEnd = getWallHeightAtEnd();
     float maxWallHeight = Math.max(wallHeightAtStart, wallHeightAtEnd);
-    
+
     // Compute wall angles and top line factors
     Wall wall = (Wall)getUserData();
     double wallYawAngle = Math.atan2(wall.getYEnd() - wall.getYStart(), wall.getXEnd() - wall.getXStart()); 
@@ -210,7 +216,9 @@
     // Search which doors or windows intersect with this wall side
     List<DoorOrWindowArea> windowIntersections = new ArrayList<DoorOrWindowArea>();
     for (HomePieceOfFurniture piece : getVisibleDoorsAndWindows(this.home.getFurniture())) {
-      if (piece.getElevation() < maxWallHeight) {
+      float pieceElevation = piece.getGroundElevation();
+      if (pieceElevation + piece.getHeight() > wallElevation
+          && pieceElevation < maxWallHeight) {
         Shape pieceShape = getShape(piece.getPoints());
         Area pieceArea = new Area(pieceShape);
         Area intersectionArea = new Area(wallShape);
@@ -254,7 +262,7 @@
     List<float[]> wallPoints = new ArrayList<float[]>(4);
     // Generate geometry for each wall part that doesn't contain a window
     float [] previousWallPoint = null;
-    for (PathIterator it = wallArea.getPathIterator(null, 0.1f); !it.isDone(); ) {
+    for (PathIterator it = wallArea.getPathIterator(null); !it.isDone(); ) {
       float [] wallPoint = new float[2];
       if (it.currentSegment(wallPoint) == PathIterator.SEG_CLOSE) {
         if (wallPoints.size() > 2) {
@@ -265,11 +273,11 @@
           if (wallPoints.size() > 2) {
             float [][] wallPartPoints = wallPoints.toArray(new float[wallPoints.size()][]);
             // Compute geometry for vertical part
-            wallGeometries.add(createWallVerticalPartGeometry(wall, wallPartPoints, 0, 
+            wallGeometries.add(createWallVerticalPartGeometry(wall, wallPartPoints, wallElevation, 
                 cosWallYawAngle, sinWallYawAngle, topLineAlpha, topLineBeta, texture, 
                 textureReferencePoint, wallSide));
             // Compute geometry for bottom part
-            wallGeometries.add(createWallHorizontalPartGeometry(wallPartPoints, 0, true, roundWall));
+            wallGeometries.add(createWallHorizontalPartGeometry(wallPartPoints, wallElevation, true, roundWall));
             // Compute geometry for top part
             wallGeometries.add(createWallTopPartGeometry(wallPartPoints, 
                 cosWallYawAngle, sinWallYawAngle, topLineAlpha, topLineBeta, roundWall));
@@ -286,10 +294,11 @@
     }
     
     // Generate geometry for each wall part above and below a window
+    Level level = wall.getLevel();
     previousWallPoint = null;
     for (DoorOrWindowArea windowIntersection : windowIntersections) {
       if (!windowIntersection.getArea().isEmpty()) {
-        for (PathIterator it = windowIntersection.getArea().getPathIterator(null, 0.1f); !it.isDone(); ) {
+        for (PathIterator it = windowIntersection.getArea().getPathIterator(null); !it.isDone(); ) {
           float [] wallPoint = new float[2];
           if (it.currentSegment(wallPoint) == PathIterator.SEG_CLOSE) {
             // Remove last point if it's equal to first point
@@ -305,9 +314,11 @@
                 Collections.sort(doorsOrWindows, 
                     new Comparator<HomePieceOfFurniture>() {
                       public int compare(HomePieceOfFurniture piece1, HomePieceOfFurniture piece2) {
-                        if (piece1.getElevation() < piece2.getElevation()) {
+                        float piece1Elevation = piece1.getGroundElevation();
+                        float piece2Elevation = piece2.getGroundElevation();
+                        if (piece1Elevation < piece2Elevation) {
                           return -1;
-                        } else if (piece1.getElevation() > piece2.getElevation()) {
+                        } else if (piece1Elevation > piece2Elevation) {
                           return 1;
                         } else {
                           return 0;
@@ -316,43 +327,53 @@
                     });
               }
               HomePieceOfFurniture lowestDoorOrWindow = doorsOrWindows.get(0);            
+              float lowestDoorOrWindowElevation = lowestDoorOrWindow.getGroundElevation();
               // Generate geometry for wall part below window
-              if (lowestDoorOrWindow.getElevation() > 0) {
-                wallGeometries.add(createWallVerticalPartGeometry(wall, wallPartPoints, 0, 
-                    cosWallYawAngle, sinWallYawAngle, 0, lowestDoorOrWindow.getElevation(), texture, 
+              if (lowestDoorOrWindowElevation > wallElevation) {
+                if (level != null 
+                    && level.getElevation() != wallElevation
+                    && lowestDoorOrWindow.getElevation() < LEVEL_ELEVATION_SHIFT) {
+                  // Give more chance to an overlapping room floor to be displayed
+                  lowestDoorOrWindowElevation -= LEVEL_ELEVATION_SHIFT;
+                }
+                wallGeometries.add(createWallVerticalPartGeometry(wall, wallPartPoints, wallElevation, 
+                    cosWallYawAngle, sinWallYawAngle, 0, lowestDoorOrWindowElevation, texture, 
                     textureReferencePoint, wallSide));
-                wallGeometries.add(createWallHorizontalPartGeometry(wallPartPoints, 0, true, roundWall));
+                wallGeometries.add(createWallHorizontalPartGeometry(wallPartPoints, wallElevation, true, roundWall));
                 wallGeometries.add(createWallHorizontalPartGeometry(wallPartPoints, 
-                    lowestDoorOrWindow.getElevation(), false, roundWall));
+                    lowestDoorOrWindowElevation, false, roundWall));
               }
               
               // Generate geometry for wall parts between superimposed windows
               for (int i = 0; i < doorsOrWindows.size() - 1; ) {
                 HomePieceOfFurniture lowerDoorOrWindow = doorsOrWindows.get(i);            
+                float lowerDoorOrWindowElevation = lowerDoorOrWindow.getGroundElevation();
                 HomePieceOfFurniture higherDoorOrWindow = doorsOrWindows.get(++i);
+                float higherDoorOrWindowElevation = higherDoorOrWindow.getGroundElevation();
                 // Ignore higher windows smaller than lower window
-                while (lowerDoorOrWindow.getElevation() + lowerDoorOrWindow.getHeight() >= higherDoorOrWindow.getElevation() + higherDoorOrWindow.getHeight()
+                while (lowerDoorOrWindowElevation + lowerDoorOrWindow.getHeight() >= higherDoorOrWindowElevation + higherDoorOrWindow.getHeight()
                     && ++i < doorsOrWindows.size()) {
                   higherDoorOrWindow = doorsOrWindows.get(i);
                 }
                 if (i < doorsOrWindows.size()
-                    && lowerDoorOrWindow.getElevation() + lowerDoorOrWindow.getHeight() < higherDoorOrWindow.getElevation()) {
-                  wallGeometries.add(createWallVerticalPartGeometry(wall, wallPartPoints, lowerDoorOrWindow.getElevation() + lowerDoorOrWindow.getHeight(), 
-                      cosWallYawAngle, sinWallYawAngle, 0, higherDoorOrWindow.getElevation(), texture, textureReferencePoint, wallSide));
+                    && lowerDoorOrWindowElevation + lowerDoorOrWindow.getHeight() < higherDoorOrWindowElevation) {
+                  wallGeometries.add(createWallVerticalPartGeometry(wall, wallPartPoints, lowerDoorOrWindowElevation + lowerDoorOrWindow.getHeight(), 
+                      cosWallYawAngle, sinWallYawAngle, 0, higherDoorOrWindowElevation, texture, textureReferencePoint, wallSide));
                   wallGeometries.add(createWallHorizontalPartGeometry(wallPartPoints, 
-                      lowerDoorOrWindow.getElevation() + lowerDoorOrWindow.getHeight(), true, roundWall));
-                  wallGeometries.add(createWallHorizontalPartGeometry(wallPartPoints, higherDoorOrWindow.getElevation(), false, roundWall));
+                      lowerDoorOrWindowElevation + lowerDoorOrWindow.getHeight(), true, roundWall));
+                  wallGeometries.add(createWallHorizontalPartGeometry(wallPartPoints, higherDoorOrWindowElevation, false, roundWall));
                 }
               }
                 
               HomePieceOfFurniture highestDoorOrWindow = doorsOrWindows.get(doorsOrWindows.size() - 1);            
+              float highestDoorOrWindowElevation = highestDoorOrWindow.getGroundElevation();
               for (int i = doorsOrWindows.size() - 2; i >= 0; i--) {
                 HomePieceOfFurniture doorOrWindow = doorsOrWindows.get(i);            
-                if (doorOrWindow.getElevation() + doorOrWindow.getHeight() > highestDoorOrWindow.getElevation() + highestDoorOrWindow.getHeight()) {
+                if (doorOrWindow.getGroundElevation() + doorOrWindow.getHeight() > highestDoorOrWindowElevation + highestDoorOrWindow.getHeight()) {
                   highestDoorOrWindow = doorOrWindow;
                 }
               }
-              float doorOrWindowTop = highestDoorOrWindow.getElevation() + highestDoorOrWindow.getHeight();
+              float doorOrWindowTop = highestDoorOrWindowElevation + highestDoorOrWindow.getHeight();
               // Compute the minimum vertical position of wallPartPoints
               double minTopY = maxWallHeight;
               for (int i = 0; i < wallPartPoints.length; i++) {
@@ -547,6 +568,10 @@
               firstHorizontalTextureCoords = pointUCoordinates [index];
               secondHorizontalTextureCoords = pointUCoordinates [nextIndex];
             }
+            if (wallSide == LEFT_WALL_SIDE && texture.isLeftToRightOriented()) {
+              firstHorizontalTextureCoords = -firstHorizontalTextureCoords;
+              secondHorizontalTextureCoords = -secondHorizontalTextureCoords;
+            }
             textureCoords [j++] = new TexCoord2f(firstHorizontalTextureCoords, yMinTextureCoords);
             textureCoords [j++] = new TexCoord2f(secondHorizontalTextureCoords, yMinTextureCoords);
             textureCoords [j++] = new TexCoord2f(secondHorizontalTextureCoords, top [nextIndex].y / texture.getHeight());
@@ -651,16 +676,67 @@
   }
   
   /**
+   * Returns the elevation of the wall managed by this 3D object.
+   */
+  private float getWallElevation() {
+    Wall wall = (Wall)getUserData();      
+    Level level = wall.getLevel();
+    if (level == null) {
+      return 0;
+    } else {
+      float floorThicknessBottomWall = getFloorThicknessBottomWall();
+      if (floorThicknessBottomWall > 0) {
+        // Shift a little wall elevation at upper floors to avoid their bottom part overlaps a room ceiling
+        floorThicknessBottomWall -= LEVEL_ELEVATION_SHIFT;
+      }
+      return level.getElevation() - floorThicknessBottomWall;
+    }
+  }
+  
+  /**
+   * Returns the floor thickness at the bottom of the wall managed by this 3D object.
+   */
+  private float getFloorThicknessBottomWall() {
+    Wall wall = (Wall)getUserData();      
+    Level level = wall.getLevel();
+    if (level == null) {
+      return 0;
+    } else {
+      List<Level> levels = this.home.getLevels();
+      if (!levels.isEmpty() && levels.get(0).getElevation() == level.getElevation()) {
+        // Ignore floor thickness at first level 
+        return 0;
+      } else {
+        return level.getFloorThickness();
+      }
+    }
+  }
+  
+  /**
    * Returns the height at the start of the wall managed by this 3D object.
    */
   private float getWallHeightAtStart() {
     Float wallHeight = ((Wall)getUserData()).getHeight();      
+    float wallHeightAtStart;
     if (wallHeight != null) {
-      return wallHeight;
+      wallHeightAtStart = wallHeight + getWallElevation() + getFloorThicknessBottomWall();
     } else {
       // If wall height isn't set, use home wall height
-      return this.home.getWallHeight();
+      wallHeightAtStart = this.home.getWallHeight() + getWallElevation() + getFloorThicknessBottomWall();
+    }
+    return wallHeightAtStart + getHeightElevationShift();
+  }
+  
+  private float getHeightElevationShift() {
+    Level level = ((Wall)getUserData()).getLevel();
+    if (level != null) {
+      List<Level> levels = this.home.getLevels();
+      // Don't shift last level
+      if (levels.get(levels.size() - 1) != level) {
+        return LEVEL_ELEVATION_SHIFT;
+      }
     }
+    return 0;
   }
   
   /**
@@ -669,7 +745,7 @@
   private float getWallHeightAtEnd() {
     Wall wall = (Wall)getUserData();      
     if (wall.isTrapezoidal()) {
-      return wall.getHeightAtEnd();
+      return wall.getHeightAtEnd() + getWallElevation() + getFloorThicknessBottomWall() + getHeightElevationShift();
     } else {
       // If the wall isn't trapezoidal, use same height as at wall start
       return getWallHeightAtStart();
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/MacOSXConfiguration.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/MacOSXConfiguration.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/MacOSXConfiguration.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/MacOSXConfiguration.java	2011-12-21 00:48:50.000000000 +0000
@@ -194,7 +194,7 @@
     });
     
     // Set application icon if program wasn't launch from bundle
-    if (!"true".equalsIgnoreCase(System.getProperty("sweethome3d.bundle", "false"))) {
+    if (!Boolean.getBoolean("sweethome3d.bundle")) {
       try {
         String iconPath = homeApplication.getUserPreferences().getLocalizedString(HomePane.class, "about.icon");
         Image icon = ImageIO.read(HomePane.class.getResource(iconPath));
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Camera.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Camera.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Camera.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Camera.java	2011-12-21 00:48:52.000000000 +0000
@@ -61,7 +61,6 @@
   // if new constants are added to Lens enum in future versions
   private String         lensName;
 
-  
   private transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
 
   /**
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/CatalogDoorOrWindow.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/CatalogDoorOrWindow.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/CatalogDoorOrWindow.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/CatalogDoorOrWindow.java	2011-12-21 00:48:52.000000000 +0000
@@ -27,8 +27,6 @@
  * @since  1.7
  */
 public class CatalogDoorOrWindow extends CatalogPieceOfFurniture implements DoorOrWindow {
-  private static final long serialVersionUID = 1L;
-
   private final float   wallThickness;
   private final float   wallDistance;
   private final Sash [] sashes;
@@ -133,8 +131,48 @@
                              float [][] modelRotation, String creator,
                              boolean resizable, boolean deformable, boolean texturable,
                              BigDecimal price, BigDecimal valueAddedTaxPercentage) {
-    super(id, name, description, icon, null, model, width, depth, height, elevation, movable,   
-        modelRotation, creator, resizable, deformable, texturable, price, valueAddedTaxPercentage);
+    this(id, name, description, icon, planIcon, model, width, depth, height, elevation, movable,   
+        wallThickness, wallDistance, sashes,
+        modelRotation, creator, resizable, deformable, texturable, price, valueAddedTaxPercentage, null);
+  }
+         
+  /**
+   * Creates an unmodifiable catalog door or window of the default catalog.
+   * @param id    the id of the new door or window, or <code>null</code>
+   * @param name  the name of the new door or window
+   * @param description the description of the new door or window 
+   * @param icon content of the icon of the new door or window
+   * @param planIcon content of the icon of the new piece displayed in plan
+   * @param model content of the 3D model of the new door or window
+   * @param width  the width in centimeters of the new door or window
+   * @param depth  the depth in centimeters of the new door or window
+   * @param height  the height in centimeters of the new door or window
+   * @param elevation  the elevation in centimeters of the new door or window
+   * @param movable if <code>true</code>, the new door or window is movable
+   * @param wallThickness a value in percentage of the depth of the new door or window
+   * @param wallDistance a distance in percentage of the depth of the new door or window
+   * @param sashes the sashes attached to the new door or window
+   * @param modelRotation the rotation 3 by 3 matrix applied to the door or window model
+   * @param creator the creator of the model
+   * @param resizable if <code>true</code>, the size of the new door or window may be edited
+   * @param deformable if <code>true</code>, the width, depth and height of the new piece may 
+   *            change independently from each other
+   * @param texturable if <code>false</code> this piece should always keep the same color or texture.
+   * @param price the price of the new door or window, or <code>null</code> 
+   * @param valueAddedTaxPercentage the Value Added Tax percentage applied to the 
+   *             price of the new door or window or <code>null</code>
+   * @param currency the price currency, noted with ISO 4217 code, or <code>null</code> 
+   * @since 3.4 
+   */
+  public CatalogDoorOrWindow(String id, String name, String description, 
+                             Content icon, Content planIcon, Content model, 
+                             float width, float depth, float height, float elevation, boolean movable, 
+                             float wallThickness, float wallDistance, Sash [] sashes,
+                             float [][] modelRotation, String creator,
+                             boolean resizable, boolean deformable, boolean texturable,
+                             BigDecimal price, BigDecimal valueAddedTaxPercentage, String currency) {
+    super(id, name, description, icon, planIcon, model, width, depth, height, elevation, movable, null,   
+        modelRotation, creator, resizable, deformable, texturable, price, valueAddedTaxPercentage, currency);
     this.wallThickness = wallThickness;
     this.wallDistance = wallDistance;
     this.sashes = sashes;
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/CatalogLight.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/CatalogLight.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/CatalogLight.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/CatalogLight.java	2011-12-21 00:48:52.000000000 +0000
@@ -27,8 +27,6 @@
  * @since  1.7
  */
 public class CatalogLight extends CatalogPieceOfFurniture implements Light {
-  private static final long serialVersionUID = 1L;
-
   private final LightSource [] lightSources;
 
   /**
@@ -124,8 +122,48 @@
                       float [][] modelRotation, String creator,
                       boolean resizable, boolean deformable, boolean texturable,
                       BigDecimal price, BigDecimal valueAddedTaxPercentage) {
-    super(id, name, description, icon, planIcon, model, width, depth, height, elevation, movable,   
-        modelRotation, creator, resizable, deformable, texturable, price, valueAddedTaxPercentage);
+    this(id, name, description, icon, planIcon, model, width, depth, height, elevation, movable,   
+        lightSources, null, modelRotation, creator, resizable, true, true, price, valueAddedTaxPercentage, null);
+  }
+         
+  /**
+   * Creates an unmodifiable catalog light of the default catalog.
+   * @param id    the id of the new light, or <code>null</code>
+   * @param name  the name of the new light
+   * @param description the description of the new light 
+   * @param icon content of the icon of the new light
+   * @param planIcon content of the icon of the new piece displayed in plan
+   * @param model content of the 3D model of the new light
+   * @param width  the width in centimeters of the new light
+   * @param depth  the depth in centimeters of the new light
+   * @param height  the height in centimeters of the new light
+   * @param elevation  the elevation in centimeters of the new light
+   * @param movable if <code>true</code>, the new light is movable
+   * @param lightSources the light sources of the new light
+   * @param staircaseCutOutShape the shape used to cut out upper levels when they intersect 
+   *            with the piece like a staircase
+   * @param modelRotation the rotation 3 by 3 matrix applied to the light model
+   * @param creator the creator of the model
+   * @param resizable if <code>true</code>, the size of the new light may be edited
+   * @param deformable if <code>true</code>, the width, depth and height of the new piece may 
+   *            change independently from each other
+   * @param texturable if <code>false</code> this piece should always keep the same color or texture.
+   * @param price the price of the new light, or <code>null</code> 
+   * @param valueAddedTaxPercentage the Value Added Tax percentage applied to the 
+   *             price of the new light or <code>null</code> 
+   * @param currency the price currency, noted with ISO 4217 code, or <code>null</code> 
+   * @since 3.4           
+   */
+  public CatalogLight(String id, String name, String description, 
+                      Content icon, Content planIcon, Content model, 
+                      float width, float depth, float height, float elevation, boolean movable, 
+                      LightSource [] lightSources, String staircaseCutOutShape,
+                      float [][] modelRotation, String creator,
+                      boolean resizable, boolean deformable, boolean texturable,
+                      BigDecimal price, BigDecimal valueAddedTaxPercentage, String currency) {
+    super(id, name, description, icon, planIcon, model, width, depth, height, elevation,   
+        movable, staircaseCutOutShape, modelRotation, creator, resizable, deformable, texturable, 
+        price, valueAddedTaxPercentage, currency);
     this.lightSources = lightSources;
   }
          
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/CatalogPieceOfFurniture.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/CatalogPieceOfFurniture.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/CatalogPieceOfFurniture.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/CatalogPieceOfFurniture.java	2011-12-21 00:48:52.000000000 +0000
@@ -28,8 +28,6 @@
  * @author Emmanuel Puybaret
  */
 public class CatalogPieceOfFurniture implements Comparable<CatalogPieceOfFurniture>, PieceOfFurniture {
-  private static final long serialVersionUID = 1L;
-
   private static final float [][] INDENTITY_ROTATION = new float [][] {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}};
 
   private final String                 id;
@@ -46,6 +44,7 @@
   private final boolean                movable;
   private final boolean                doorOrWindow;
   private final float [][]             modelRotation;
+  private final String                 staircaseCutOutShape;
   private final String                 creator;
   private final boolean                backFaceShown;
   private final Integer                color;
@@ -56,11 +55,13 @@
   private final boolean                texturable;
   private final BigDecimal             price;
   private final BigDecimal             valueAddedTaxPercentage;
+  private final String                 currency;
 
   private FurnitureCategory            category;
 
   private static final Collator COMPARATOR = Collator.getInstance();
 
+
   /**
    * Creates a catalog piece of furniture.
    * @param name  the name of the new piece
@@ -78,8 +79,8 @@
   public CatalogPieceOfFurniture(String name, Content icon, Content model, 
                                  float width, float depth, float height, 
                                  boolean movable, boolean doorOrWindow) {
-    this(null, name, null, icon, null, model, width, depth, height, 0, movable, doorOrWindow, null,
-        INDENTITY_ROTATION, null, false, true, true, true, null, null, (float)Math.PI / 8, true, false);
+    this(null, name, null, icon, model, width, depth, height, 0, movable, doorOrWindow, 
+        INDENTITY_ROTATION, null, true, null, null);
   }
 
   /**
@@ -110,8 +111,8 @@
                                  boolean movable, boolean doorOrWindow, 
                                  float [][] modelRotation, String creator,
                                  boolean resizable, BigDecimal price, BigDecimal valueAddedTaxPercentage) {
-    this(id, name, description, icon, null, model, width, depth, height, elevation, movable, doorOrWindow, null,
-        modelRotation, creator, false, resizable, true, true, price, valueAddedTaxPercentage, (float)Math.PI / 8, true, false);
+    this(id, name, description, icon, model, width, depth, height, elevation, movable, 
+        modelRotation, creator, resizable, price, valueAddedTaxPercentage);
   }
          
   /**
@@ -202,12 +203,51 @@
                                  boolean movable, float [][] modelRotation, String creator,
                                  boolean resizable, boolean deformable, boolean texturable, 
                                  BigDecimal price, BigDecimal valueAddedTaxPercentage) {
-    this(id, name, description, icon, planIcon, model, width, depth, height, elevation, movable, false, null,
-        modelRotation, creator, false, resizable, deformable, texturable,
-        price, valueAddedTaxPercentage, (float)Math.PI / 8, true, false);
+    this(id, name, description, icon, planIcon, model, width, depth, height, elevation, 
+        movable, null, modelRotation, creator, resizable, deformable, texturable,
+        price, valueAddedTaxPercentage, null);
   }
   
   /**
+   * Creates an unmodifiable catalog piece of furniture of the default catalog.
+   * @param id    the id of the new piece or <code>null</code>
+   * @param name  the name of the new piece
+   * @param description the description of the new piece 
+   * @param icon content of the icon of the new piece
+   * @param planIcon content of the icon of the new piece displayed in plan
+   * @param model content of the 3D model of the new piece
+   * @param width  the width in centimeters of the new piece
+   * @param depth  the depth in centimeters of the new piece
+   * @param height  the height in centimeters of the new piece
+   * @param elevation  the elevation in centimeters of the new piece
+   * @param movable if <code>true</code>, the new piece is movable
+   * @param staircaseCutOutShape the shape used to cut out upper levels when they intersect 
+   *            with the piece like a staircase
+   * @param modelRotation the rotation 3 by 3 matrix applied to the piece model
+   * @param creator the creator of the model
+   * @param resizable if <code>true</code>, the size of the new piece may be edited
+   * @param deformable if <code>true</code>, the width, depth and height of the new piece may 
+   *            change independently from each other
+   * @param texturable if <code>false</code> this piece should always keep the same color or texture.
+   * @param price the price of the new piece or <code>null</code> 
+   * @param valueAddedTaxPercentage the Value Added Tax percentage applied to the 
+   *             price of the new piece or <code>null</code> 
+   * @param currency the price currency, noted with ISO 4217 code, or <code>null</code> 
+   * @since 3.4
+   */
+  public CatalogPieceOfFurniture(String id, String name, String description, 
+                                 Content icon, Content planIcon, Content model, 
+                                 float width, float depth, float height, 
+                                 float elevation, boolean movable, String staircaseCutOutShape, 
+                                 float [][] modelRotation, String creator,
+                                 boolean resizable, boolean deformable, boolean texturable, 
+                                 BigDecimal price, BigDecimal valueAddedTaxPercentage, String currency) {
+    this(id, name, description, icon, planIcon, model, width, depth, height, elevation, movable, false, staircaseCutOutShape,
+        null, modelRotation, creator, false, resizable, deformable, texturable,
+        price, valueAddedTaxPercentage, currency, (float)Math.PI / 8, true, false);
+  }
+  
+ /**
    * Creates a modifiable catalog piece of furniture with all its values.
    * @param name  the name of the new piece
    * @param icon content of the icon of the new piece
@@ -232,8 +272,8 @@
                                  boolean movable, boolean doorOrWindow, Integer color,
                                  float [][] modelRotation, boolean backFaceShown,
                                  float iconYaw, boolean proportional) {
-    this(null, name, null, icon, null, model, width, depth, height, elevation, movable, doorOrWindow, 
-        color, modelRotation, null, backFaceShown, true, true, true, null, null, iconYaw, proportional, true);
+    this(name, icon, model, width, depth, height, elevation, movable, 
+        color, modelRotation, backFaceShown, iconYaw, proportional);
   }
   
   /**
@@ -258,17 +298,47 @@
                                  boolean movable, Integer color,
                                  float [][] modelRotation, boolean backFaceShown,
                                  float iconYaw, boolean proportional) {
+    this(name, icon, model, width, depth, height, elevation, movable,  
+        null, color, modelRotation, backFaceShown, iconYaw, proportional);
+  }
+  
+  /**
+   * Creates a modifiable catalog piece of furniture with all its values.
+   * @param name  the name of the new piece
+   * @param icon content of the icon of the new piece
+   * @param model content of the 3D model of the new piece
+   * @param width  the width in centimeters of the new piece
+   * @param depth  the depth in centimeters of the new piece
+   * @param height  the height in centimeters of the new piece
+   * @param elevation  the elevation in centimeters of the new piece
+   * @param movable if <code>true</code>, the new piece is movable
+   * @param staircaseCutOutShape the shape used to cut out upper levels when they intersect 
+   *            with the piece like a staircase
+   * @param color the color of the piece as RGB code or <code>null</code> if piece color is unchanged
+   * @param modelRotation the rotation 3 by 3 matrix applied to the piece model
+   * @param backFaceShown <code>true</code> if back face should be shown
+   * @param iconYaw the yaw angle used to create the piece icon
+   * @param proportional if <code>true</code>, size proportions will be kept
+   * @since 3.4 
+   */
+  public CatalogPieceOfFurniture(String name, Content icon, Content model, 
+                                 float width, float depth, float height, float elevation, 
+                                 boolean movable, String staircaseCutOutShape,
+                                 Integer color, float [][] modelRotation, 
+                                 boolean backFaceShown,
+                                 float iconYaw, boolean proportional) {
     this(null, name, null, icon, null, model, width, depth, height, elevation, movable, false, 
-        color, modelRotation, null, backFaceShown, true, true, true, null, null, iconYaw, proportional, true);
+        staircaseCutOutShape, color, modelRotation, null, backFaceShown, true, true, true, null, null, null, iconYaw, proportional, true);
   }
   
   private CatalogPieceOfFurniture(String id, String name, String description, 
                                   Content icon, Content planIcon, Content model, 
                                   float width, float depth, float height, float elevation, 
                                   boolean movable, boolean doorOrWindow, 
-                                  Integer color, float [][] modelRotation, String creator, boolean backFaceShown,
+                                  String staircaseCutOutShape, Integer color, float [][] modelRotation,
+                                  String creator, boolean backFaceShown,
                                   boolean resizable, boolean deformable, boolean texturable,
-                                  BigDecimal price, BigDecimal valueAddedTaxPercentage,
+                                  BigDecimal price, BigDecimal valueAddedTaxPercentage, String currency,
                                   float iconYaw, boolean proportional, boolean modifiable) {
     this.id = id;
     this.name = name;
@@ -283,9 +353,11 @@
     this.movable = movable;
     this.doorOrWindow = doorOrWindow;
     this.color = color;
+    this.staircaseCutOutShape = staircaseCutOutShape;
     this.creator = creator;
     this.price = price;
     this.valueAddedTaxPercentage = valueAddedTaxPercentage;
+    this.currency = currency;
     if (modelRotation == null) {
       this.modelRotation = INDENTITY_ROTATION;
     } else {
@@ -405,6 +477,15 @@
   }
 
   /**
+   * Returns the shape used to cut out upper levels when they intersect with the piece   
+   * like a staircase.
+   * @since 3.4
+   */
+  public String getStaircaseCutOutShape() {
+    return this.staircaseCutOutShape;
+  }
+  
+  /**
    * Returns the creator of this piece.
    */
   public String getCreator() {
@@ -485,6 +566,15 @@
   }
 
   /**
+   * Returns the price currency, noted with ISO 4217 code, or <code>null</code> 
+   * if it has no price or default currency should be used.
+   * @since 3.4
+   */
+  public String getCurrency() {
+    return this.currency;
+  }
+
+  /**
    * Returns the category of this piece of furniture.
    */
   public FurnitureCategory getCategory() {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/DimensionLine.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/DimensionLine.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/DimensionLine.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/DimensionLine.java	2011-12-21 00:48:52.000000000 +0000
@@ -34,12 +34,12 @@
  * A dimension line in plan.
  * @author Emmanuel Puybaret
  */
-public class DimensionLine implements Serializable, Selectable {
+public class DimensionLine implements Serializable, Selectable, Elevatable {
   /**
    * The properties of a dimension line that may change. <code>PropertyChangeListener</code>s added 
    * to a dimension line will be notified under a property name equal to the string value of one these properties.
    */
-  public enum Property {X_START, Y_START, X_END, Y_END, OFFSET, LENGTH_STYLE} 
+  public enum Property {X_START, Y_START, X_END, Y_END, OFFSET, LENGTH_STYLE, LEVEL} 
    
   private static final long serialVersionUID = 1L;
   
@@ -49,6 +49,7 @@
   private float     yEnd;
   private float     offset;
   private TextStyle lengthStyle;
+  private Level     level;
 
   private transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
   private transient Shape shapeCache;
@@ -215,6 +216,35 @@
   }
 
   /**
+   * Returns the level which this dimension line belongs to. 
+   * @since 3.4
+   */
+  public Level getLevel() {
+    return this.level;
+  }
+
+  /**
+   * Sets the level of this dimension line. Once this dimension line is updated, 
+   * listeners added to this dimension line will receive a change notification.
+   * @since 3.4
+   */
+  public void setLevel(Level level) {
+    if (level != this.level) {
+      Level oldLevel = this.level;
+      this.level = level;
+      this.propertyChangeSupport.firePropertyChange(Property.LEVEL.name(), oldLevel, level);
+    }
+  }
+
+  /**
+   * Returns <code>true</code> if this dimension line is at the given level.
+   * @since 3.4
+   */
+  public boolean isAtLevel(Level level) {
+    return this.level == level;
+  }
+  
+  /**
    * Returns the points of the rectangle surrounding 
    * this dimension line and its extension lines.
    * @return an array of the 4 (x,y) coordinates of the rectangle.
@@ -343,6 +373,7 @@
     try {
       DimensionLine clone = (DimensionLine)super.clone();
       clone.propertyChangeSupport = new PropertyChangeSupport(clone);
+      clone.level = null;
       return clone;
     } catch (CloneNotSupportedException ex) {
       throw new IllegalStateException("Super class isn't cloneable"); 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Elevatable.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Elevatable.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Elevatable.java	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Elevatable.java	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+ * Elevatable.java 25 oct. 2011
+ *
+ * Sweet Home 3D, Copyright (c) 2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package com.eteks.sweethome3d.model;
+
+/**
+ * An object that belongs to a level.
+ * @author Emmanuel Puybaret
+ * @since 3.4
+ */
+public interface Elevatable {
+  /**
+   * Returns the level of this object.
+   */
+  public abstract Level getLevel();
+  
+  /**
+   * Returns <code>true</code> if this object can be viewed at the given level.
+   */
+  public abstract boolean isAtLevel(Level level);
+}
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/HomeEnvironment.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/HomeEnvironment.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/HomeEnvironment.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/HomeEnvironment.java	2011-12-21 00:48:52.000000000 +0000
@@ -37,7 +37,7 @@
   /**
    * The environment properties that may change.
    */
-  public enum Property {SKY_COLOR, SKY_TEXTURE, GROUND_COLOR, GROUND_TEXTURE, LIGHT_COLOR, CEILING_LIGHT_COLOR, WALLS_ALPHA, DRAWING_MODE,
+  public enum Property {SKY_COLOR, SKY_TEXTURE, GROUND_COLOR, GROUND_TEXTURE, LIGHT_COLOR, CEILING_LIGHT_COLOR, WALLS_ALPHA, DRAWING_MODE, ALL_LEVELS_VISIBLE,
                         PHOTO_WIDTH, PHOTO_HEIGHT, PHOTO_ASPECT_RATIO, PHOTO_QUALITY, 
                         VIDEO_WIDTH, VIDEO_ASPECT_RATIO, VIDEO_QUALITY, VIDEO_FRAME_RATE, VIDEO_CAMERA_PATH};
   /**
@@ -55,6 +55,7 @@
   private int                             ceilingLightColor;
   private float                           wallsAlpha;
   private DrawingMode                     drawingMode;
+  private boolean                         allLevelsVisible; 
   private int                             photoWidth;
   private int                             photoHeight;
   private transient AspectRatio           photoAspectRatio;
@@ -326,6 +327,24 @@
   }
 
   /**
+   * Returns whether all levels should be displayed or not.
+   */
+  public boolean isAllLevelsVisible() {
+    return this.allLevelsVisible;
+  }
+  
+  /**
+   * Sets whether all levels should be displayed or not and fires a <code>PropertyChangeEvent</code>.
+   */
+  public void setAllLevelsVisible(boolean allLevelsVisible) {
+    if (allLevelsVisible != this.allLevelsVisible) {
+      this.allLevelsVisible = allLevelsVisible;
+      this.propertyChangeSupport.firePropertyChange(
+          Property.ALL_LEVELS_VISIBLE.name(), !allLevelsVisible, allLevelsVisible);
+    }
+  }
+
+  /**
    * Returns the preferred photo width. 
    * @since 2.0
    */
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/HomeFurnitureGroup.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/HomeFurnitureGroup.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/HomeFurnitureGroup.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/HomeFurnitureGroup.java	2011-12-21 00:48:52.000000000 +0000
@@ -54,6 +54,8 @@
 
   /**
    * Creates a group from the given <code>furniture</code> list. 
+   * The level of each piece of furniture of the group will be reset to <code>null</code> and if they belong to levels
+   * with different elevations, their elevation will be updated to be relative to the elevation of the lowest level.
    */
   public HomeFurnitureGroup(List<HomePieceOfFurniture> furniture,
                             String name) {
@@ -78,8 +80,29 @@
     boolean visible = false;
     boolean modelMirrored = true;
     this.valueAddedTaxPercentage = furniture.get(0).getValueAddedTaxPercentage();
+    // Search the lowest level elevation among grouped furniture
+    Level minLevel = null;
     for (HomePieceOfFurniture piece : furniture) {
-      elevation = Math.min(elevation, piece.getElevation());      
+      Level level = piece.getLevel();
+      if (level != null 
+          && (minLevel == null
+              || level.getElevation() < minLevel.getElevation())) {
+        minLevel = level;
+      }
+    }
+    for (HomePieceOfFurniture piece : furniture) {
+      Level level = piece.getLevel();
+      if (level != null) {
+        elevation = Math.min(elevation, piece.getGroundElevation() - minLevel.getElevation());
+      } else {
+        elevation = Math.min(elevation, piece.getElevation());
+      }
+    }
+    for (HomePieceOfFurniture piece : furniture) {
+      if (piece.getLevel() != null) {
+        piece.setElevation(piece.getGroundElevation() - minLevel.getElevation());
+      }
+      piece.setLevel(null);
       height = Math.max(height, piece.getElevation() + piece.getHeight());
       movable &= piece.isMovable();
       this.resizable &= piece.isResizable();
@@ -566,6 +589,17 @@
   }
 
   /**
+   * Set the level of this group and the furniture it contains.
+   */
+  @Override
+  public void setLevel(Level level) {
+    super.setLevel(level);
+    for (HomePieceOfFurniture piece : this.furniture) {
+      piece.setLevel(level);
+    }
+  }
+  
+  /**
    * Returns a clone of this group with cloned furniture.
    */
   @Override
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Home.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Home.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Home.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Home.java	2011-12-21 00:48:52.000000000 +0000
@@ -19,6 +19,7 @@
  */
 package com.eteks.sweethome3d.model;
 
+import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
@@ -28,6 +29,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,22 +46,36 @@
    * in <code>Home</code> class or in one of the classes that it uses,
    * this number is increased.
    */
-  public static final long CURRENT_VERSION = 3300;
+  public static final long CURRENT_VERSION = 3400;
   
   private static final boolean KEEP_BACKWARD_COMPATIBLITY = true;
-  
+
+  private static final Comparator<Level> LEVEL_ELEVATION_COMPARATOR = new Comparator<Level>() {
+      public int compare(Level level1, Level level2) {
+        int elevationComparison = Float.compare(level1.getElevation(), level2.getElevation());
+        if (elevationComparison != 0) {
+          return elevationComparison;
+        } else {
+          return -Float.compare(level1.getHeight(), level2.getHeight());
+        }
+      }
+    };
+
   /**
    * The properties of a home that may change. <code>PropertyChangeListener</code>s added 
    * to a home will be notified under a property name equal to the name value of one these properties.
    */
   public enum Property {NAME, MODIFIED,
     FURNITURE_SORTED_PROPERTY, FURNITURE_DESCENDING_SORTED, FURNITURE_VISIBLE_PROPERTIES,    
-    BACKGROUND_IMAGE, CAMERA, PRINT, BASE_PLAN_LOCKED, STORED_CAMERAS, RECOVERED};
+    BACKGROUND_IMAGE, CAMERA, PRINT, BASE_PLAN_LOCKED, STORED_CAMERAS, RECOVERED, SELECTED_LEVEL};
   
   private List<HomePieceOfFurniture>                  furniture;
   private transient CollectionChangeSupport<HomePieceOfFurniture> furnitureChangeSupport;
   private transient List<Selectable>                  selectedItems;
   private transient List<SelectionListener>           selectionListeners;
+  private List<Level>                                 levels;
+  private Level                                       selectedLevel;
+  private transient CollectionChangeSupport<Level>    levelsChangeSupport;
   private List<Wall>                                  walls;
   private transient CollectionChangeSupport<Wall>     wallsChangeSupport;
   private List<Room>                                  rooms;
@@ -70,7 +86,7 @@
   private transient CollectionChangeSupport<Label>    labelsChangeSupport;
   private Camera                                      camera;
   private String                                      name;
-  private float                                       wallHeight;
+  private final float                                 wallHeight;
   private transient boolean                           modified;
   private transient boolean                           recovered;
   private BackgroundImage                             backgroundImage;
@@ -138,6 +154,7 @@
         HomePieceOfFurniture.SortableProperty.VISIBLE});
     // Init transient lists and other fields
     init(true);
+    addModelListeners();
   }
 
   /**
@@ -147,6 +164,7 @@
   private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
     init(false);
     in.defaultReadObject();
+    addModelListeners();
     
     if (KEEP_BACKWARD_COMPATIBLITY) {
       // Restore furnitureSortedProperty from furnitureSortedPropertyName
@@ -173,6 +191,13 @@
         this.furnitureVisiblePropertyNames = null;
       }
   
+      // Ensure all wall have an height
+      for (Wall wall : this.walls) {
+        if (wall.getHeight() == null) {
+          wall.setHeight(this.wallHeight);
+        }
+      }
+      
       // Restore referenced HomeDoorOrWindow instances stored in a separate field 
       // for backward compatibility reasons
       if (this.furnitureWithDoorsAndWindows != null) {
@@ -186,7 +211,7 @@
         this.furniture = this.furnitureWithGroups;
         this.furnitureWithGroups = null;
       }
-
+      
       // Restore environment fields from home fields for compatibility reasons
       this.environment.setGroundColor(this.groundColor);
       this.environment.setGroundTexture(this.groundTexture);
@@ -201,6 +226,7 @@
     this.selectedItems = new ArrayList<Selectable>();
     this.furnitureChangeSupport = new CollectionChangeSupport<HomePieceOfFurniture>(this);
     this.selectionListeners = new ArrayList<SelectionListener>();
+    this.levelsChangeSupport = new CollectionChangeSupport<Level>(this);
     this.wallsChangeSupport = new CollectionChangeSupport<Wall>(this);
     this.roomsChangeSupport = new CollectionChangeSupport<Room>(this);
     this.dimensionLinesChangeSupport = new CollectionChangeSupport<DimensionLine>(this);
@@ -232,6 +258,7 @@
     this.dimensionLines = new ArrayList<DimensionLine>();
     this.labels = new ArrayList<Label>();
     this.compass = new Compass(-100, 50, 100);
+    this.levels = new ArrayList<Level>();
     // Let compass be visible only on new homes
     this.compass.setVisible(newHome);
     this.visualProperties = new HashMap<String, Object>();
@@ -240,6 +267,37 @@
   }
 
   /**
+   * Adds listeners to model.
+   */
+  private void addModelListeners() {
+    // Add listeners to levels to maintain its elevation order
+    final PropertyChangeListener levelElevationChangeListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          if (Level.Property.ELEVATION.name().equals(ev.getPropertyName())
+              || Level.Property.HEIGHT.name().equals(ev.getPropertyName())) {
+            levels = new ArrayList<Level>(levels);
+            Collections.sort(levels, LEVEL_ELEVATION_COMPARATOR);
+          }
+        }
+      };
+    for (Level level : this.levels) {
+      level.addPropertyChangeListener(levelElevationChangeListener);
+    }
+    addLevelsListener(new CollectionListener<Level>() {
+        public void collectionChanged(CollectionEvent<Level> ev) {
+          switch (ev.getType()) {
+            case ADD :
+              ev.getItem().addPropertyChangeListener(levelElevationChangeListener);
+              break;
+            case DELETE :
+              ev.getItem().removePropertyChangeListener(levelElevationChangeListener);
+              break;
+          }
+        }
+      });
+  }
+
+  /**
    * Sets the version of this home and writes it to <code>out</code> stream
    * with default writing method. 
    */
@@ -365,6 +423,124 @@
   }
   
   /**
+   * Adds the level <code>listener</code> in parameter to this home.
+   * @since 3.4
+   */
+  public void addLevelsListener(CollectionListener<Level> listener) {
+    this.levelsChangeSupport.addCollectionListener(listener);
+  }
+  
+  /**
+   * Removes the level <code>listener</code> in parameter from this home.
+   * @since 3.4
+   */
+  public void removeLevelsListener(CollectionListener<Level> listener) {
+    this.levelsChangeSupport.removeCollectionListener(listener);
+  } 
+
+  /**
+   * Returns an unmodifiable collection of the levels of this home.
+   * @since 3.4
+   */
+  public List<Level> getLevels() {
+    return Collections.unmodifiableList(this.levels);
+  }
+
+  /**
+   * Adds the given <code>level</code> to the list of levels of this home.
+   * Once the <code>level</code> is added, level listeners added to this home will receive a
+   * {@link CollectionListener#collectionChanged(CollectionEvent) collectionChanged}
+   * notification, with an {@link CollectionEvent#getType() event type} 
+   * equal to {@link CollectionEvent.Type#ADD ADD}. 
+   * @since 3.4
+   */
+  public void addLevel(Level level) {
+    // Make a copy of the list to avoid conflicts in the list returned by getLevels
+    this.levels = new ArrayList<Level>(this.levels);
+    // Search at which index should be inserted the new level
+    int index = Collections.binarySearch(this.levels, level, LEVEL_ELEVATION_COMPARATOR);
+    int levelIndex;
+    if (index >= 0) {
+      levelIndex = index; 
+    } else {
+      levelIndex = -(index + 1);
+    }
+    this.levels.add(levelIndex, level);
+    this.levelsChangeSupport.fireCollectionChanged(level, levelIndex, CollectionEvent.Type.ADD);
+  }
+
+  /**
+   * Removes the given <code>level</code> from the set of levels of this home 
+   * and all the furniture, walls, rooms, dimension lines and labels that belong to this level.
+   * Once the <code>level</code> is removed, level listeners added to this home will receive a
+   * {@link CollectionListener#collectionChanged(CollectionEvent) collectionChanged}
+   * notification, with an {@link CollectionEvent#getType() event type} 
+   * equal to {@link CollectionEvent.Type#DELETE DELETE}.
+   * @since 3.4
+   */
+  public void deleteLevel(Level level) {
+    int index = this.levels.indexOf(level);
+    if (index != -1) {
+      for (HomePieceOfFurniture piece : this.furniture) {
+        if (piece.getLevel() == level) {
+          deletePieceOfFurniture(piece);
+        }
+      }
+      for (Room room : this.rooms) {
+        if (room.getLevel() == level) {
+          deleteRoom(room);
+        }
+      }
+      for (Wall wall : this.walls) {
+        if (wall.getLevel() == level) {
+          deleteWall(wall);
+        }
+      }
+      for (DimensionLine dimensionLine : this.dimensionLines) {
+        if (dimensionLine.getLevel() == level) {
+          deleteDimensionLine(dimensionLine);
+        }
+      }
+      for (Label label : this.labels) {
+        if (label.getLevel() == level) {
+          deleteLabel(label);
+        }
+      }
+      if (this.selectedLevel == level) {
+        if (this.levels.size() == 1) {
+          setSelectedLevel(null);
+        } else {
+          setSelectedLevel(this.levels.get(index >= 1 ? index - 1 : index + 1));
+        }
+      }
+      // Make a copy of the list to avoid conflicts in the list returned by getLevels
+      this.levels = new ArrayList<Level>(this.levels);
+      this.levels.remove(index);
+      this.levelsChangeSupport.fireCollectionChanged(level, index, CollectionEvent.Type.DELETE);
+    }
+  }
+  
+  /**
+   * Returns the selected level in home or <code>null</code> if home has no level.
+   * @since 3.4
+   */
+  public Level getSelectedLevel() {
+    return this.selectedLevel;
+  }
+  
+  /**
+   * Sets the selected level in home and notifies listeners of the change.
+   * @since 3.4
+   */
+  public void setSelectedLevel(Level selectedLevel) {
+    if (selectedLevel != this.selectedLevel) {
+      Level oldSelectedLevel = this.selectedLevel;
+      this.selectedLevel = selectedLevel;
+      this.propertyChangeSupport.firePropertyChange(Property.SELECTED_LEVEL.name(), oldSelectedLevel, selectedLevel);
+    }
+  }
+  
+  /**
    * Adds the furniture <code>listener</code> in parameter to this home.
    */
   public void addFurnitureListener(CollectionListener<HomePieceOfFurniture> listener) {
@@ -405,6 +581,7 @@
   public void addPieceOfFurniture(HomePieceOfFurniture piece, int index) {
     // Make a copy of the list to avoid conflicts in the list returned by getFurniture
     this.furniture = new ArrayList<HomePieceOfFurniture>(this.furniture);
+    piece.setLevel(this.selectedLevel);
     this.furniture.add(index, piece);
     this.furnitureChangeSupport.fireCollectionChanged(piece, index, CollectionEvent.Type.ADD);
   }
@@ -420,6 +597,7 @@
     deselectItem(piece);
     int index = this.furniture.indexOf(piece);
     if (index != -1) {
+      piece.setLevel(null);
       // Make a copy of the list to avoid conflicts in the list returned by getFurniture
       this.furniture = new ArrayList<HomePieceOfFurniture>(this.furniture);
       this.furniture.remove(index);
@@ -480,66 +658,6 @@
   }
 
   /**
-   * Adds the wall <code>listener</code> in parameter to this home.
-   */
-  public void addWallsListener(CollectionListener<Wall> listener) {
-    this.wallsChangeSupport.addCollectionListener(listener);
-  }
-  
-  /**
-   * Removes the wall <code>listener</code> in parameter from this home.
-   */
-  public void removeWallsListener(CollectionListener<Wall> listener) {
-    this.wallsChangeSupport.removeCollectionListener(listener);
-  } 
-
-  /**
-   * Returns an unmodifiable collection of the walls of this home.
-   */
-  public Collection<Wall> getWalls() {
-    return Collections.unmodifiableCollection(this.walls);
-  }
-
-  /**
-   * Adds the given <code>wall</code> to the set of walls of this home.
-   * Once the <code>wall</code> is added, wall listeners added to this home will receive a
-   * {@link CollectionListener#collectionChanged(CollectionEvent) collectionChanged}
-   * notification, with an {@link CollectionEvent#getType() event type} 
-   * equal to {@link CollectionEvent.Type#ADD ADD}. 
-   */
-  public void addWall(Wall wall) {
-    // Make a copy of the list to avoid conflicts in the list returned by getWalls
-    this.walls = new ArrayList<Wall>(this.walls);
-    this.walls.add(wall);
-    this.wallsChangeSupport.fireCollectionChanged(wall, CollectionEvent.Type.ADD);
-  }
-
-  /**
-   * Removes the given <code>wall</code> from the set of walls of this home.
-   * Once the <code>wall</code> is removed, wall listeners added to this home will receive a
-   * {@link CollectionListener#collectionChanged(CollectionEvent) collectionChanged}
-   * notification, with an {@link CollectionEvent#getType() event type} 
-   * equal to {@link CollectionEvent.Type#DELETE DELETE}.
-   * If any wall is attached to <code>wall</code> they will be detached from it.
-   */
-  public void deleteWall(Wall wall) {
-    //  Ensure selectedItems don't keep a reference to wall
-    deselectItem(wall);
-    // Detach any other wall attached to wall
-    for (Wall otherWall : getWalls()) {
-      if (wall.equals(otherWall.getWallAtStart())) {
-        otherWall.setWallAtStart(null);
-      } else if (wall.equals(otherWall.getWallAtEnd())) {
-        otherWall.setWallAtEnd(null);
-      }
-    }
-    // Make a copy of the list to avoid conflicts in the list returned by getWalls
-    this.walls = new ArrayList<Wall>(this.walls);
-    this.walls.remove(wall);
-    this.wallsChangeSupport.fireCollectionChanged(wall, CollectionEvent.Type.DELETE);
-  }
-
-  /**
    * Adds the room <code>listener</code> in parameter to this home.
    */
   public void addRoomsListener(CollectionListener<Room> listener) {
@@ -582,6 +700,7 @@
     // Make a copy of the list to avoid conflicts in the list returned by getRooms
     this.rooms = new ArrayList<Room>(this.rooms);
     this.rooms.add(index, room);
+    room.setLevel(this.selectedLevel);
     this.roomsChangeSupport.fireCollectionChanged(room, index, CollectionEvent.Type.ADD);
   }
 
@@ -597,6 +716,7 @@
     deselectItem(room);
     int index = this.rooms.indexOf(room);
     if (index != -1) {
+      room.setLevel(null);
       // Make a copy of the list to avoid conflicts in the list returned by getRooms
       this.rooms = new ArrayList<Room>(this.rooms);
       this.rooms.remove(index);
@@ -605,6 +725,68 @@
   }
 
   /**
+   * Adds the wall <code>listener</code> in parameter to this home.
+   */
+  public void addWallsListener(CollectionListener<Wall> listener) {
+    this.wallsChangeSupport.addCollectionListener(listener);
+  }
+  
+  /**
+   * Removes the wall <code>listener</code> in parameter from this home.
+   */
+  public void removeWallsListener(CollectionListener<Wall> listener) {
+    this.wallsChangeSupport.removeCollectionListener(listener);
+  } 
+
+  /**
+   * Returns an unmodifiable collection of the walls of this home.
+   */
+  public Collection<Wall> getWalls() {
+    return Collections.unmodifiableCollection(this.walls);
+  }
+
+  /**
+   * Adds the given <code>wall</code> to the set of walls of this home.
+   * Once the <code>wall</code> is added, wall listeners added to this home will receive a
+   * {@link CollectionListener#collectionChanged(CollectionEvent) collectionChanged}
+   * notification, with an {@link CollectionEvent#getType() event type} 
+   * equal to {@link CollectionEvent.Type#ADD ADD}. 
+   */
+  public void addWall(Wall wall) {
+    // Make a copy of the list to avoid conflicts in the list returned by getWalls
+    this.walls = new ArrayList<Wall>(this.walls);
+    this.walls.add(wall);
+    wall.setLevel(this.selectedLevel);
+    this.wallsChangeSupport.fireCollectionChanged(wall, CollectionEvent.Type.ADD);
+  }
+
+  /**
+   * Removes the given <code>wall</code> from the set of walls of this home.
+   * Once the <code>wall</code> is removed, wall listeners added to this home will receive a
+   * {@link CollectionListener#collectionChanged(CollectionEvent) collectionChanged}
+   * notification, with an {@link CollectionEvent#getType() event type} 
+   * equal to {@link CollectionEvent.Type#DELETE DELETE}.
+   * If any wall is attached to <code>wall</code> they will be detached from it.
+   */
+  public void deleteWall(Wall wall) {
+    //  Ensure selectedItems don't keep a reference to wall
+    deselectItem(wall);
+    // Detach any other wall attached to wall
+    for (Wall otherWall : getWalls()) {
+      if (wall.equals(otherWall.getWallAtStart())) {
+        otherWall.setWallAtStart(null);
+      } else if (wall.equals(otherWall.getWallAtEnd())) {
+        otherWall.setWallAtEnd(null);
+      }
+    }
+    wall.setLevel(null);
+    // Make a copy of the list to avoid conflicts in the list returned by getWalls
+    this.walls = new ArrayList<Wall>(this.walls);
+    this.walls.remove(wall);
+    this.wallsChangeSupport.fireCollectionChanged(wall, CollectionEvent.Type.DELETE);
+  }
+
+  /**
    * Adds the dimension line <code>listener</code> in parameter to this home.
    */
   public void addDimensionLinesListener(CollectionListener<DimensionLine> listener) {
@@ -637,6 +819,7 @@
     // Make a copy of the list to avoid conflicts in the list returned by getDimensionLines
     this.dimensionLines = new ArrayList<DimensionLine>(this.dimensionLines);
     this.dimensionLines.add(dimensionLine);
+    dimensionLine.setLevel(this.selectedLevel);
     this.dimensionLinesChangeSupport.fireCollectionChanged(dimensionLine, CollectionEvent.Type.ADD);
   }
 
@@ -651,6 +834,7 @@
   public void deleteDimensionLine(DimensionLine dimensionLine) {
     //  Ensure selectedItems don't keep a reference to dimension line
     deselectItem(dimensionLine);
+    dimensionLine.setLevel(null);
     // Make a copy of the list to avoid conflicts in the list returned by getDimensionLines
     this.dimensionLines = new ArrayList<DimensionLine>(this.dimensionLines);
     this.dimensionLines.remove(dimensionLine);
@@ -690,6 +874,7 @@
     // Make a copy of the list to avoid conflicts in the list returned by getLabels
     this.labels = new ArrayList<Label>(this.labels);
     this.labels.add(label);
+    label.setLevel(this.selectedLevel);
     this.labelsChangeSupport.fireCollectionChanged(label, CollectionEvent.Type.ADD);
   }
 
@@ -703,6 +888,7 @@
   public void deleteLabel(Label label) {
     //  Ensure selectedItems don't keep a reference to label
     deselectItem(label);
+    label.setLevel(null);
     // Make a copy of the list to avoid conflicts in the list returned by getLabels
     this.labels = new ArrayList<Label>(this.labels);
     this.labels.remove(label);
@@ -1056,6 +1242,31 @@
           clone.selectedItems.add(clone.walls.get(i));
         }
       }
+      // Clone levels and set the level of cloned objects 
+      clone.levels = new ArrayList<Level>();
+      if (this.levels.size() > 0) {
+        for (Level level : this.levels) {
+          clone.levels.add(level.clone());
+        }
+        for (int i = 0; i < this.furniture.size(); i++) {
+          clone.furniture.get(i).setLevel(clone.levels.get(this.levels.indexOf(this.furniture.get(i).getLevel())));
+        }
+        for (int i = 0; i < this.rooms.size(); i++) {
+          clone.rooms.get(i).setLevel(clone.levels.get(this.levels.indexOf(this.rooms.get(i).getLevel())));
+        }
+        for (int i = 0; i < this.dimensionLines.size(); i++) {
+          clone.dimensionLines.get(i).setLevel(clone.levels.get(this.levels.indexOf(this.dimensionLines.get(i).getLevel())));
+        }
+        for (int i = 0; i < this.labels.size(); i++) {
+          clone.labels.get(i).setLevel(clone.levels.get(this.levels.indexOf(this.labels.get(i).getLevel())));
+        }
+        for (int i = 0; i < this.walls.size(); i++) {
+          clone.walls.get(i).setLevel(clone.levels.get(this.levels.indexOf(this.walls.get(i).getLevel())));
+        }
+        if (this.selectedLevel != null) {
+          clone.selectedLevel = clone.levels.get(this.levels.indexOf(this.selectedLevel));
+        }
+      }
       // Clone cameras
       clone.observerCamera = this.observerCamera.clone();
       clone.topCamera = this.topCamera.clone();
@@ -1164,6 +1375,14 @@
   }
   
   /**
+   * Returns a sub list of <code>items</code> that contains only levels.
+   * @since 3.4
+   */
+  public static List<Level> getLevelsSubList(List<? extends Selectable> items) {
+    return getSubList(items, Level.class);
+  }
+  
+  /**
    * Returns a sub list of <code>items</code> that contains only instances of <code>subListClass</code>.
    * @since 2.2
    */
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/HomePieceOfFurniture.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/HomePieceOfFurniture.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/HomePieceOfFurniture.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/HomePieceOfFurniture.java	2011-12-21 00:48:52.000000000 +0000
@@ -41,7 +41,7 @@
  * A piece of furniture in {@linkplain Home home}.
  * @author Emmanuel Puybaret
  */
-public class HomePieceOfFurniture implements PieceOfFurniture, Serializable, Selectable {
+public class HomePieceOfFurniture implements PieceOfFurniture, Serializable, Selectable, Elevatable {
   private static final long serialVersionUID = 1L;
   
   private static final double TWICE_PI = 2 * Math.PI;
@@ -51,14 +51,14 @@
    * to a piece of furniture will be notified under a property name equal to the string value of one these properties.
    */
   public enum Property {NAME, NAME_VISIBLE, NAME_X_OFFSET, NAME_Y_OFFSET, NAME_STYLE,
-      DESCRIPTION, WIDTH, DEPTH, HEIGHT, COLOR, TEXTURE, SHININESS, VISIBLE, X, Y, ELEVATION, ANGLE, MODEL_MIRRORED, MOVABLE};
+      DESCRIPTION, WIDTH, DEPTH, HEIGHT, COLOR, TEXTURE, SHININESS, VISIBLE, X, Y, ELEVATION, ANGLE, MODEL_MIRRORED, MOVABLE, LEVEL};
   
   /** 
    * The properties on which home furniture may be sorted.  
    */
   public enum SortableProperty {CATALOG_ID, NAME, WIDTH, DEPTH, HEIGHT, MOVABLE, 
                                 DOOR_OR_WINDOW, COLOR, TEXTURE, VISIBLE, X, Y, ELEVATION, ANGLE,
-                                PRICE, VALUE_ADDED_TAX, VALUE_ADDED_TAX_PERCENTAGE, PRICE_VALUE_ADDED_TAX_INCLUDED};
+                                PRICE, VALUE_ADDED_TAX, VALUE_ADDED_TAX_PERCENTAGE, PRICE_VALUE_ADDED_TAX_INCLUDED, LEVEL};
   private static final Map<SortableProperty, Comparator<HomePieceOfFurniture>> SORTABLE_PROPERTY_COMPARATORS;
   private static final float [][] IDENTITY = new float [][] {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}};
   
@@ -154,6 +154,11 @@
           return HomePieceOfFurniture.compare(piece1.angle, piece2.angle);
         }
       });
+    SORTABLE_PROPERTY_COMPARATORS.put(SortableProperty.LEVEL, new Comparator<HomePieceOfFurniture>() {
+        public int compare(HomePieceOfFurniture piece1, HomePieceOfFurniture piece2) {
+          return HomePieceOfFurniture.compare(piece1.getLevel(), piece2.getLevel());
+        }
+      });
     SORTABLE_PROPERTY_COMPARATORS.put(SortableProperty.PRICE, new Comparator<HomePieceOfFurniture>() {
         public int compare(HomePieceOfFurniture piece1, HomePieceOfFurniture piece2) {
           return HomePieceOfFurniture.compare(piece1.price, piece2.price);
@@ -177,10 +182,7 @@
   }
   
   private static int compare(float value1, float value2) {
-    return value1 < value2 
-               ? -1
-               : (value1 == value2
-                   ? 0 : 1);
+    return Float.compare(value1, value2);
   }
   
   private static int compare(boolean value1, boolean value2) {
@@ -199,6 +201,16 @@
     }
   }
   
+  private static int compare(Level level1, Level level2) {
+    if (level1 == null) {
+      return -1;
+    } else if (level2 == null) {
+      return 1; 
+    } else {
+      return Float.compare(level1.getElevation(), level2.getElevation());
+    }
+  }
+  
   private String                 catalogId;
   private String                 name;
   private boolean                nameVisible;
@@ -219,17 +231,20 @@
   private HomeTexture            texture;
   private Float                  shininess;
   private float [][]             modelRotation;
+  private String                 staircaseCutOutShape;
   private boolean                backFaceShown;
   private boolean                resizable;
   private boolean                deformable;
   private boolean                texturable;
   private BigDecimal             price;
   private BigDecimal             valueAddedTaxPercentage;
+  private String                 currency;
   private boolean                visible;
   private float                  x;
   private float                  y;
   private float                  angle;
   private boolean                modelMirrored;
+  private Level                  level;
 
   private transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
   private transient Shape shapeCache;
@@ -252,12 +267,14 @@
     this.doorOrWindow = piece.isDoorOrWindow();
     this.color = piece.getColor();
     this.modelRotation = piece.getModelRotation();
+    this.staircaseCutOutShape = piece.getStaircaseCutOutShape();
     this.backFaceShown = piece.isBackFaceShown();
     this.resizable = piece.isResizable();
     this.deformable = piece.isDeformable();
     this.texturable = piece.isTexturable();
     this.price = piece.getPrice();
     this.valueAddedTaxPercentage = piece.getValueAddedTaxPercentage();
+    this.currency = piece.getCurrency();
     if (piece instanceof HomePieceOfFurniture) {
       HomePieceOfFurniture homePiece = 
           (HomePieceOfFurniture)piece;
@@ -509,14 +526,27 @@
   }
 
   /**
-   * Returns the elevation of the bottom of this piece of furniture. 
+   * Returns the elevation of the bottom of this piece of furniture on its level. 
    */
   public float getElevation() {
     return this.elevation;
   }
 
   /**
-   * Sets the elevation of this piece of furniture. Once this piece is updated, 
+   * Returns the elevation of the bottom of this piece of furniture 
+   * from the ground according to the elevation of its level.
+   * @since 3.4 
+   */
+  public float getGroundElevation() {
+    if (this.level != null) {
+      return this.elevation + this.level.getElevation();
+    } else {
+      return this.elevation;
+    }
+  }
+
+  /**
+   * Sets the elevation of this piece of furniture on its level. Once this piece is updated, 
    * listeners added to this piece will receive a change notification.
    */
   public void setElevation(float elevation) {
@@ -720,6 +750,15 @@
   }
 
   /**
+   * Returns the price currency, noted with ISO 4217 code, or <code>null</code> 
+   * if it has no price or default currency should be used.
+   * @since 3.4
+   */
+  public String getCurrency() {
+    return this.currency;
+  }
+
+  /**
    * Returns <code>true</code> if this piece of furniture is visible.
    */
   public boolean isVisible() {
@@ -835,12 +874,53 @@
   }
 
   /**
+   * Returns the shape used to cut out upper levels when they intersect with the piece   
+   * like a staircase.
+   * @since 3.4
+   */
+  public String getStaircaseCutOutShape() {
+    return this.staircaseCutOutShape;
+  }
+
+  /**
    * Returns <code>true</code> if the back face of the piece of furniture
    * model should be displayed.
    */
   public boolean isBackFaceShown() {
     return this.backFaceShown;
   }
+
+  /**
+   * Returns the level which this piece belongs to. 
+   * @since 3.4
+   */
+  public Level getLevel() {
+    return this.level;
+  }
+
+  /**
+   * Sets the level of this piece of furniture. Once this piece is updated, 
+   * listeners added to this piece will receive a change notification.
+   * @since 3.4
+   */
+  public void setLevel(Level level) {
+    if (level != this.level) {
+      Level oldLevel = this.level;
+      this.level = level;
+      this.propertyChangeSupport.firePropertyChange(Property.LEVEL.name(), oldLevel, level);
+    }
+  }
+  
+  /**
+   * Returns <code>true</code> if this piece is visible at the given level.
+   * @since 3.4
+   */
+  public boolean isAtLevel(Level level) {
+    return this.level == level 
+        || this.level != null && level != null
+            && this.level.getElevation() < level.getElevation()
+            && this.level.getElevation() + this.elevation + this.height > level.getElevation();
+  }
   
   /**
    * Returns the points of each corner of a piece.
@@ -994,6 +1074,7 @@
     try {
       HomePieceOfFurniture clone = (HomePieceOfFurniture)super.clone();
       clone.propertyChangeSupport = new PropertyChangeSupport(clone);
+      clone.level = null;
       return clone;
     } catch (CloneNotSupportedException ex) {
       throw new IllegalStateException("Super class isn't cloneable"); 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/HomeTexture.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/HomeTexture.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/HomeTexture.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/HomeTexture.java	2011-12-21 00:48:52.000000000 +0000
@@ -32,6 +32,7 @@
   private final Content image;
   private final float width;
   private final float height;
+  private final boolean leftToRightOriented; 
   
   /**
    * Creates a home texture from an existing one.
@@ -42,6 +43,9 @@
     this.image = texture.getImage();
     this.width = texture.getWidth();
     this.height = texture.getHeight();
+    // Texture is left to right oriented when applied on objects seen from front
+    // added to homes with a version 3.4 and higher
+    this.leftToRightOriented = true; 
   }
   
   /**
@@ -73,6 +77,14 @@
   }
 
   /**
+   * Returns <code>true</code> if the objects using this texture should take into account 
+   * the orientation of the texture.
+   */
+  public boolean isLeftToRightOriented() {
+    return this.leftToRightOriented;
+  }
+  
+  /**
    * Returns <code>true</code> if the object in parameter is equal to this texture.
    */
   @Override
@@ -84,7 +96,8 @@
       return texture.name.equals(this.name)
           && texture.image.equals(this.image)
           && texture.width == this.width
-          && texture.height == this.height;
+          && texture.height == this.height
+          && texture.leftToRightOriented == this.leftToRightOriented;
     } else {
       return false;
     }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Label.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Label.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Label.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Label.java	2011-12-21 00:48:52.000000000 +0000
@@ -30,19 +30,20 @@
  * A free label.
  * @author Emmanuel Puybaret
  */
-public class Label implements Selectable, Serializable {
+public class Label implements Selectable, Serializable, Elevatable {
   private static final long serialVersionUID = 1L;
   
   /**
    * The properties of a label that may change. <code>PropertyChangeListener</code>s added 
    * to a label will be notified under a property name equal to the string value of one these properties.
    */
-  public enum Property {TEXT, X, Y, STYLE};
+  public enum Property {TEXT, X, Y, STYLE, LEVEL};
   
   private String    text;
   private float     x;
   private float     y;
   private TextStyle style;
+  private Level     level;
   
   private transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
 
@@ -153,6 +154,35 @@
   }
 
   /**
+   * Returns the level which this label belongs to. 
+   * @since 3.4
+   */
+  public Level getLevel() {
+    return this.level;
+  }
+
+  /**
+   * Sets the level of this label. Once this label is updated, 
+   * listeners added to this label will receive a change notification.
+   * @since 3.4
+   */
+  public void setLevel(Level level) {
+    if (level != this.level) {
+      Level oldLevel = this.level;
+      this.level = level;
+      this.propertyChangeSupport.firePropertyChange(Property.LEVEL.name(), oldLevel, level);
+    }
+  }
+
+  /**
+   * Returns <code>true</code> if this label is at the given level.
+   * @since 3.4
+   */
+  public boolean isAtLevel(Level level) {
+    return this.level == level;
+  }
+  
+  /**
    * Returns the point of this label.
    * @return an array of the (x,y) coordinates of this label.
    */
@@ -196,6 +226,7 @@
     try {
       Label clone = (Label)super.clone();
       clone.propertyChangeSupport = new PropertyChangeSupport(clone);
+      clone.level = null;
       return clone;
     } catch (CloneNotSupportedException ex) {
       throw new IllegalStateException("Super class isn't cloneable"); 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/LengthUnit.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/LengthUnit.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/LengthUnit.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/LengthUnit.java	2011-12-21 00:48:52.000000000 +0000
@@ -90,6 +90,11 @@
     }
     
     @Override
+    public float getMaximumLength() {
+      return 100000f;
+    }
+
+    @Override
     public float centimeterToUnit(float length) {
       return length;
     }
@@ -159,6 +164,11 @@
     }
     
     @Override
+    public float getMaximumLength() {
+      return 100000f;
+    }
+
+    @Override
     public float centimeterToUnit(float length) {
       return length * 10;
     }
@@ -228,6 +238,11 @@
     }
 
     @Override
+    public float getMaximumLength() {
+      return 100000f;
+    }
+
+    @Override
     public float centimeterToUnit(float length) {
       return length / 100;
     }
@@ -451,7 +466,12 @@
       } else if  (maxDelta > 0.25f) {
         precision = 0.25f;
       }
-      return inchToCentimeter(Math.round(centimeterToInch(length) / precision) * precision);
+      float magnetizedLength = inchToCentimeter(Math.round(centimeterToInch(length) / precision) * precision);
+      if (magnetizedLength == 0 && length > 0) {
+        return length;
+      } else {
+        return magnetizedLength;
+      }
     }
 
     @Override
@@ -460,6 +480,11 @@
     }
 
     @Override
+    public float getMaximumLength() {
+      return LengthUnit.inchToCentimeter(99974.4f); // 3280 ft
+    }
+
+    @Override
     public float centimeterToUnit(float length) {
       return centimeterToInch(length);
     }
@@ -593,7 +618,12 @@
     } else if  (maxDelta > 0.5f) {
       precision = 0.5f;
     } 
-    return Math.round(length / precision) * precision;
+    float magnetizedLength = Math.round(length / precision) * precision;
+    if (magnetizedLength == 0 && length > 0) {
+      return length;
+    } else {
+      return magnetizedLength;
+    }
   }
 
   /**
@@ -602,6 +632,20 @@
   public abstract float getMinimumLength();
   
   /**
+   * Returns the maximum value for length in centimeter.
+   * @since 3.4
+   */
+  public abstract float getMaximumLength();
+  
+  /**
+   * Returns the maximum value for elevation in centimeter.
+   * @since 3.4
+   */
+  public float getMaximumElevation() {
+    return getMaximumLength() / 10;
+  }
+  
+  /**
    * Returns the <code>length</code> given in centimeters converted 
    * to a value expressed in this unit.
    * @since 2.0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Level.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Level.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Level.java	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Level.java	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,217 @@
+/*
+ * Level.java 22 oct. 2011
+ *
+ * Sweet Home 3D, Copyright (c) 2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package com.eteks.sweethome3d.model;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+
+/**
+ * A level in a home.
+ * @author Emmanuel Puybaret
+ * @since 3.4
+ */
+public class Level implements Serializable, Cloneable {
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * The properties of a level that may change. <code>PropertyChangeListener</code>s added 
+   * to a level will be notified under a property name equal to the string value of one these properties.
+   */
+  public enum Property {NAME, ELEVATION, HEIGHT, FLOOR_THICKNESS, BACKGROUND_IMAGE, VISIBLE};
+      
+  private String           name;
+  private float            elevation;
+  private float            floorThickness;
+  private float            height;
+  private BackgroundImage  backgroundImage;
+  private boolean          visible;
+
+  private transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+
+
+  /**
+   * Creates a home level from an existing level.
+   * @param name  the name of the level
+   * @param elevation the elevation of the bottom of the level
+   * @param floorThickness the floor thickness of the level
+   * @param height the height of the level 
+   */
+  public Level(String name, float elevation, float floorThickness, float height) {
+    this.name = name;
+    this.elevation = elevation;
+    this.floorThickness = floorThickness;
+    this.height = height;
+    this.visible = true;
+  }
+
+  /**
+   * Initializes new level fields to their default values 
+   * and reads level from <code>in</code> stream with default reading method.
+   */
+  private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    this.propertyChangeSupport = new PropertyChangeSupport(this);
+    this.visible = true;
+    in.defaultReadObject();
+  }
+
+  /**
+   * Adds the property change <code>listener</code> in parameter to this level.
+   */
+  public void addPropertyChangeListener(PropertyChangeListener listener) {
+    this.propertyChangeSupport.addPropertyChangeListener(listener);
+  }
+
+  /**
+   * Removes the property change <code>listener</code> in parameter from this level.
+   */
+  public void removePropertyChangeListener(PropertyChangeListener listener) {
+    this.propertyChangeSupport.removePropertyChangeListener(listener);
+  }
+
+  /**
+   * Returns the name of this level.
+   */
+  public String getName() {
+    return this.name;
+  }
+
+  /**
+   * Sets the name of this level. Once this level 
+   * is updated, listeners added to this level will receive a change notification.
+   */
+  public void setName(String name) {
+    if (name != this.name
+        || (name != null && !name.equals(this.name))) {
+      String oldName = this.name;
+      this.name = name;
+      this.propertyChangeSupport.firePropertyChange(Property.NAME.name(), oldName, name);
+    }
+  }
+  
+  /**
+   * Returns the elevation of the bottom of this level. 
+   */
+  public float getElevation() {
+    return this.elevation;
+  }
+
+  /**
+   * Sets the elevation of this level. Once this level is updated, 
+   * listeners added to this level will receive a change notification.
+   */
+  public void setElevation(float elevation) {
+    if (elevation != this.elevation) {
+      float oldElevation = this.elevation;
+      this.elevation = elevation;
+      this.propertyChangeSupport.firePropertyChange(Property.ELEVATION.name(), oldElevation, elevation);
+    }
+  }
+
+  /**
+   * Returns the floor thickness of this level. 
+   */
+  public float getFloorThickness() {
+    return this.floorThickness;
+  }
+
+  /**
+   * Sets the floor thickness of this level. Once this level is updated, 
+   * listeners added to this level will receive a change notification.
+   */
+  public void setFloorThickness(float floorThickness) {
+    if (floorThickness != this.floorThickness) {
+      float oldFloorThickness = this.floorThickness;
+      this.floorThickness = floorThickness;
+      this.propertyChangeSupport.firePropertyChange(Property.FLOOR_THICKNESS.name(), oldFloorThickness, floorThickness);
+    }
+  }
+
+  /**
+   * Returns the height of this level.
+   */
+  public float getHeight() {
+    return this.height;
+  }
+
+  /**
+   * Sets the height of this level. Once this level is updated, 
+   * listeners added to this level will receive a change notification.
+   */
+  public void setHeight(float height) {
+    if (height != this.height) {
+      float oldHeight = this.height;
+      this.height = height;
+      this.propertyChangeSupport.firePropertyChange(Property.HEIGHT.name(), oldHeight, height);
+    }
+  }
+
+  /**
+   * Returns the plan background image of this level.
+   */
+  public BackgroundImage getBackgroundImage() {
+    return this.backgroundImage;
+  }
+
+  /**
+   * Sets the plan background image of this level and fires a <code>PropertyChangeEvent</code>.
+   */
+  public void setBackgroundImage(BackgroundImage backgroundImage) {
+    if (backgroundImage != this.backgroundImage) {
+      BackgroundImage oldBackgroundImage = this.backgroundImage;
+      this.backgroundImage = backgroundImage;
+      this.propertyChangeSupport.firePropertyChange(Property.BACKGROUND_IMAGE.name(), oldBackgroundImage, backgroundImage);
+    }
+  }
+
+  /**
+   * Returns <code>true</code> if this level is visible.
+   */
+  public boolean isVisible() {
+    return this.visible;
+  }
+  
+  /**
+   * Sets whether this level is visible or not. Once this level is updated, 
+   * listeners added to this level will receive a change notification.
+   */
+  public void setVisible(boolean visible) {
+    if (visible != this.visible) {
+      this.visible = visible;
+      this.propertyChangeSupport.firePropertyChange(Property.VISIBLE.name(), !visible, visible);
+    }
+  }
+
+  /**
+   * Returns a clone of this level.
+   */
+  @Override
+  public Level clone() {
+    try {
+      Level clone = (Level)super.clone();
+      clone.propertyChangeSupport = new PropertyChangeSupport(clone);
+      return clone;
+    } catch (CloneNotSupportedException ex) {
+      throw new IllegalStateException("Super class isn't cloneable"); 
+    }
+  }
+}
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/ObserverCamera.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/ObserverCamera.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/ObserverCamera.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/ObserverCamera.java	2011-12-21 00:48:52.000000000 +0000
@@ -25,17 +25,32 @@
 import java.awt.geom.GeneralPath;
 import java.awt.geom.PathIterator;
 import java.awt.geom.Rectangle2D;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.io.IOException;
+import java.io.ObjectInputStream;
 
 /**
  * Observer camera characteristics in home.
  * @author Emmanuel Puybaret
  */
 public class ObserverCamera extends Camera implements Selectable {
+  /**
+   * The additional properties of an observer camera that may change. <code>PropertyChangeListener</code>s added 
+   * to a camera will be notified under a property name equal to the string value of one these properties.
+   * @since 3.4
+   */
+  public enum Property {WIDTH, DEPTH, HEIGHT}
+  
   private static final long serialVersionUID = 1L;
 
+  private boolean fixedSize;
+  
   private transient Shape shapeCache;
   private transient Shape rectangleShapeCache;
-  
+
+  private transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+
   /**
    * Creates a camera at given location and angle.
    */
@@ -44,6 +59,62 @@
   }
 
   /**
+   * Initializes new camera transient fields  
+   * and reads its properties from <code>in</code> stream with default reading method.
+   */
+  private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    this.propertyChangeSupport = new PropertyChangeSupport(this);
+    in.defaultReadObject();
+  }
+
+  /**
+   * Adds the property change <code>listener</code> in parameter to this camera.
+   * @since 3.4
+   */
+  @Override
+  public void addPropertyChangeListener(PropertyChangeListener listener) {
+    this.propertyChangeSupport.addPropertyChangeListener(listener);
+    super.addPropertyChangeListener(listener);
+  }
+
+  /**
+   * Removes the property change <code>listener</code> in parameter from this camera.
+   * @since 3.4
+   */
+  @Override
+  public void removePropertyChangeListener(PropertyChangeListener listener) {
+    this.propertyChangeSupport.removePropertyChangeListener(listener);
+    super.removePropertyChangeListener(listener);
+  }
+
+  /**
+   * Sets whether camera size should depends on its elevation and will notify listeners
+   * bound to size properties of the size change.
+   * @since 3.4
+   */
+  public void setFixedSize(boolean fixedSize) {
+    if (this.fixedSize != fixedSize) {
+      float oldWidth = getWidth();
+      float oldDepth = getDepth();
+      float oldHeight = getHeight();
+      this.fixedSize = fixedSize;
+      this.shapeCache = null;
+      this.rectangleShapeCache = null;
+      this.propertyChangeSupport.firePropertyChange(Property.WIDTH.name(), oldWidth, getWidth());
+      this.propertyChangeSupport.firePropertyChange(Property.DEPTH.name(), oldDepth, getDepth());
+      this.propertyChangeSupport.firePropertyChange(Property.HEIGHT.name(), oldHeight, getHeight());
+    }
+  }
+  
+  /**
+   * Returns <code>true</code> if the camera size doesn't change according to its elevation.
+   * @since 3.4
+   */
+  public boolean isFixedSize() {
+    return this.fixedSize;
+  }
+  
+  /**
    * Sets the yaw angle in radians of this camera.
    */
   public void setYaw(float yaw) {
@@ -74,9 +145,15 @@
    * Sets the elevation of this camera.
    */
   public void setZ(float z) {
+    float oldWidth = getWidth();
+    float oldDepth = getDepth();
+    float oldHeight = getHeight();
     super.setZ(z);
     this.shapeCache = null;
     this.rectangleShapeCache = null;
+    this.propertyChangeSupport.firePropertyChange(Property.WIDTH.name(), oldWidth, getWidth());
+    this.propertyChangeSupport.firePropertyChange(Property.DEPTH.name(), oldDepth, getDepth());
+    this.propertyChangeSupport.firePropertyChange(Property.HEIGHT.name(), oldHeight, getHeight());
   }
   
   /**
@@ -84,9 +161,13 @@
    * human proportions with an eyes elevation at z. 
    */
   public float getWidth() {
-    // Adult width is 4 times the distance between head and eyes location
-    float width = getZ() * 4 / 14;
-    return Math.min(Math.max(width, 20), 62.5f);
+    if (this.fixedSize) {
+      return 46.6f;
+    } else {
+      // Adult width is 4 times the distance between head and eyes location    
+      float width = getZ() * 4 / 14;
+      return Math.min(Math.max(width, 20), 62.5f);
+    }
   }
   
   /**
@@ -94,9 +175,13 @@
    * human proportions with an eyes elevation at z. 
    */
   public float getDepth() {
-    // Adult depth is equal to the 2 / 5 of its width 
-    float depth = getZ() * 8 / 70;
-    return Math.min(Math.max(depth, 8), 25);
+    if (this.fixedSize) {
+      return 18.6f;
+    } else {
+      // Adult depth is equal to the 2 / 5 of its width 
+      float depth = getZ() * 8 / 70;
+      return Math.min(Math.max(depth, 8), 25);
+    }
   }
   
   /**
@@ -104,8 +189,12 @@
    * human proportions with an eyes elevation at z. 
    */
   public float getHeight() {
-    // Eyes are 14 / 15 of an adult height
-    return getZ() * 15 / 14;
+    if (this.fixedSize) {
+      return 175f;
+    } else {
+      // Eyes are 14 / 15 of an adult height
+      return getZ() * 15 / 14;
+    }
   }
   
   /**
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/PieceOfFurniture.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/PieceOfFurniture.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/PieceOfFurniture.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/PieceOfFurniture.java	2011-12-21 00:48:52.000000000 +0000
@@ -92,6 +92,13 @@
   public float [][] getModelRotation();
   
   /**
+   * Returns the shape used to cut out upper levels when they intersect with the piece   
+   * like a staircase.
+   * @since 3.4
+   */
+  public String getStaircaseCutOutShape();
+  
+  /**
    * Returns <code>true</code> if the back face of the piece of furniture
    * model should be displayed.
    */
@@ -129,4 +136,11 @@
    * Returns the Value Added Tax percentage applied to the price of this piece of furniture. 
    */
   public abstract BigDecimal getValueAddedTaxPercentage();
+  
+  /**
+   * Returns the price currency, noted with ISO 4217 code, or <code>null</code> 
+   * if it has no price or default currency should be used.
+   * @since 3.4
+   */
+  public abstract String getCurrency();
 }
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Room.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Room.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Room.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Room.java	2011-12-21 00:48:52.000000000 +0000
@@ -37,7 +37,7 @@
  * A room or a polygon in a home plan. 
  * @author Emmanuel Puybaret
  */
-public class Room implements Serializable, Selectable {
+public class Room implements Serializable, Selectable, Elevatable {
   /**
    * The properties of a room that may change. <code>PropertyChangeListener</code>s added 
    * to a room will be notified under a property name equal to the string value of one these properties.
@@ -45,7 +45,7 @@
   public enum Property {NAME, NAME_X_OFFSET, NAME_Y_OFFSET, NAME_STYLE,
       POINTS, AREA_VISIBLE, AREA_X_OFFSET, AREA_Y_OFFSET, AREA_STYLE,
       FLOOR_COLOR, FLOOR_TEXTURE, FLOOR_VISIBLE, FLOOR_SHININESS,
-      CEILING_COLOR, CEILING_TEXTURE, CEILING_VISIBLE, CEILING_SHININESS}
+      CEILING_COLOR, CEILING_TEXTURE, CEILING_VISIBLE, CEILING_SHININESS, LEVEL}
   
   private static final long serialVersionUID = 1L;
   
@@ -66,6 +66,7 @@
   private Integer     ceilingColor;
   private HomeTexture ceilingTexture;
   private float       ceilingShininess;
+  private Level       level;
   
   private transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
   private transient Shape shapeCache;
@@ -75,6 +76,9 @@
    * Creates a room from its name and the given coordinates.
    */
   public Room(float [][] points) {
+    if (points.length <= 1) {
+      throw new IllegalStateException("Room points must containt at least one point");
+    }
     this.points = deepCopy(points);
     this.areaVisible = true;
     this.nameYOffset = -40f;
@@ -288,6 +292,8 @@
   public void removePoint(int index) {
     if (index < 0 || index >= this.points.length) {
       throw new IndexOutOfBoundsException("Invalid index " + index);
+    } else if (this.points.length <= 1) {
+      throw new IllegalStateException("Room points must containt at least one point");
     }
     
     float [][] newPoints = new float [this.points.length - 1][];
@@ -571,6 +577,35 @@
   }
 
   /**
+   * Returns the level which this room belongs to. 
+   * @since 3.4
+   */
+  public Level getLevel() {
+    return this.level;
+  }
+
+  /**
+   * Sets the level of this room. Once this room is updated, 
+   * listeners added to this room will receive a change notification.
+   * @since 3.4
+   */
+  public void setLevel(Level level) {
+    if (level != this.level) {
+      Level oldLevel = this.level;
+      this.level = level;
+      this.propertyChangeSupport.firePropertyChange(Property.LEVEL.name(), oldLevel, level);
+    }
+  }
+
+  /**
+   * Returns <code>true</code> if this room is at the given level.
+   * @since 3.4
+   */
+  public boolean isAtLevel(Level level) {
+    return this.level == level;
+  }
+  
+  /**
    * Returns the area of this room.
    */
   public float getArea() {
@@ -738,6 +773,7 @@
     try {
       Room clone = (Room)super.clone();
       clone.propertyChangeSupport = new PropertyChangeSupport(clone);
+      clone.level = null;
       return clone;
     } catch (CloneNotSupportedException ex) {
       throw new IllegalStateException("Super class isn't cloneable"); 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/TextureImage.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/TextureImage.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/TextureImage.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/TextureImage.java	2011-12-21 00:48:52.000000000 +0000
@@ -19,11 +19,13 @@
  */
 package com.eteks.sweethome3d.model;
 
+import java.io.Serializable;
+
 /**
  * An image used as texture.
  * @author Emmanuel Puybaret
  */
-public interface TextureImage {
+public interface TextureImage extends Serializable {
   /**
    * Returns the name of this texture image.
    */
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/UserPreferences.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/UserPreferences.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/UserPreferences.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/UserPreferences.java	2011-12-21 00:48:52.000000000 +0000
@@ -23,6 +23,7 @@
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
 import java.io.InputStream;
+import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -32,6 +33,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
+import java.util.PropertyPermission;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 
@@ -44,12 +46,13 @@
    * The properties of user preferences that may change. <code>PropertyChangeListener</code>s added 
    * to user preferences will be notified under a property name equal to the string value of one these properties.
    */
-  public enum Property {LANGUAGE, UNIT, MAGNETISM_ENABLED, RULERS_VISIBLE, GRID_VISIBLE, 
+  public enum Property {LANGUAGE, SUPPORTED_LANGUAGES, UNIT, MAGNETISM_ENABLED, RULERS_VISIBLE, GRID_VISIBLE, 
                         FURNITURE_VIEWED_FROM_TOP, ROOM_FLOOR_COLORED_OR_TEXTURED, WALL_PATTERN,    
-                        NEW_WALL_HEIGHT, NEW_WALL_THICKNESS, RECENT_HOMES, IGNORED_ACTION_TIP,
-                        FURNITURE_CATALOG_VIEWED_IN_TREE, NAVIGATION_PANEL_VISIBLE, AUTO_SAVE_DELAY_FOR_RECOVERY}
+                        NEW_WALL_HEIGHT, NEW_WALL_THICKNESS, NEW_FLOOR_THICKNESS, RECENT_HOMES, IGNORED_ACTION_TIP,
+                        FURNITURE_CATALOG_VIEWED_IN_TREE, NAVIGATION_PANEL_VISIBLE, 
+                        AUTO_SAVE_DELAY_FOR_RECOVERY, AUTO_COMPLETION_STRINGS}
   
-  private static final String [] SUPPORTED_LANGUAGES; 
+  private static final String [] DEFAULT_SUPPORTED_LANGUAGES; 
   private static final List<ClassLoader> DEFAULT_CLASS_LOADER = 
       Arrays.asList(new ClassLoader [] {UserPreferences.class.getClassLoader()});
 
@@ -58,7 +61,7 @@
 
   static {
     ResourceBundle resource = ResourceBundle.getBundle(UserPreferences.class.getName());
-    SUPPORTED_LANGUAGES = resource.getString("supportedLanguages").split("\\s");
+    DEFAULT_SUPPORTED_LANGUAGES = resource.getString("supportedLanguages").split("\\s");
   }
   
   private final PropertyChangeSupport          propertyChangeSupport;
@@ -69,6 +72,7 @@
   private TexturesCatalog  texturesCatalog;
   private PatternsCatalog  patternsCatalog;
   private final String     defaultCountry;
+  private String []        supportedLanguages;
   private String           language;
   private String           currency;
   private LengthUnit       unit;
@@ -82,20 +86,28 @@
   private TextureImage     wallPattern;
   private float            newWallThickness;
   private float            newWallHeight;
+  private float            newFloorThickness;
   private List<String>     recentHomes;
   private int              autoSaveDelayForRecovery;
+  private Map<String, List<String>>  autoCompletionStrings;
 
+  /**
+   * Creates user preferences.</br> 
+   * Caution: during creation, the default locale will be updated if it doesn't belong to the supported ones. 
+   */
   public UserPreferences() {
     this.propertyChangeSupport = new PropertyChangeSupport(this);
     this.classResourceBundles = new HashMap<Class<?>, ResourceBundle>();
     this.resourceBundles = new HashMap<String, ResourceBundle>();
+    this.autoCompletionStrings = new HashMap<String, List<String>>();
 
+    this.supportedLanguages = DEFAULT_SUPPORTED_LANGUAGES;
     this.defaultCountry = Locale.getDefault().getCountry();    
     String defaultLanguage = Locale.getDefault().getLanguage();
     // Find closest language among supported languages in Sweet Home 3D
     // For example, use simplified Chinese even for Chinese users (zh_?) not from China (zh_CN)
     // unless their exact locale is supported as in Taiwan (zh_TW)
-    for (String supportedLanguage : SUPPORTED_LANGUAGES) {
+    for (String supportedLanguage : this.supportedLanguages) {
       if (supportedLanguage.equals(defaultLanguage + "_" + this.defaultCountry)) {
         this.language = supportedLanguage;
         break; // Found the exact supported language
@@ -106,7 +118,7 @@
     }
     // If no language was found, let's use English by default
     if (this.language == null) {
-      this.language = "en";
+      this.language = Locale.ENGLISH.getLanguage();
     }
     updateDefaultLocale();
   }
@@ -115,12 +127,17 @@
    * Updates default locale from preferences language.
    */
   private void updateDefaultLocale() {
-    int underscoreIndex = this.language.indexOf("_");
-    if (underscoreIndex != -1) {
-      Locale.setDefault(new Locale(this.language.substring(0, underscoreIndex), 
-          this.language.substring(underscoreIndex + 1)));
-    } else {
-      Locale.setDefault(new Locale(this.language, this.defaultCountry));
+    try {
+      int underscoreIndex = this.language.indexOf("_");
+      if (underscoreIndex != -1) {
+        Locale.setDefault(new Locale(this.language.substring(0, underscoreIndex), 
+            this.language.substring(underscoreIndex + 1)));
+      } else {
+        Locale.setDefault(new Locale(this.language, this.defaultCountry));
+      }
+    } catch (AccessControlException ex) {
+      // Let's keep default language even if it's not supported
+      this.language = Locale.getDefault().getLanguage();
     }
   }
 
@@ -220,13 +237,14 @@
   }
 
   /**
-   * Sets the preferred language to display information, changes current default locale accordingly 
-   * and notifies listeners of this change.
+   * If {@linkplain #isLanguageEditable() language can be changed}, sets the preferred language to display information, 
+   * changes current default locale accordingly and notifies listeners of this change.
    * @param language an ISO 639 code that may be followed by an underscore and an ISO 3166 code
    *            (for example fr, de, it, en_US, zh_CN). 
    */
   public void setLanguage(String language) {
-    if (!language.equals(this.language)) {
+    if (!language.equals(this.language)
+        && isLanguageEditable()) {
       String oldLanguage = this.language;
       this.language = language;      
       updateDefaultLocale();
@@ -238,10 +256,48 @@
   }
 
   /**
-   * Returns the array of available languages in Sweet Home 3D.
+   * Returns <code>true</code> if the language in preferences can be set.
+   * @return <code>true</code> except if <code>user.language</code> System property isn't writable.
+   * @since 3.4 
+   */
+  public boolean isLanguageEditable() {
+    try {
+      SecurityManager securityManager = System.getSecurityManager();
+      if (securityManager != null) {
+        securityManager.checkPermission(new PropertyPermission("user.language", "write"));
+      }
+      return true;
+    } catch (AccessControlException ex) {
+      return false;
+    }
+  }
+  
+  /**
+   * Returns the array of default available languages in Sweet Home 3D.
+   */
+  public String [] getDefaultSupportedLanguages() {
+    return DEFAULT_SUPPORTED_LANGUAGES.clone();
+  }
+
+  /**
+   * Returns the array of available languages in Sweet Home 3D including languages in libraries.
+   * @since 3.4
    */
   public String [] getSupportedLanguages() {
-    return SUPPORTED_LANGUAGES.clone();
+    return this.supportedLanguages.clone();
+  }
+
+  /**
+   * Returns the array of available languages in Sweet Home 3D.
+   * @since 3.4
+   */
+  protected void setSupportedLanguages(String [] supportedLanguages) {
+    if (!Arrays.deepEquals(this.supportedLanguages, supportedLanguages)) {
+      String [] oldSupportedLanguages = this.supportedLanguages;
+      this.supportedLanguages = supportedLanguages.clone();
+      this.propertyChangeSupport.firePropertyChange(Property.SUPPORTED_LANGUAGES.name(), 
+          oldSupportedLanguages, supportedLanguages);
+    }
   }
 
   /**
@@ -339,10 +395,13 @@
                 setParent(parentResourceBundle);
               }
             };
+            break;
+          } catch (IllegalArgumentException ex) {
+            // May happen if the file contains some wrongly encoded characters
+            ex.printStackTrace();
           } finally {
             in.close();
           }
-          break;
         }
       }
     }
@@ -380,7 +439,7 @@
   }
   
   /**
-   * Returns the currency in use, noted with ISO 4217 code, or <code>null</code> 
+   * Returns the default currency in use, noted with ISO 4217 code, or <code>null</code> 
    * if prices aren't used in application.
    */
   public String getCurrency() {
@@ -388,7 +447,7 @@
   }
 
   /**
-   * Sets currency in use.
+   * Sets the default currency in use.
    */
   protected void setCurrency(String currency) {
     this.currency = currency;
@@ -549,7 +608,7 @@
   }
 
   /**
-   * Returns the wall pattern in plan.
+   * Returns the wall pattern in plan used by default.
    * @since 2.0
    */
   public TextureImage getWallPattern() {
@@ -557,7 +616,7 @@
   }
   
   /**
-   * Sets how walls should be displayed in plan, and notifies
+   * Sets how walls should be displayed in plan by default, and notifies
    * listeners of this change.
    * @since 2.0 
    */
@@ -611,6 +670,28 @@
   }
 
   /**
+   * Returns default thickness of the floor of new levels in home. 
+   * @since 3.4
+   */
+  public float getNewFloorThickness() {
+    return this.newFloorThickness;
+  }
+
+  /**
+   * Sets default thickness of the floor of new levels in home, and notifies
+   * listeners of this change.  
+   * @since 3.4
+   */
+  public void setNewFloorThickness(float newFloorThickness) {
+    if (this.newFloorThickness != newFloorThickness) {
+      float oldDefaultThickness = this.newFloorThickness;
+      this.newFloorThickness = newFloorThickness;
+      this.propertyChangeSupport.firePropertyChange(Property.NEW_FLOOR_THICKNESS.name(), 
+          oldDefaultThickness, newFloorThickness);
+    }
+  }
+
+  /**
    * Returns the delay between two automatic save operations of homes for recovery purpose.
    * @return a delay in milliseconds or 0 to disable auto save.
    * @since 3.0
@@ -698,8 +779,63 @@
   }
 
   /**
-   * Adds <code>languageLibraryName</code> to language catalog  
-   * to make the language library it contains available available to supported languages.
+   * Returns the strings that may be used for the auto completion of the given <code>property</code>.
+   * @since 3.4
+   */
+  public List<String> getAutoCompletionStrings(String property) {
+    List<String> propertyAutoCompletionStrings = this.autoCompletionStrings.get(property);
+    if (propertyAutoCompletionStrings != null) {
+      return Collections.unmodifiableList(propertyAutoCompletionStrings);
+    } else {
+      return Collections.emptyList();
+    }
+  }
+
+  /**
+   * Adds the given string to the list of the strings used in auto completion of a <code>property</code>
+   * and notifies listeners of this change.
+   * @since 3.4
+   */
+  public void addAutoCompletionString(String property, String autoCompletionString) {
+    if (autoCompletionString.length() > 0) {
+      List<String> propertyAutoCompletionStrings = this.autoCompletionStrings.get(property);
+      if (propertyAutoCompletionStrings != null
+          && !propertyAutoCompletionStrings.contains(autoCompletionString)) {
+        propertyAutoCompletionStrings = new ArrayList<String>(propertyAutoCompletionStrings);
+        propertyAutoCompletionStrings.add(0, autoCompletionString);
+        setAutoCompletionStrings(property, propertyAutoCompletionStrings);
+      }
+    }
+  }
+  
+  /**
+   * Sets the auto completion strings list of the given <code>property</code> and notifies listeners of this change.
+   * @since 3.4
+   */
+  public void setAutoCompletionStrings(String property, List<String> autoCompletionStrings) {
+    List<String> propertyAutoCompletionStrings = this.autoCompletionStrings.get(property);
+    if (!autoCompletionStrings.equals(propertyAutoCompletionStrings)) {
+      this.autoCompletionStrings.put(property, new ArrayList<String>(autoCompletionStrings));
+      this.propertyChangeSupport.firePropertyChange(Property.AUTO_COMPLETION_STRINGS.name(), 
+          null, property);
+    }
+  }
+  
+  /**
+   * Returns the list of properties with auto completion strings. 
+   * @since 3.4
+   */
+  public List<String> getAutoCompletedProperties() {
+    if (this.autoCompletionStrings != null) {
+      return Arrays.asList(this.autoCompletionStrings.keySet().toArray(new String [this.autoCompletionStrings.size()]));
+    } else {
+      return Collections.emptyList();
+    }
+  }
+  
+  /**
+   * Adds <code>languageLibraryName</code> to the first language libraries folder
+   * to make the language library it contains available to supported languages.
    * @param languageLibraryName  the name of the resource in which the library will be written. 
    * @since 2.3 
    */
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Wall.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Wall.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/model/Wall.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/model/Wall.java	2011-12-21 00:48:52.000000000 +0000
@@ -36,7 +36,7 @@
  * A wall of a home plan.
  * @author Emmanuel Puybaret
  */
-public class Wall implements Serializable, Selectable {
+public class Wall implements Serializable, Selectable, Elevatable {
   /**
    * The properties of a wall that may change. <code>PropertyChangeListener</code>s added 
    * to a wall will be notified under a property name equal to the string value of one these properties.
@@ -44,35 +44,40 @@
   public enum Property {X_START, Y_START, X_END, Y_END, ARC_EXTENT, WALL_AT_START, WALL_AT_END, 
                         THICKNESS, HEIGHT, HEIGHT_AT_END, 
                         LEFT_SIDE_COLOR, LEFT_SIDE_TEXTURE, LEFT_SIDE_SHININESS, 
-                        RIGHT_SIDE_COLOR, RIGHT_SIDE_TEXTURE, RIGHT_SIDE_SHININESS}
+                        RIGHT_SIDE_COLOR, RIGHT_SIDE_TEXTURE, RIGHT_SIDE_SHININESS,
+                        PATTERN, LEVEL}
   
   private static final long serialVersionUID = 1L;
   
-  private float       xStart;
-  private float       yStart;
-  private float       xEnd;
-  private float       yEnd; 
-  private Float       arcExtent; 
-  private Wall        wallAtStart;
-  private Wall        wallAtEnd;
-  private float       thickness;
-  private Float       height;
-  private Float       heightAtEnd;
-  private Integer     leftSideColor;
-  private HomeTexture leftSideTexture;
-  private float       leftSideShininess;
-  private Integer     rightSideColor;
-  private HomeTexture rightSideTexture;
-  private float       rightSideShininess;
-  private boolean     symmetric = true;
+  private float        xStart;
+  private float        yStart;
+  private float        xEnd;
+  private float        yEnd; 
+  private Float        arcExtent; 
+  private Wall         wallAtStart;
+  private Wall         wallAtEnd;
+  private float        thickness;
+  private Float        height;
+  private Float        heightAtEnd;
+  private Integer      leftSideColor;
+  private HomeTexture  leftSideTexture;
+  private float        leftSideShininess;
+  private Integer      rightSideColor;
+  private HomeTexture  rightSideTexture;
+  private float        rightSideShininess;
+  private boolean      symmetric = true;
+  private TextureImage pattern;  
+  private Level        level;
   
   private transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
   private transient float [][] pointsCache;
 
+
   /**
    * Creates a wall from (<code>xStart</code>,<code>yStart</code>)
    * to (<code>xEnd</code>, <code>yEnd</code>), 
    * with given thickness. Height, left and right colors are <code>null</code>.
+   * @deprecated specify a height with the {@linkplain #Wall(float, float, float, float, float, float) other constructor}.
    */
   public Wall(float xStart, float yStart, float xEnd, float yEnd, float thickness) {
     this.xStart = xStart;
@@ -579,6 +584,74 @@
   }
 
   /**
+   * Returns the wall pattern in plan.
+   * @since 3.3
+   */
+  public TextureImage getPattern() {
+    return this.pattern;
+  }
+  
+  /**
+   * Sets how walls should be displayed in plan, and notifies
+   * listeners of this change.
+   * @since 3.3 
+   */
+  public void setPattern(TextureImage pattern) {
+    if (this.pattern != pattern) {
+      TextureImage oldPattern = this.pattern;
+      this.pattern = pattern;
+      this.propertyChangeSupport.firePropertyChange(Property.PATTERN.name(), 
+          oldPattern, pattern);
+    }
+  }
+
+  /**
+   * Returns the level which this wall belongs to. 
+   * @since 3.4
+   */
+  public Level getLevel() {
+    return this.level;
+  }
+
+  /**
+   * Sets the level of this wall. Once this wall is updated, 
+   * listeners added to this wall will receive a change notification.
+   * @since 3.4
+   */
+  public void setLevel(Level level) {
+    if (level != this.level) {
+      Level oldLevel = this.level;
+      this.level = level;
+      this.propertyChangeSupport.firePropertyChange(Property.LEVEL.name(), oldLevel, level);
+    }
+  }
+
+  /**
+   * Returns <code>true</code> if this wall is visible at the given level.
+   * @since 3.4
+   */
+  public boolean isAtLevel(Level level) {
+    return this.level == level
+        || this.level != null && level != null
+            && this.level.getElevation() <= level.getElevation()
+            && this.level.getElevation() + getWallMaximumHeight() > level.getElevation();
+  }
+  
+  /**
+   * Returns the maximum height of the given wall.
+   */
+  private float getWallMaximumHeight() {
+    if (this.height == null) {
+      // Shouldn't happen
+      return 0; 
+    } else if (isTrapezoidal()) {
+      return Math.max(this.height, this.heightAtEnd);
+    } else {
+      return this.height;
+    }
+  }
+
+  /**
    * Clears the points cache of this wall and of the walls attached to it.
    */
   private void clearPointsCache() {
@@ -963,6 +1036,8 @@
       clone.propertyChangeSupport = new PropertyChangeSupport(clone);
       clone.wallAtStart = null;
       clone.wallAtEnd = null;
+      clone.level = null;
+      clone.pointsCache = null;
       return clone;
     } catch (CloneNotSupportedException ex) {
       throw new IllegalStateException("Super class isn't cloneable"); 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/package.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/package.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/package.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/package.properties	2011-12-21 00:48:52.000000000 +0000
@@ -44,4 +44,4 @@
 
 # Note to translators: do not copy the 2 following keys in localized file
 SweetHome3D.applicationName=Sweet Home 3D
-SweetHome3D.applicationVersion=3.3
+SweetHome3D.applicationVersion=3.4
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/SweetHome3DBootstrap.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/SweetHome3DBootstrap.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/SweetHome3DBootstrap.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/SweetHome3DBootstrap.java	2011-12-21 00:48:50.000000000 +0000
@@ -44,6 +44,7 @@
         "Loader3DS1_2u.jar",
         "sunflow-0.07.3g.jar",
         "jmf.jar",
+        "batik-svgpathparser-1.7.jar",
         "jnlp.jar",
         "j3dcore.jar", // Main Java 3D jars
         "vecmath.jar",
@@ -78,7 +79,8 @@
         "com.ibm.media",
         "jmpapps.util",
         "com.microcrowd.loader.java3d",
-        "org.sunflow"};
+        "org.sunflow",
+        "org.apache.batik"};
     ClassLoader java3DClassLoader = new ExtensionsClassLoader(
         sweetHome3DBootstrapClass.getClassLoader(), 
         sweetHome3DBootstrapClass.getProtectionDomain(),
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/SweetHome3D.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/SweetHome3D.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/SweetHome3D.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/SweetHome3D.java	2011-12-21 00:48:50.000000000 +0000
@@ -36,6 +36,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -485,7 +486,7 @@
    * exit in case of error during 3D rendering.
    */
   private void addComponent3DRenderingErrorObserver() {
-    if (!"true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D"))) { 
+    if (!Boolean.getBoolean("com.eteks.sweethome3d.no3D")) { 
       // Add a RenderingErrorObserver to Component3DManager, because offscreen
       // rendering needs to check rendering errors with its own RenderingErrorListener
       Component3DManager.getInstance().setRenderingErrorObserver(new Component3DManager.RenderingErrorObserver() {
@@ -608,8 +609,16 @@
         final String languageLibraryName = args [1];
         EventQueue.invokeLater(new Runnable() {
           public void run() {
+            List<String> supportedLanguages = Arrays.asList(getUserPreferences().getSupportedLanguages());
             // Import language library with a dummy controller
             createHomeFrameController(createHome()).getHomeController().importLanguageLibrary(languageLibraryName);
+            // Switch to the first language added to supported languages
+            for (String language : getUserPreferences().getSupportedLanguages()) {
+              if (!supportedLanguages.contains(language)) {
+                getUserPreferences().setLanguage(language);
+                break;
+              }
+            }
           }
         });
       } else if (getContentManager().isAcceptable(args [1], ContentManager.ContentType.FURNITURE_LIBRARY)) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/AutoCompleteTextField.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/AutoCompleteTextField.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/AutoCompleteTextField.java	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/AutoCompleteTextField.java	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,103 @@
+/*
+ * AutoCompleteTextField.java 6 aout 2011
+ *
+ * Sweet Home 3D, Copyright (c) 2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package com.eteks.sweethome3d.swing;
+
+import java.text.Collator;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
+
+import javax.swing.JTextField;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.PlainDocument;
+
+/**
+ * A text field that suggests to the user strings stored in auto completion strings in the user preferences.
+ * Inspired from the code released in public domain by Samuel Sjoberg on his 
+ * <a href="http://samuelsjoberg.com/archive/2009/10/autocompletion-in-swing">blog</a>.
+ * @author Emmanuel Puybaret
+ */
+public class AutoCompleteTextField extends JTextField {
+  private List<String> autoCompletionStrings;
+  
+  public AutoCompleteTextField(String text, int preferredLength, List<String> autoCompletionStrings) {
+    super(preferredLength);
+    this.autoCompletionStrings = autoCompletionStrings;
+    setDocument(new AutoCompleteDocument(text));    
+  }
+  
+  /**
+   * Document able to autocomplete.
+   */
+  private class AutoCompleteDocument extends PlainDocument {
+    public AutoCompleteDocument(String text) {
+      try {
+        replace(0, 0, text, null);
+      } catch (BadLocationException ex) {
+        throw new RuntimeException(ex);
+      }
+    }
+    
+    @Override
+    public void insertString(int offset, String string, AttributeSet attr) throws BadLocationException {
+      if (string != null && string.length() > 0) {
+        int length = getLength();
+        if (offset == length || (offset == getSelectionStart() && length - 1 == getSelectionEnd())) {
+          String textAtOffset = getText(0, offset); 
+          String completion = autoComplete(textAtOffset + string);
+          if (completion != null) {
+            int completionIndex = offset + string.length();
+            super.remove(offset, length - offset);
+            super.insertString(offset, string, attr);
+            super.insertString(completionIndex, completion.substring(completionIndex), attr);
+            select(completionIndex, getLength());
+            return;
+          }
+        }
+      }
+      super.insertString(offset, string, attr);
+    }
+
+    private String autoComplete(String stringStart) {
+      stringStart = stringStart.toLowerCase();
+      // Keep suggestions in alphabetical order
+      final Collator comparator = Collator.getInstance();
+      comparator.setStrength(Collator.TERTIARY);
+      TreeSet<String> matchingStrings = new TreeSet<String>(new Comparator<String>() {
+          public int compare(String s1, String s2) {
+            return comparator.compare(s1, s2);
+          }
+        });
+      // Find matching strings
+      for (String s : autoCompletionStrings) {
+        if (s.toLowerCase().startsWith(stringStart)) {
+          matchingStrings.add(s);
+        }
+      }
+      if (matchingStrings.size() > 0) {
+        // Return the first found one
+        return matchingStrings.first();
+      } else {
+        return null;
+      }
+    }
+  }
+}
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/BackgroundImageWizardStepsPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/BackgroundImageWizardStepsPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/BackgroundImageWizardStepsPanel.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/BackgroundImageWizardStepsPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -190,8 +190,9 @@
         BackgroundImageWizardStepsPanel.class, "scaleLabel.text"));
     this.scaleDistanceLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences,
         BackgroundImageWizardStepsPanel.class, "scaleDistanceLabel.text", unitName));
+    final float maximumLength = preferences.getLengthUnit().getMaximumLength();
     final NullableSpinner.NullableSpinnerLengthModel scaleDistanceSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0.99f, 1000000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, preferences.getLengthUnit().getMinimumLength(), maximumLength);
     this.scaleDistanceSpinner = new NullableSpinner(scaleDistanceSpinnerModel);
     this.scaleDistanceSpinner.getModel().addChangeListener(new ChangeListener () {
         public void stateChanged(ChangeEvent ev) {
@@ -218,10 +219,10 @@
     this.yOriginLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences,
             BackgroundImageWizardStepsPanel.class, "yOriginLabel.text", unitName)); 
     final NullableSpinner.NullableSpinnerLengthModel xOriginSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0f, 1000000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0f, maximumLength);
     this.xOriginSpinner = new NullableSpinner(xOriginSpinnerModel);
     final NullableSpinner.NullableSpinnerLengthModel yOriginSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0f, 1000000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0f, maximumLength);
     this.yOriginSpinner = new NullableSpinner(yOriginSpinnerModel);
     ChangeListener originSpinnersListener = new ChangeListener () {
         public void stateChanged(ChangeEvent ev) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/CompassPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/CompassPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/CompassPanel.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/CompassPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -115,8 +115,9 @@
     // Create X label and its spinner bound to X controller property
     this.xLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         CompassPanel.class, "xLabel.text", unitName));
+    float maximumLength = preferences.getLengthUnit().getMaximumLength();
     final NullableSpinner.NullableSpinnerLengthModel xSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, -100000f, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, -maximumLength, maximumLength);
     this.xSpinner = new JSpinner(xSpinnerModel);
     xSpinnerModel.setLength(controller.getX());
     final PropertyChangeListener xChangeListener = new PropertyChangeListener() {
@@ -137,7 +138,7 @@
     this.yLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         CompassPanel.class, "yLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel ySpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, -100000f, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, -maximumLength, maximumLength);
     this.ySpinner = new NullableSpinner(ySpinnerModel);
     ySpinnerModel.setLength(controller.getY());
     final PropertyChangeListener yChangeListener = new PropertyChangeListener() {
@@ -158,7 +159,8 @@
     this.diameterLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         CompassPanel.class, "diameterLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel diameterSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0.1f, 2500f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, 
+            preferences.getLengthUnit().getMinimumLength(), preferences.getLengthUnit().getMaximumLength()  / 10);
     this.diameterSpinner = new NullableSpinner(diameterSpinnerModel);
     diameterSpinnerModel.setLength(controller.getDiameter());
     final PropertyChangeListener diameterChangeListener = new PropertyChangeListener() {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/FurnitureCatalogListPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/FurnitureCatalogListPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/FurnitureCatalogListPanel.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/FurnitureCatalogListPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -484,12 +484,14 @@
           }
         }
       }
-      int [] indices = new int [selectedIndices.size()];
-      for (int i = 0; i < indices.length; i++) {
-        indices [i] = selectedIndices.get(i);
+      if (selectedIndices.size() > 0) {
+        int [] indices = new int [selectedIndices.size()];
+        for (int i = 0; i < indices.length; i++) {
+          indices [i] = selectedIndices.get(i);
+        }
+        this.catalogFurnitureList.setSelectedIndices(indices);
+        this.catalogFurnitureList.ensureIndexIsVisible(indices [0]);
       }
-      this.catalogFurnitureList.setSelectedIndices(indices);
-      this.catalogFurnitureList.ensureIndexIsVisible(indices [0]);
     }
     
     if (this.listSelectionListener != null) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/FurnitureCatalogTransferHandler.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/FurnitureCatalogTransferHandler.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/FurnitureCatalogTransferHandler.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/FurnitureCatalogTransferHandler.java	2011-12-21 00:48:52.000000000 +0000
@@ -32,18 +32,13 @@
 import javax.swing.Icon;
 import javax.swing.JComponent;
 
-import com.eteks.sweethome3d.model.CatalogDoorOrWindow;
-import com.eteks.sweethome3d.model.CatalogLight;
 import com.eteks.sweethome3d.model.CatalogPieceOfFurniture;
-import com.eteks.sweethome3d.model.DoorOrWindow;
-import com.eteks.sweethome3d.model.HomeDoorOrWindow;
-import com.eteks.sweethome3d.model.HomeLight;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
-import com.eteks.sweethome3d.model.Light;
 import com.eteks.sweethome3d.model.PieceOfFurniture;
 import com.eteks.sweethome3d.model.Selectable;
 import com.eteks.sweethome3d.viewcontroller.ContentManager;
 import com.eteks.sweethome3d.viewcontroller.FurnitureCatalogController;
+import com.eteks.sweethome3d.viewcontroller.FurnitureController;
 
 /**
  * Catalog transfer handler.
@@ -52,14 +47,17 @@
 public class FurnitureCatalogTransferHandler extends VisualTransferHandler {
   private final ContentManager             contentManager;
   private final FurnitureCatalogController catalogController;
+  private final FurnitureController        furnitureController;
   
   /**
    * Creates a handler able to transfer catalog selected furniture.
    */
   public FurnitureCatalogTransferHandler(ContentManager contentManager,
-                                         FurnitureCatalogController catalogController) {
+                                         FurnitureCatalogController catalogController,
+                                         FurnitureController furnitureController) {
     this.contentManager = contentManager;
     this.catalogController = catalogController;
+    this.furnitureController = furnitureController;
   }
 
   /**
@@ -108,14 +106,8 @@
     List<CatalogPieceOfFurniture> selectedCatalogFurniture = this.catalogController.getSelectedFurniture();
     List<HomePieceOfFurniture> transferedFurniture = 
         new ArrayList<HomePieceOfFurniture>(selectedCatalogFurniture.size());
-    for (CatalogPieceOfFurniture piece : selectedCatalogFurniture) {
-      if (piece instanceof CatalogDoorOrWindow) {
-        transferedFurniture.add(new HomeDoorOrWindow((DoorOrWindow)piece));
-      } else if (piece instanceof CatalogLight) {
-        transferedFurniture.add(new HomeLight((Light)piece));
-      } else {
-        transferedFurniture.add(new HomePieceOfFurniture(piece));
-      }
+    for (CatalogPieceOfFurniture catalogPiece : selectedCatalogFurniture) {
+      transferedFurniture.add(this.furnitureController.createHomePieceOfFurniture(catalogPiece));
     }
     return new HomeTransferableList(transferedFurniture);
   }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/FurnitureTable.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/FurnitureTable.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/FurnitureTable.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/FurnitureTable.java	2011-12-21 00:48:52.000000000 +0000
@@ -72,12 +72,13 @@
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomeFurnitureGroup;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
+import com.eteks.sweethome3d.model.HomePieceOfFurniture.SortableProperty;
 import com.eteks.sweethome3d.model.HomeTexture;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.Selectable;
 import com.eteks.sweethome3d.model.SelectionEvent;
 import com.eteks.sweethome3d.model.SelectionListener;
 import com.eteks.sweethome3d.model.UserPreferences;
-import com.eteks.sweethome3d.model.HomePieceOfFurniture.SortableProperty;
 import com.eteks.sweethome3d.tools.ResourceURLContent;
 import com.eteks.sweethome3d.viewcontroller.FurnitureController;
 import com.eteks.sweethome3d.viewcontroller.View;
@@ -242,7 +243,25 @@
     addMouseListener(new MouseAdapter () {
         @Override
         public void mouseClicked(MouseEvent ev) {
-          if (ev.getClickCount() == 2) {
+          int column = columnAtPoint(ev.getPoint());
+          int row = rowAtPoint(ev.getPoint());
+          boolean isVisibleColumn = false;
+          if (column >= 0
+              && row >= 0
+              && getColumnModel().getColumn(column).getIdentifier() == HomePieceOfFurniture.SortableProperty.VISIBLE) {
+            Component visibilityComponent = getCellRenderer(row, column).
+                getTableCellRendererComponent(FurnitureTable.this, getValueAt(row, column), false, false, row, column);
+            Rectangle cellRect = getCellRect(row, column, false);
+            // Center visibilityComponent in cell rect
+            visibilityComponent.setSize(visibilityComponent.getPreferredSize());
+            visibilityComponent.setLocation(cellRect.x + (cellRect.width - visibilityComponent.getWidth()) / 2, 
+                cellRect.y + (cellRect.height - visibilityComponent.getHeight()) / 2);
+            // Check if mouse point is exactly on the visibility component
+            isVisibleColumn = visibilityComponent.getBounds().contains(ev.getPoint());
+          }
+          if (isVisibleColumn) {
+            controller.toggleSelectedFurnitureVisibility();
+          } else if (ev.getClickCount() == 2) {
             controller.modifySelectedFurniture();
           }
         }
@@ -302,7 +321,7 @@
     home.addPropertyChangeListener(Home.Property.FURNITURE_SORTED_PROPERTY, sortListener);
     home.addPropertyChangeListener(Home.Property.FURNITURE_DESCENDING_SORTED, sortListener);
     
-    final PropertyChangeListener furnitureChangeListener = 
+    final PropertyChangeListener changeListener = 
       new PropertyChangeListener () {
         public void propertyChange(PropertyChangeEvent ev) {
           // As furniture properties values change may alter sort order, update sort and whole table
@@ -312,14 +331,26 @@
         }
       };
     for (HomePieceOfFurniture piece : home.getFurniture()) {
-      piece.addPropertyChangeListener(furnitureChangeListener);
+      piece.addPropertyChangeListener(changeListener);
     }
     home.addFurnitureListener(new CollectionListener<HomePieceOfFurniture>() {
-        public void collectionChanged(CollectionEvent<HomePieceOfFurniture> ev) {
+      public void collectionChanged(CollectionEvent<HomePieceOfFurniture> ev) {
+          if (ev.getType() == CollectionEvent.Type.ADD) {
+            ev.getItem().addPropertyChangeListener(changeListener);
+          } else {
+            ev.getItem().removePropertyChangeListener(changeListener);
+          }
+        }
+      });
+    for (Level level : home.getLevels()) {
+      level.addPropertyChangeListener(changeListener);
+    }
+    home.addLevelsListener(new CollectionListener<Level>() {
+        public void collectionChanged(CollectionEvent<Level> ev) {
           if (ev.getType() == CollectionEvent.Type.ADD) {
-            ev.getItem().addPropertyChangeListener(furnitureChangeListener);
+            ev.getItem().addPropertyChangeListener(changeListener);
           } else {
-            ev.getItem().removePropertyChangeListener(furnitureChangeListener);
+            ev.getItem().removePropertyChangeListener(changeListener);
           }
         }
       });
@@ -552,6 +583,12 @@
               // Copy piece name
               csv.append(copiedPiece.getName());
               break;
+            case LEVEL :
+              // Copy level name
+              csv.append(copiedPiece.getLevel() != null 
+                  ? copiedPiece.getLevel().getName() 
+                  : "");
+              break;
             case COLOR :
               if (copiedPiece.getColor() != null) {
                 // Copy piece color at #xxxxxx format              
@@ -612,6 +649,14 @@
   }
   
   /**
+   * Returns the filter applied to the furniture displayed in this table.
+   */
+  public FurnitureTable.FurnitureFilter getFurnitureFilter() {
+    FurnitureTableModel tableModel = (FurnitureTableModel)getModel();
+    return tableModel.getFurnitureFilter();
+  }
+  
+  /**
    * Column table model used by this table.
    */
   private static class FurnitureTableColumnModel extends DefaultTableColumnModel {
@@ -751,6 +796,8 @@
           return preferences.getLocalizedString(FurnitureTable.class, "elevationColumn");
         case ANGLE :
           return preferences.getLocalizedString(FurnitureTable.class, "angleColumn");
+        case LEVEL :
+          return preferences.getLocalizedString(FurnitureTable.class, "levelColumn");
         case COLOR :
           return preferences.getLocalizedString(FurnitureTable.class, "colorColumn");
         case TEXTURE :
@@ -791,6 +838,8 @@
           return 50;
         case ANGLE :
           return 35;        
+        case LEVEL :
+          return 70;        
         case COLOR :
         case TEXTURE :
           return 30;        
@@ -832,6 +881,8 @@
           return getSizeRenderer(HomePieceOfFurniture.SortableProperty.ELEVATION, preferences);
         case ANGLE :
           return getAngleRenderer();        
+        case LEVEL :
+          return getLevelRenderer();        
         case COLOR :
           return getColorRenderer();        
         case TEXTURE :
@@ -872,6 +923,22 @@
     }
 
     /**
+     * Returns a renderer that displays the level name of a piece of furniture. 
+     */
+    private TableCellRenderer getLevelRenderer() {
+      return new DefaultTableCellRenderer() { 
+        @Override
+        public Component getTableCellRendererComponent(JTable table, 
+             Object value, boolean isSelected, boolean hasFocus, 
+             int row, int column) {
+          HomePieceOfFurniture piece = (HomePieceOfFurniture)value; 
+          Level level = piece.getLevel();
+          return super.getTableCellRendererComponent(
+              table, level != null  ? level.getName()  : "", isSelected, hasFocus, row, column); 
+        }
+      };
+    }
+    /**
      * Returns a renderer that displays the name of a piece of furniture with its icon ahead. 
      */
     private TableCellRenderer getNameWithIconRenderer() {
@@ -984,13 +1051,14 @@
       // Renderer super class used to display sizes
       class PriceRenderer extends DefaultTableCellRenderer {
         public Component getTableCellRendererComponent(JTable table, 
-             Object value, boolean isSelected, boolean hasFocus, 
+             BigDecimal price, String currency, boolean isSelected, boolean hasFocus, 
              int row, int column) {
-          String currency = preferences.getCurrency();
-          if (value != null && currency != null) {
+          String defaultCurrency = preferences.getCurrency();
+          String value;
+          if (price != null && defaultCurrency != null) {
             NumberFormat currencyFormat = DecimalFormat.getCurrencyInstance();
-            currencyFormat.setCurrency(Currency.getInstance(currency));
-            value = currencyFormat.format((BigDecimal)value);
+            currencyFormat.setCurrency(Currency.getInstance(currency != null ? currency : defaultCurrency));
+            value = currencyFormat.format(price);
           } else {
             value = "";
           }
@@ -1006,8 +1074,9 @@
               @Override
               public Component getTableCellRendererComponent(JTable table, 
                   Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+                HomePieceOfFurniture piece = (HomePieceOfFurniture)value;
                 return super.getTableCellRendererComponent(table, 
-                    ((HomePieceOfFurniture)value).getPrice(), isSelected, hasFocus, row, column);
+                    piece.getPrice(), piece.getCurrency(), isSelected, hasFocus, row, column);
               }
             };
         case VALUE_ADDED_TAX :
@@ -1015,8 +1084,9 @@
               @Override
               public Component getTableCellRendererComponent(JTable table, 
                   Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+                HomePieceOfFurniture piece = (HomePieceOfFurniture)value;
                 return super.getTableCellRendererComponent(table, 
-                    ((HomePieceOfFurniture)value).getValueAddedTax(), isSelected, hasFocus, row, column);
+                    piece.getValueAddedTax(), piece.getCurrency(), isSelected, hasFocus, row, column);
               }
             };
         case PRICE_VALUE_ADDED_TAX_INCLUDED :
@@ -1024,8 +1094,9 @@
               @Override
               public Component getTableCellRendererComponent(JTable table, 
                   Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+                HomePieceOfFurniture piece = (HomePieceOfFurniture)value;
                 return super.getTableCellRendererComponent(table, 
-                    ((HomePieceOfFurniture)value).getPriceValueAddedTaxIncluded(), isSelected, hasFocus, row, column);
+                    piece.getPriceValueAddedTaxIncluded(), piece.getCurrency(), isSelected, hasFocus, row, column);
               }
             };
         default :
@@ -1163,20 +1234,27 @@
       // Renderer super class used to display booleans
       class BooleanRenderer implements TableCellRenderer {
         private TableCellRenderer booleanRenderer;
+        private final boolean enabled;
+
+        public BooleanRenderer(boolean enabled) {
+          this.enabled = enabled;
+        }
 
         public Component getTableCellRendererComponent(JTable table, 
              Object value, boolean isSelected, boolean hasFocus, int row, int column) {
           if (this.booleanRenderer == null) {
             this.booleanRenderer = table.getDefaultRenderer(Boolean.class);
           }
-          return this.booleanRenderer.getTableCellRendererComponent(
+          Component component = this.booleanRenderer.getTableCellRendererComponent(
               table, value, isSelected, hasFocus, row, column);
+          component.setEnabled(this.enabled);
+          return component;
         }
       };
       
       switch (property) {
         case MOVABLE :
-          return new BooleanRenderer() {
+          return new BooleanRenderer(false) {
               @Override
               public Component getTableCellRendererComponent(JTable table, 
                   Object value, boolean isSelected, boolean hasFocus, int row, int column) {
@@ -1185,7 +1263,7 @@
               }
             };
         case DOOR_OR_WINDOW :
-          return new BooleanRenderer() {
+          return new BooleanRenderer(false) {
               @Override
               public Component getTableCellRendererComponent(JTable table, 
                   Object value, boolean isSelected, boolean hasFocus, int row, int column) {
@@ -1194,7 +1272,7 @@
               }
             };
         case VISIBLE :
-          return new BooleanRenderer() {
+          return new BooleanRenderer(true) {
               @Override
               public Component getTableCellRendererComponent(JTable table, 
                   Object value, boolean isSelected, boolean hasFocus, int row, int column) {
@@ -1408,6 +1486,13 @@
       this.furnitureFilter = furnitureFilter;      
       filterAndSortFurniture();
     }
+    
+    /**
+     * Returns the filter applied to the furniture listed in this model.
+     */
+    public FurnitureFilter getFurnitureFilter() {
+      return this.furnitureFilter;
+    }
   }
   
   /**
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HelpPane.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HelpPane.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HelpPane.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HelpPane.java	2011-12-21 00:48:52.000000000 +0000
@@ -38,9 +38,6 @@
 import java.net.URL;
 import java.util.Locale;
 
-import javax.jnlp.BasicService;
-import javax.jnlp.ServiceManager;
-import javax.jnlp.UnavailableServiceException;
 import javax.swing.Action;
 import javax.swing.ActionMap;
 import javax.swing.ImageIcon;
@@ -105,7 +102,7 @@
     controller.addPropertyChangeListener(HelpController.Property.BROWSER_PAGE, 
         new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent ev) {
-            setBrowserPage(controller.getBrowserPage());
+            SwingTools.showDocumentInBrowser(controller.getBrowserPage());
           }
         });
   }
@@ -470,17 +467,4 @@
       throw new RuntimeException(ex);
     }
   }
-
-  /**
-   * Displays <code>url</code> in standard browser.
-   */
-  private void setBrowserPage(URL url) {
-    try { 
-      // Lookup the javax.jnlp.BasicService object 
-      BasicService service = (BasicService)ServiceManager.lookup("javax.jnlp.BasicService"); 
-      service.showDocument(url); 
-    } catch (UnavailableServiceException ex) {
-      // Too bad : service is unavailable 
-    }
-  }
 }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/Home3DAttributesPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/Home3DAttributesPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/Home3DAttributesPanel.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/Home3DAttributesPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -57,6 +57,8 @@
   private JSpinner      observerFieldOfViewSpinner;
   private JLabel        observerHeightLabel;
   private JSpinner      observerHeightSpinner;
+  private JLabel        observerCameraElevationLabel;
+  private JSpinner      observerCameraElevationSpinner;
   private JRadioButton  groundColorRadioButton;
   private ColorButton   groundColorButton;
   private JRadioButton  groundTextureRadioButton;
@@ -116,8 +118,9 @@
     // Create observer height label and spinner bound to OBSERVER_HEIGHT controller property
     this.observerHeightLabel = new JLabel(String.format(SwingTools.getLocalizedLabelText(preferences, 
         Home3DAttributesPanel.class, "observerHeightLabel.text"), unitName));
+    float maximumElevation = preferences.getLengthUnit().getMaximumElevation();
     final NullableSpinner.NullableSpinnerLengthModel observerHeightSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, 10f, 2500f * 15 / 14);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, controller.getMinimumElevation(), maximumElevation * 15 / 14);
     this.observerHeightSpinner = new AutoCommitSpinner(observerHeightSpinnerModel);
     observerHeightSpinnerModel.setLength((float)Math.round(controller.getObserverHeight() * 100) / 100);
     observerHeightSpinnerModel.addChangeListener(new ChangeListener() {
@@ -132,6 +135,45 @@
           }
         });
     
+    // Create camera elevation label and spinner bound to OBSERVER_CAMERA_ELEVATION controller property
+    this.observerCameraElevationLabel = new JLabel(String.format(SwingTools.getLocalizedLabelText(preferences, 
+        Home3DAttributesPanel.class, "observerCameraElevationLabel.text"), unitName));
+    final NullableSpinner.NullableSpinnerLengthModel observerCameraElevationSpinnerModel = 
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, controller.getMinimumElevation(), maximumElevation);
+    this.observerCameraElevationSpinner = new AutoCommitSpinner(observerCameraElevationSpinnerModel);    
+    observerCameraElevationSpinnerModel.addChangeListener(new ChangeListener() {
+        public void stateChanged(ChangeEvent ev) {
+          controller.setObserverCameraElevation(observerCameraElevationSpinnerModel.getLength());
+        }
+      });
+    PropertyChangeListener observerCameraElevationChangeListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          Float observerCameraElevation = controller.getObserverCameraElevation();
+          observerCameraElevationSpinnerModel.setNullable(observerCameraElevation == null);
+          observerCameraElevationSpinnerModel.setLength(observerCameraElevation != null
+              ? (float)Math.round(controller.getObserverCameraElevation() * 100) / 100
+              : null);
+          observerCameraElevationLabel.setVisible(observerCameraElevation != null);
+          observerCameraElevationSpinner.setVisible(observerCameraElevation != null);
+          observerHeightLabel.setVisible(observerCameraElevation == null);
+          observerHeightSpinner.setVisible(observerCameraElevation == null);
+        }
+      };
+    observerCameraElevationChangeListener.propertyChange(null);
+    controller.addPropertyChangeListener(Home3DAttributesController.Property.OBSERVER_CAMERA_ELEVATION, observerCameraElevationChangeListener);
+    
+    controller.addPropertyChangeListener(Home3DAttributesController.Property.MINIMUM_ELEVATION, 
+        new PropertyChangeListener() {
+          public void propertyChange(PropertyChangeEvent ev) {
+            observerHeightSpinnerModel.setLength(Math.min(observerHeightSpinnerModel.getLength(), controller.getMinimumElevation()));
+            observerHeightSpinnerModel.setMinimum(controller.getMinimumElevation());
+            if (observerCameraElevationSpinnerModel.getLength() != null) {
+              observerCameraElevationSpinnerModel.setLength(Math.min(observerCameraElevationSpinnerModel.getLength(), controller.getMinimumElevation()));
+            }
+            observerCameraElevationSpinnerModel.setMinimum(controller.getMinimumElevation());
+          }
+        });
+    
     // Ground color and texture buttons bound to ground controller properties
     this.groundColorRadioButton = new JRadioButton(SwingTools.getLocalizedLabelText(preferences, 
         Home3DAttributesPanel.class, "groundColorRadioButton.text"));
@@ -330,6 +372,10 @@
           KeyStroke.getKeyStroke(preferences.getLocalizedString(
               Home3DAttributesPanel.class, "observerHeightLabel.mnemonic")).getKeyCode());
       this.observerHeightLabel.setLabelFor(this.observerHeightSpinner);
+      this.observerCameraElevationLabel.setDisplayedMnemonic(
+          KeyStroke.getKeyStroke(preferences.getLocalizedString(
+              Home3DAttributesPanel.class, "observerCameraElevationLabel.mnemonic")).getKeyCode());
+      this.observerCameraElevationLabel.setLabelFor(this.observerCameraElevationSpinner);
       this.groundColorRadioButton.setMnemonic(
           KeyStroke.getKeyStroke(preferences.getLocalizedString(
               Home3DAttributesPanel.class,"groundColorRadioButton.mnemonic")).getKeyCode());
@@ -376,6 +422,13 @@
     add(this.observerHeightSpinner, new GridBagConstraints(
         3, 0, 1, 1, 0, 0, GridBagConstraints.LINE_START, 
         GridBagConstraints.HORIZONTAL, rightComponentInsets, -25, 0));
+    // observerCameraElevation label and spinner at the same location but both are never visible at the same time 
+    add(this.observerCameraElevationLabel, new GridBagConstraints(
+        2, 0, 1, 1, 0, 0, labelAlignment, 
+        GridBagConstraints.NONE, labelInsets, 0, 0));
+    add(this.observerCameraElevationSpinner, new GridBagConstraints(
+        3, 0, 1, 1, 0, 0, GridBagConstraints.LINE_START, 
+        GridBagConstraints.HORIZONTAL, rightComponentInsets, -25, 0));
     // Second row
     Insets closeLabelInsets = new Insets(0, 0, 2, 5);
     add(this.groundColorRadioButton, new GridBagConstraints(
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomeComponent3D.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomeComponent3D.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomeComponent3D.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomeComponent3D.java	2011-12-21 00:48:52.000000000 +0000
@@ -29,6 +29,8 @@
 import java.awt.EventQueue;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
@@ -63,11 +65,13 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -135,6 +139,7 @@
 import com.eteks.sweethome3d.model.HomeFurnitureGroup;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.HomeTexture;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.Room;
 import com.eteks.sweethome3d.model.Selectable;
 import com.eteks.sweethome3d.model.UserPreferences;
@@ -155,7 +160,7 @@
 public class HomeComponent3D extends JComponent implements com.eteks.sweethome3d.viewcontroller.View, Printable {
   private enum ActionType {MOVE_CAMERA_FORWARD, MOVE_CAMERA_FAST_FORWARD, MOVE_CAMERA_BACKWARD, MOVE_CAMERA_FAST_BACKWARD,  
       ROTATE_CAMERA_YAW_LEFT, ROTATE_CAMERA_YAW_FAST_LEFT, ROTATE_CAMERA_YAW_RIGHT, ROTATE_CAMERA_YAW_FAST_RIGHT, 
-      ROTATE_CAMERA_PITCH_UP, ROTATE_CAMERA_PITCH_DOWN, 
+      ROTATE_CAMERA_PITCH_UP, ROTATE_CAMERA_PITCH_FAST_UP, ROTATE_CAMERA_PITCH_DOWN, ROTATE_CAMERA_PITCH_FAST_DOWN, 
       ELEVATE_CAMERA_UP, ELEVATE_CAMERA_FAST_UP, ELEVATE_CAMERA_DOWN, ELEVATE_CAMERA_FAST_DOWN}
   
   private final Home                               home;
@@ -170,10 +175,12 @@
   private PropertyChangeListener                   cameraChangeListener;
   private PropertyChangeListener                   homeCameraListener;
   private PropertyChangeListener                   skyColorListener;
-  private PropertyChangeListener                   groundColorAndTextureListener;
+  private PropertyChangeListener                   groundChangeListener;
   private PropertyChangeListener                   lightColorListener;
   private PropertyChangeListener                   wallsAlphaListener;
   private PropertyChangeListener                   drawingModeListener;
+  private CollectionListener<Level>                levelListener;
+  private PropertyChangeListener                   levelChangeListener;
   private CollectionListener<Wall>                 wallListener;
   private PropertyChangeListener                   wallChangeListener;
   private CollectionListener<HomePieceOfFurniture> furnitureListener;
@@ -264,37 +271,121 @@
     this.displayShadowOnFloor = displayShadowOnFloor;
     this.object3dFactory = object3DFactory;
 
-    if (Boolean.valueOf(System.getProperty("com.eteks.sweethome3d.j3d.useOffScreen3DView", "false"))) {
-      GraphicsConfigTemplate3D gc = new GraphicsConfigTemplate3D();
-      gc.setSceneAntialiasing(GraphicsConfigTemplate3D.PREFERRED);
-      this.component3D = new JCanvas3D(gc) {
-          public void paintComponent(Graphics g) {
-            super.paintComponent(g);
-            g.drawImage(navigationPanelImage, 0, 0, this);
+    if (controller != null) {
+      createActions(controller);
+      installKeyboardActions();
+      // Let this component manage focus
+      setFocusable(true);
+      SwingTools.installFocusBorder(this);
+    }
+
+    GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
+    if (graphicsEnvironment.getScreenDevices().length == 1) {
+      // If only one screen device is available, create canvas 3D immediately, 
+      // otherwise create it once the screen device of the parent is known
+      createComponent3D(graphicsEnvironment.getDefaultScreenDevice().getDefaultConfiguration(), preferences, controller);
+    }
+
+    // Add an ancestor listener to create canvas 3D and its universe once this component is made visible 
+    // and clean up universe once its parent frame is disposed
+    addAncestorListener(preferences, controller, displayShadowOnFloor);
+  }
+
+  /**
+   * Adds an ancestor listener to this component to manage the creation of the canvas and its universe 
+   * and clean up the universe.  
+   */
+  private void addAncestorListener(final UserPreferences preferences, 
+                                   final HomeController3D controller, 
+                                   final boolean displayShadowOnFloor) {
+    addAncestorListener(new AncestorListener() {        
+        public void ancestorAdded(AncestorEvent ev) {
+          if (offscreenUniverse != null) {
+            throw new IllegalStateException("Can't listen to home changes offscreen and onscreen at the same time");
           }
-        };
-      this.component3D.setSize(1, 1);
-    } else {
-      this.component3D = Component3DManager.getInstance().getOnscreenCanvas3D(new Component3DManager.RenderingObserver() {        
-        public void canvas3DSwapped(Canvas3D canvas3D) {
-        }
-        
-        public void canvas3DPreRendered(Canvas3D canvas3D) {
+          // Create component 3D only once the graphics configuration of its parent is known
+          if (component3D == null) {
+            createComponent3D(ev.getAncestor().getGraphicsConfiguration(), preferences, controller);
+          }
+          onscreenUniverse = createUniverse(displayShadowOnFloor, true, false);
+          Canvas3D canvas3D;
+          if (component3D instanceof Canvas3D) {
+            canvas3D = (Canvas3D)component3D;
+          } else {
+            try {
+              // Call JCanvas3D#getOffscreenCanvas3D by reflection to be able to run under Java 3D 1.3
+              canvas3D = (Canvas3D)Class.forName("com.sun.j3d.exp.swing.JCanvas3D").getMethod("getOffscreenCanvas3D").invoke(component3D);
+            } catch (Exception ex) {
+              UnsupportedOperationException ex2 = new UnsupportedOperationException();
+              ex2.initCause(ex);
+              throw ex2;
+            }
+          }
+          // Bind universe to canvas3D
+          onscreenUniverse.getViewer().getView().addCanvas3D(canvas3D );
+          component3D.setFocusable(false);
+          updateNavigationPanelImage();
         }
         
-        public void canvas3DPostRendered(Canvas3D canvas3D) {
-          // Copy reference to navigation panel image to avoid concurrency problems 
-          // if it's modified in the EDT while this method draws it
-          BufferedImage navigationPanelImage = HomeComponent3D.this.navigationPanelImage;
-          // Render navigation panel upon canvas 3D if it exists
-          if (navigationPanelImage != null) {
-            J3DGraphics2D g2D = canvas3D.getGraphics2D();
-            g2D.drawImage(navigationPanelImage, null, 0, 0);
-            g2D.flush(true);
+        public void ancestorRemoved(AncestorEvent ev) {
+          if (onscreenUniverse != null) {
+            onscreenUniverse.cleanup();
+            removeHomeListeners();
+            onscreenUniverse = null;
           }
         }
+        
+        public void ancestorMoved(AncestorEvent ev) {
+        }        
       });
+  }
+
+  /**
+   * Creates the 3D component associated with the given <code>configuration</code> device.
+   */
+  private void createComponent3D(GraphicsConfiguration configuration, 
+                                 UserPreferences  preferences, 
+                                 HomeController3D controller) {
+    if (Boolean.valueOf(System.getProperty("com.eteks.sweethome3d.j3d.useOffScreen3DView", "false"))) {
+      GraphicsConfigTemplate3D gc = new GraphicsConfigTemplate3D();
+      gc.setSceneAntialiasing(GraphicsConfigTemplate3D.PREFERRED);
+      try {
+        // Instantiate JCanvas3DWithNavigationPanel inner class by reflection
+        // to be able to run under Java 3D 1.3
+        this.component3D = (Component)Class.forName(getClass().getName() + "$JCanvas3DWithNavigationPanel").
+            getConstructor(getClass(), GraphicsConfigTemplate3D.class).newInstance(this, gc);
+        this.component3D.setSize(1, 1);
+      } catch (ClassNotFoundException ex) {
+        throw new UnsupportedOperationException("Java 3D 1.5 required to display an offscreen 3D view");
+      } catch (Exception ex) {
+        UnsupportedOperationException ex2 = new UnsupportedOperationException();
+        ex2.initCause(ex);
+        throw ex2;
+      }
+    } else {
+      this.component3D = Component3DManager.getInstance().getOnscreenCanvas3D(configuration,
+          new Component3DManager.RenderingObserver() {        
+              public void canvas3DSwapped(Canvas3D canvas3D) {
+              }
+              
+              public void canvas3DPreRendered(Canvas3D canvas3D) {
+              }
+              
+              public void canvas3DPostRendered(Canvas3D canvas3D) {
+                // Copy reference to navigation panel image to avoid concurrency problems 
+                // if it's modified in the EDT while this method draws it
+                BufferedImage navigationPanelImage = HomeComponent3D.this.navigationPanelImage;
+                // Render navigation panel upon canvas 3D if it exists
+                if (navigationPanelImage != null) {
+                  J3DGraphics2D g2D = canvas3D.getGraphics2D();
+                  g2D.drawImage(navigationPanelImage, null, 0, 0);
+                  g2D.flush(true);
+                }
+              }
+            });
     }
+    this.component3D.setBackground(Color.LIGHT_GRAY);
+
     JPanel canvasPanel = new JPanel(new LayoutManager() {
         public void addLayoutComponent(String name, Component comp) {
         }
@@ -324,7 +415,6 @@
     canvasPanel.add(this.component3D);    
     setLayout(new GridLayout());
     add(canvasPanel);
-
     if (controller != null) {
       addMouseListeners(controller, this.component3D);
       if (preferences != null
@@ -332,10 +422,10 @@
               || OperatingSystem.isMacOSXLeopardOrSuperior())) {
         // No support for navigation panel under Mac OS X Tiger 
         // (too unstable, may crash system at 3D view resizing)
-        this.navigationPanel = createNavigationPanel(home, preferences, controller);
+        this.navigationPanel = createNavigationPanel(this.home, preferences, controller);
         setNavigationPanelVisible(preferences.isNavigationPanelVisible() && isVisible());
         preferences.addPropertyChangeListener(UserPreferences.Property.NAVIGATION_PANEL_VISIBLE, 
-            new NavigationPanelChangeListener(this, controller));
+            new NavigationPanelChangeListener(this));
       }
       createActions(controller);
       installKeyboardActions();
@@ -343,49 +433,32 @@
       setFocusable(true);
       SwingTools.installFocusBorder(this);
     }
-
-    // Add an ancestor listener to create canvas universe once this component is made visible 
-    // and clean up universe once its parent frame is disposed
-    addAncestorListener(this.component3D, displayShadowOnFloor);
   }
 
   /**
-   * Adds an ancestor listener to this component to manage canvas universe 
-   * creation and clean up.  
+   * A <code>JCanvas</code> canvas that displays the navigation panel of a home component 3D upon it.
    */
-  private void addAncestorListener(final Component component3D,
-                                   final boolean displayShadowOnFloor) {
-    addAncestorListener(new AncestorListener() {        
-        public void ancestorAdded(AncestorEvent event) {
-          if (offscreenUniverse != null) {
-            throw new IllegalStateException("Can't listen to home changes offscreen and onscreen at the same time");
-          }
-          onscreenUniverse = createUniverse(displayShadowOnFloor, true, false);
-          // Bind universe to canvas3D
-          onscreenUniverse.getViewer().getView().addCanvas3D(component3D instanceof Canvas3D
-              ? (Canvas3D)component3D
-              : ((JCanvas3D)component3D).getOffscreenCanvas3D());
-          component3D.setFocusable(false);
-          updateNavigationPanelImage();
-        }
-        
-        public void ancestorRemoved(AncestorEvent event) {
-          if (onscreenUniverse != null) {
-            onscreenUniverse.cleanup();
-            removeHomeListeners();
-            onscreenUniverse = null;
-          }
-        }
-        
-        public void ancestorMoved(AncestorEvent event) {
-        }        
-      });
+  private static class JCanvas3DWithNavigationPanel extends JCanvas3D {
+    private final HomeComponent3D homeComponent3D;
+
+    public JCanvas3DWithNavigationPanel(HomeComponent3D homeComponent3D,
+                                        GraphicsConfigTemplate3D template) {
+      super(template);
+      this.homeComponent3D = homeComponent3D;
+    }
+
+    public void paintComponent(Graphics g) {
+      super.paintComponent(g);
+      g.drawImage(this.homeComponent3D.navigationPanelImage, 0, 0, this);
+    }
   }
 
   @Override
   public void setVisible(boolean visible) {
     super.setVisible(visible);
-    this.component3D.setVisible(visible);
+    if (this.component3D != null) {
+      this.component3D.setVisible(visible);
+    }
   }
   
   /**
@@ -395,8 +468,7 @@
   private static class NavigationPanelChangeListener implements PropertyChangeListener {
     private final WeakReference<HomeComponent3D>  homeComponent3D;
 
-    public NavigationPanelChangeListener(HomeComponent3D homeComponent3D,
-                                         HomeController3D controller) {
+    public NavigationPanelChangeListener(HomeComponent3D homeComponent3D) {
       this.homeComponent3D = new WeakReference<HomeComponent3D>(homeComponent3D);
     }
     
@@ -682,12 +754,16 @@
     HomeEnvironment homeEnvironment = this.home.getEnvironment();
     homeEnvironment.removePropertyChangeListener(HomeEnvironment.Property.SKY_COLOR, this.skyColorListener);
     homeEnvironment.removePropertyChangeListener(HomeEnvironment.Property.SKY_TEXTURE, this.skyColorListener);
-    homeEnvironment.removePropertyChangeListener(HomeEnvironment.Property.GROUND_COLOR, this.groundColorAndTextureListener);
-    homeEnvironment.removePropertyChangeListener(HomeEnvironment.Property.GROUND_TEXTURE, this.groundColorAndTextureListener);
+    homeEnvironment.removePropertyChangeListener(HomeEnvironment.Property.GROUND_COLOR, this.groundChangeListener);
+    homeEnvironment.removePropertyChangeListener(HomeEnvironment.Property.GROUND_TEXTURE, this.groundChangeListener);
     homeEnvironment.removePropertyChangeListener(HomeEnvironment.Property.LIGHT_COLOR, this.lightColorListener);
     homeEnvironment.removePropertyChangeListener(HomeEnvironment.Property.WALLS_ALPHA, this.wallsAlphaListener);
     homeEnvironment.removePropertyChangeListener(HomeEnvironment.Property.DRAWING_MODE, this.drawingModeListener);
     this.home.getCamera().removePropertyChangeListener(this.cameraChangeListener);
+    this.home.removeLevelsListener(this.levelListener);
+    for (Level level : this.home.getLevels()) {
+      level.removePropertyChangeListener(this.levelChangeListener);
+    }
     this.home.removeWallsListener(this.wallListener);
     for (Wall wall : this.home.getWalls()) {
       wall.removePropertyChangeListener(this.wallChangeListener);
@@ -1228,7 +1304,9 @@
     inputMap.put(KeyStroke.getKeyStroke("shift D"), ActionType.ROTATE_CAMERA_YAW_FAST_RIGHT);
     inputMap.put(KeyStroke.getKeyStroke("RIGHT"), ActionType.ROTATE_CAMERA_YAW_RIGHT);
     inputMap.put(KeyStroke.getKeyStroke("D"), ActionType.ROTATE_CAMERA_YAW_RIGHT);
+    inputMap.put(KeyStroke.getKeyStroke("shift PAGE_UP"), ActionType.ROTATE_CAMERA_PITCH_FAST_UP);
     inputMap.put(KeyStroke.getKeyStroke("PAGE_UP"), ActionType.ROTATE_CAMERA_PITCH_UP);
+    inputMap.put(KeyStroke.getKeyStroke("shift PAGE_DOWN"), ActionType.ROTATE_CAMERA_PITCH_FAST_DOWN);
     inputMap.put(KeyStroke.getKeyStroke("PAGE_DOWN"), ActionType.ROTATE_CAMERA_PITCH_DOWN);
     inputMap.put(KeyStroke.getKeyStroke("shift HOME"), ActionType.ELEVATE_CAMERA_FAST_UP);
     inputMap.put(KeyStroke.getKeyStroke("HOME"), ActionType.ELEVATE_CAMERA_UP);
@@ -1302,7 +1380,9 @@
     actionMap.put(ActionType.ROTATE_CAMERA_YAW_RIGHT, new RotateCameraYawAction((float)Math.PI / 60));
     actionMap.put(ActionType.ROTATE_CAMERA_YAW_FAST_RIGHT, new RotateCameraYawAction((float)Math.PI / 12));
     actionMap.put(ActionType.ROTATE_CAMERA_PITCH_UP, new RotateCameraPitchAction(-(float)Math.PI / 120));
+    actionMap.put(ActionType.ROTATE_CAMERA_PITCH_FAST_UP, new RotateCameraPitchAction(-(float)Math.PI / 24));
     actionMap.put(ActionType.ROTATE_CAMERA_PITCH_DOWN, new RotateCameraPitchAction((float)Math.PI / 120));
+    actionMap.put(ActionType.ROTATE_CAMERA_PITCH_FAST_DOWN, new RotateCameraPitchAction((float)Math.PI / 24));
   }
 
   /**
@@ -1315,7 +1395,7 @@
     // Build scene tree
     root.addChild(createHomeTree(displayShadowOnFloor, listenToHomeUpdates, waitForLoading));
     root.addChild(createBackgroundNode(listenToHomeUpdates, waitForLoading));
-    root.addChild(createGroundNode(-1E5f / 2, -1E5f / 2, 1E5f, 1E5f, listenToHomeUpdates, waitForLoading));
+    root.addChild(createGroundNode(-0.5E7f, -0.5E7f, 1E7f, 1E7f, listenToHomeUpdates, waitForLoading));
 
     // Add default lights
     for (Light light : createLights(listenToHomeUpdates)) {
@@ -1337,17 +1417,18 @@
     backgroundAppearance.setCapability(Appearance.ALLOW_COLORING_ATTRIBUTES_READ);
     backgroundColoringAttributes.setCapability(ColoringAttributes.ALLOW_COLOR_WRITE);
     
-    Geometry halfSphereGeometry = createHalfSphereGeometry();   
+    Geometry halfSphereGeometry = createHalfSphereGeometry(true);   
     final Shape3D halfSphere = new Shape3D(halfSphereGeometry, backgroundAppearance);
     BranchGroup backgroundBranch = new BranchGroup();
     backgroundBranch.addChild(halfSphere);
-    
+    backgroundBranch.addChild(new Shape3D(createHalfSphereGeometry(false)));
+
     final Background background = new Background(backgroundBranch);
     updateBackgroundColorAndTexture(backgroundAppearance, this.home, waitForLoading);
     background.setImageScaleMode(Background.SCALE_FIT_ALL);
     background.setApplicationBounds(new BoundingBox(
-        new Point3d(-1E6, -1E6, -1E6), 
-        new Point3d(1E6, 1E6, 1E6)));    
+        new Point3d(-1E7, -1E7, -1E7), 
+        new Point3d(1E7, 1E7, 1E7)));    
     
     if (listenToHomeUpdates) {
       // Add a listener on sky color and texture properties change 
@@ -1368,10 +1449,11 @@
    * Returns a half sphere oriented inward and with texture ordinates 
    * that spread along an hemisphere. 
    */
-  private Geometry createHalfSphereGeometry() {
+  private Geometry createHalfSphereGeometry(boolean top) {
     final int divisionCount = 48; 
     Point3f [] coords = new Point3f [divisionCount * divisionCount];
-    TexCoord2f [] textureCoords = new TexCoord2f [divisionCount * divisionCount];
+    TexCoord2f [] textureCoords = top ? new TexCoord2f [divisionCount * divisionCount] : null;
+    Color3f [] colors = top ? null : new Color3f [divisionCount * divisionCount];
     for (int i = 0, k = 0; i < divisionCount; i++) {
       double alpha = i * 2 * Math.PI / divisionCount;
       float cosAlpha = (float)Math.cos(alpha);
@@ -1384,28 +1466,52 @@
         float cosBeta = (float)Math.cos(beta);
         float sinBeta = (float)Math.sin(beta);
         // Correct the bottom of the hemisphere to avoid seeing a black line at the horizon
-        float y = j != 0 ? sinBeta : -0.05f;
+        float y = j != 0 ? (top ? sinBeta : -sinBeta) : -0.01f;
         double nextBeta = 2 * (j + 1) * Math.PI / divisionCount;
+        if (!top) {
+          nextBeta = -nextBeta;
+        }
         float cosNextBeta = (float)Math.cos(nextBeta);
         float sinNextBeta = (float)Math.sin(nextBeta);
-        coords [k] = new Point3f(cosAlpha * cosBeta, y, sinAlpha * cosBeta);
-        textureCoords [k++] = new TexCoord2f((float)i / divisionCount, sinBeta); 
-        
-        coords [k] = new Point3f(cosNextAlpha * cosBeta, y, sinNextAlpha * cosBeta);
-        textureCoords [k++] = new TexCoord2f((float)(i + 1) / divisionCount, sinBeta); 
-        
-        coords [k] = new Point3f(cosNextAlpha * cosNextBeta, sinNextBeta, sinNextAlpha * cosNextBeta);
-        textureCoords [k++] = new TexCoord2f((float)(i + 1) / divisionCount, sinNextBeta); 
-        
-        coords [k] = new Point3f(cosAlpha * cosNextBeta, sinNextBeta, sinAlpha * cosNextBeta);
-        textureCoords [k++] = new TexCoord2f((float)i / divisionCount, sinNextBeta); 
+        if (top) {
+          coords [k] = new Point3f(cosAlpha * cosBeta, y, sinAlpha * cosBeta);
+          textureCoords [k++] = new TexCoord2f((float)i / divisionCount, sinBeta); 
+          
+          coords [k] = new Point3f(cosNextAlpha * cosBeta, y, sinNextAlpha * cosBeta);
+          textureCoords [k++] = new TexCoord2f((float)(i + 1) / divisionCount, sinBeta); 
+          
+          coords [k] = new Point3f(cosNextAlpha * cosNextBeta, sinNextBeta, sinNextAlpha * cosNextBeta);
+          textureCoords [k++] = new TexCoord2f((float)(i + 1) / divisionCount, sinNextBeta); 
+          
+          coords [k] = new Point3f(cosAlpha * cosNextBeta, sinNextBeta, sinAlpha * cosNextBeta);
+          textureCoords [k++] = new TexCoord2f((float)i / divisionCount, sinNextBeta);
+        } else {
+          coords [k] = new Point3f(cosAlpha * cosBeta, y, sinAlpha * cosBeta);
+          float color1 = .9f + y * .5f;
+          colors [k++] = new Color3f(color1, color1, color1);
+          
+          coords [k] = new Point3f(cosAlpha * cosNextBeta, sinNextBeta, sinAlpha * cosNextBeta);
+          float color2 = .9f + sinNextBeta * .5f;
+          colors [k++] = new Color3f(color2, color2, color2);
+          
+          coords [k] = new Point3f(cosNextAlpha * cosNextBeta, sinNextBeta, sinNextAlpha * cosNextBeta);
+          colors [k++] = new Color3f(color2, color2, color2);
+          
+          coords [k] = new Point3f(cosNextAlpha * cosBeta, y, sinNextAlpha * cosBeta);
+          colors [k++] = new Color3f(color1, color1, color1);
+        }
       }
     }
     
     GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.QUAD_ARRAY);
     geometryInfo.setCoordinates(coords);
-    geometryInfo.setTextureCoordinateParams(1, 2);
-    geometryInfo.setTextureCoordinates(0, textureCoords);
+    if (textureCoords != null) {
+      geometryInfo.setTextureCoordinateParams(1, 2);
+      geometryInfo.setTextureCoordinates(0, textureCoords);
+    }
+    if (colors != null) {
+      geometryInfo.setColors(colors);
+    }
     geometryInfo.indexify();
     geometryInfo.compact();
     Geometry halfSphereGeometry = geometryInfo.getIndexedGeometryArray();
@@ -1458,17 +1564,26 @@
     
     if (listenToHomeUpdates) {
       // Add a listener on ground color and texture properties change 
-      this.groundColorAndTextureListener = new PropertyChangeListener() {
+      this.groundChangeListener = new PropertyChangeListener() {
+          private Runnable updater;
           public void propertyChange(PropertyChangeEvent ev) {
-            ground3D.update();
+            if (this.updater == null) {
+              // Group updates
+              EventQueue.invokeLater(this.updater = new Runnable () {
+                public void run() {
+                  ground3D.update();
+                  updater = null;
+                }
+              });
+            }
             clearPrintedImageCache();
           }
         };
       HomeEnvironment homeEnvironment = this.home.getEnvironment();
       homeEnvironment.addPropertyChangeListener(
-          HomeEnvironment.Property.GROUND_COLOR, this.groundColorAndTextureListener); 
+          HomeEnvironment.Property.GROUND_COLOR, this.groundChangeListener); 
       homeEnvironment.addPropertyChangeListener(
-          HomeEnvironment.Property.GROUND_TEXTURE, this.groundColorAndTextureListener);
+          HomeEnvironment.Property.GROUND_TEXTURE, this.groundChangeListener);
     }
     
     return transformGroup;
@@ -1551,7 +1666,8 @@
     }
     
     if (listenToHomeUpdates) {
-      // Add wall, furniture, room listeners to home for further update    
+      // Add level, wall, furniture, room listeners to home for further update    
+      addLevelListener(homeRoot);
       addWallListener(homeRoot);
       addFurnitureListener(homeRoot);
       addRoomListener(homeRoot);
@@ -1576,14 +1692,58 @@
   }
 
   /**
+   * Adds a wall listener to home levels that updates the children of the given 
+   * <code>group</code>, each time a level is added, updated or deleted. 
+   */
+  private void addLevelListener(final Group group) {
+    this.levelChangeListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          if (Level.Property.ELEVATION.name().equals(ev.getPropertyName())
+              || Level.Property.VISIBLE.name().equals(ev.getPropertyName())) {
+            updateObjects(home.getWalls());          
+            updateObjects(home.getRooms());
+            updateObjects(home.getFurniture());
+            groundChangeListener.propertyChange(null);
+          } else if (Level.Property.FLOOR_THICKNESS.name().equals(ev.getPropertyName())) {
+            updateObjects(home.getWalls());          
+          } else if (Level.Property.HEIGHT.name().equals(ev.getPropertyName())) {
+            updateObjects(home.getRooms());
+          }  
+        }
+      };
+    for (Level level : this.home.getLevels()) {
+      level.addPropertyChangeListener(this.levelChangeListener);
+    }      
+    this.levelListener = new CollectionListener<Level>() {
+        public void collectionChanged(CollectionEvent<Level> ev) {
+          Level level = ev.getItem();
+          switch (ev.getType()) {
+            case ADD :
+              level.addPropertyChangeListener(levelChangeListener);
+              break;
+            case DELETE :
+              level.removePropertyChangeListener(levelChangeListener);
+              break;
+          }
+          updateObjects(home.getRooms());
+        }
+      };
+    this.home.addLevelsListener(this.levelListener);
+  }
+
+  /**
    * Adds a wall listener to home walls that updates the children of the given 
    * <code>group</code>, each time a wall is added, updated or deleted. 
    */
   private void addWallListener(final Group group) {
     this.wallChangeListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
-          updateWall((Wall)ev.getSource());          
+          Wall updatedWall = (Wall)ev.getSource();
+          updateWall(updatedWall);          
           updateObjects(home.getRooms());
+          if (updatedWall.getLevel() != null && updatedWall.getLevel().getElevation() < 0) {
+            groundChangeListener.propertyChange(null);
+          }
         }
       };
     for (Wall wall : this.home.getWalls()) {
@@ -1603,6 +1763,7 @@
               break;
           }
           updateObjects(home.getRooms());
+          groundChangeListener.propertyChange(null);
         }
       };
     this.home.addWallsListener(this.wallListener);
@@ -1615,25 +1776,32 @@
   private void addFurnitureListener(final Group group) {
     this.furnitureChangeListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
-        if (HomePieceOfFurniture.Property.X.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.X.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.Y.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.ANGLE.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.WIDTH.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.DEPTH.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.HEIGHT.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.ELEVATION.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.COLOR.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.TEXTURE.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.SHININESS.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.MODEL_MIRRORED.name().equals(ev.getPropertyName())
-            || HomePieceOfFurniture.Property.VISIBLE.name().equals(ev.getPropertyName())) {
-              HomePieceOfFurniture piece = (HomePieceOfFurniture)ev.getSource();
-              updateObjects(Arrays.asList(new HomePieceOfFurniture [] {piece}));
-              // If piece is or contains a door or a window, update walls that intersect with piece
-              if (containsDoorsAndWindows(piece)) {
-                updateObjects(home.getWalls());
-              }
+          HomePieceOfFurniture updatedPiece = (HomePieceOfFurniture)ev.getSource();
+          String propertyName = ev.getPropertyName();
+          if (HomePieceOfFurniture.Property.X.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.Y.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.ANGLE.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.WIDTH.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.DEPTH.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.HEIGHT.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.ELEVATION.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.MODEL_MIRRORED.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.VISIBLE.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.LEVEL.name().equals(propertyName)) {
+            updateObjects(Arrays.asList(new HomePieceOfFurniture [] {updatedPiece}));
+            // If piece is or contains a door or a window, update walls that intersect with piece
+            if (containsDoorsAndWindows(updatedPiece)) {
+              updateObjects(home.getWalls());
+            } else if (containsStaircases(updatedPiece)) {
+              updateObjects(home.getRooms());
+            }
+            if (updatedPiece.getLevel() != null && updatedPiece.getLevel().getElevation() < 0) {
+              groundChangeListener.propertyChange(null);
+            }
+          } else if (HomePieceOfFurniture.Property.COLOR.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.TEXTURE.name().equals(propertyName)
+              || HomePieceOfFurniture.Property.SHININESS.name().equals(propertyName)) {
+            updateObjects(Arrays.asList(new HomePieceOfFurniture [] {updatedPiece}));
           }
         }
       };
@@ -1656,7 +1824,10 @@
           // If piece is or contains a door or a window, update walls that intersect with piece
           if (containsDoorsAndWindows(piece)) {
             updateObjects(home.getWalls());
+          } else if (containsStaircases(piece)) {
+            updateObjects(home.getRooms());
           }
+          groundChangeListener.propertyChange(null);
         }
       };
     this.home.addFurnitureListener(this.furnitureListener);
@@ -1679,34 +1850,59 @@
   }
   
   /**
+   * Returns <code>true</code> if the given <code>piece</code> is or contains a staircase
+   * with a top cut out shape.  
+   */
+  private boolean containsStaircases(HomePieceOfFurniture piece) {
+    if (piece instanceof HomeFurnitureGroup) {
+      for (HomePieceOfFurniture groupPiece : ((HomeFurnitureGroup)piece).getFurniture()) {
+        if (containsStaircases(groupPiece)) {
+          return true;
+        }
+      }
+      return false;
+    } else {
+      return piece.getStaircaseCutOutShape() != null;
+    }
+  }
+  
+  /**
    * Adds a room listener to home rooms that updates the children of the given 
    * <code>group</code>, each time a room is added, updated or deleted. 
    */
   private void addRoomListener(final Group group) {
     this.roomChangeListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
-          if (Room.Property.FLOOR_COLOR.name().equals(ev.getPropertyName())
-              || Room.Property.FLOOR_TEXTURE.name().equals(ev.getPropertyName())
-              || Room.Property.FLOOR_SHININESS.name().equals(ev.getPropertyName())
-              || Room.Property.CEILING_COLOR.name().equals(ev.getPropertyName())
-              || Room.Property.CEILING_TEXTURE.name().equals(ev.getPropertyName())
-              || Room.Property.CEILING_SHININESS.name().equals(ev.getPropertyName())) {
-            updateObjects(Arrays.asList(new Room [] {(Room)ev.getSource()}));
-          } else if (Room.Property.FLOOR_VISIBLE.name().equals(ev.getPropertyName())
-              || Room.Property.CEILING_VISIBLE.name().equals(ev.getPropertyName())) {   
+          Room updatedRoom = (Room)ev.getSource();
+          String propertyName = ev.getPropertyName();
+          if (Room.Property.FLOOR_COLOR.name().equals(propertyName)
+              || Room.Property.FLOOR_TEXTURE.name().equals(propertyName)
+              || Room.Property.FLOOR_SHININESS.name().equals(propertyName)
+              || Room.Property.CEILING_COLOR.name().equals(propertyName)
+              || Room.Property.CEILING_TEXTURE.name().equals(propertyName)
+              || Room.Property.CEILING_SHININESS.name().equals(propertyName)) {
+            updateObjects(Arrays.asList(new Room [] {updatedRoom}));
+          } else if (Room.Property.FLOOR_VISIBLE.name().equals(propertyName)
+              || Room.Property.CEILING_VISIBLE.name().equals(propertyName)
+              || Room.Property.LEVEL.name().equals(propertyName)) {   
             updateObjects(home.getRooms());
-            groundColorAndTextureListener.propertyChange(null);
-          } else if (Room.Property.POINTS.name().equals(ev.getPropertyName())) {   
+            groundChangeListener.propertyChange(null);
+          } else if (Room.Property.POINTS.name().equals(propertyName)) {   
             if (homeObjectsToUpdate != null) {
               // Don't try to optimize if more than one room to update
               updateObjects(home.getRooms());
             } else {
-              updateObjects(Arrays.asList(new Room [] {(Room)ev.getSource()}));
+              updateObjects(Arrays.asList(new Room [] {updatedRoom}));
               // Search the rooms that overlap the updated one
               Area oldArea = getArea((float [][])ev.getOldValue());
               Area newArea = getArea((float [][])ev.getNewValue());
+              Level updatedRoomLevel = updatedRoom.getLevel(); 
               for (Room room : home.getRooms()) {
-                if (room != ev.getSource()) {
+                Level roomLevel = room.getLevel();
+                if (room != updatedRoom
+                    && (roomLevel == null
+                        || Math.abs(updatedRoomLevel.getElevation() + updatedRoomLevel.getHeight() - (roomLevel.getElevation() + roomLevel.getHeight())) < 1E-5
+                        || Math.abs(updatedRoomLevel.getElevation() + updatedRoomLevel.getHeight() - (roomLevel.getElevation() - roomLevel.getFloorThickness())) < 1E-5)) {
                   Area roomAreaIntersectionWithOldArea = getArea(room.getPoints());
                   Area roomAreaIntersectionWithNewArea = new Area(roomAreaIntersectionWithOldArea);
                   roomAreaIntersectionWithNewArea.intersect(newArea);                  
@@ -1721,7 +1917,7 @@
                 }
               }              
             }
-            groundColorAndTextureListener.propertyChange(null);
+            groundChangeListener.propertyChange(null);
           }            
         }
         
@@ -1754,7 +1950,7 @@
               break;
           }
           updateObjects(home.getRooms());
-          groundColorAndTextureListener.propertyChange(null);
+          groundChangeListener.propertyChange(null);
         }
       };
     this.home.addRoomsListener(this.roomListener);
@@ -1768,6 +1964,7 @@
     this.wallsAlphaListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
           updateObjects(home.getWalls());
+          updateObjects(home.getRooms());
         }
       };
     this.home.getEnvironment().addPropertyChangeListener(
@@ -1870,10 +2067,15 @@
   }
 
   /**
-   * Adds to <code>homeRoot</code> a shape matching the shadow of furniture at ground level.
+   * Adds to <code>homeRoot</code> shapes matching the shadow of furniture at their level.
    */
   private void addShadowOnFloor(Group homeRoot, Map<HomePieceOfFurniture, Node> pieces3D) {
-    Area areaOnFloor = new Area();
+    Comparator<Level> levelComparator = new Comparator<Level>() {
+        public int compare(Level level1, Level level2) {
+          return Float.compare(level1.getElevation(), level2.getElevation());
+        }
+      };
+    Map<Level, Area> areasOnLevel = new TreeMap<Level, Area>(levelComparator);
     // Compute union of the areas of pieces at ground level that are not lights, doors or windows
     for (Map.Entry<HomePieceOfFurniture, Node> object3DEntry : pieces3D.entrySet()) {
       if (object3DEntry.getKey() instanceof HomePieceOfFurniture) {
@@ -1886,42 +2088,56 @@
             && !piece.isDoorOrWindow()
             && !(piece instanceof com.eteks.sweethome3d.model.Light)) {
           Area pieceAreaOnFloor = ModelManager.getInstance().getAreaOnFloor(object3DEntry.getValue());
-          areaOnFloor.add(pieceAreaOnFloor);
+          Level level = piece.getLevel();
+          if (piece.getLevel() == null) {
+            level = new Level("Dummy", 0, 0, 0);
+          }
+          if (level.isVisible()) {
+            Area areaOnLevel = areasOnLevel.get(level);
+            if (areaOnLevel == null) {
+              areaOnLevel = new Area();
+              areasOnLevel.put(level, areaOnLevel);
+            }
+            areaOnLevel.add(pieceAreaOnFloor);
+          }
         }
       }
     }
     
-    // Create the 3D shape matching computed area
-    List<Point3f> coords = new ArrayList<Point3f>();
-    List<Integer> stripCounts = new ArrayList<Integer>();
-    int pointsCount = 0;
-    float [] modelPoint = new float[2];
-    for (PathIterator it = areaOnFloor.getPathIterator(null); !it.isDone(); ) {
-      if (it.currentSegment(modelPoint) == PathIterator.SEG_CLOSE) {
-        stripCounts.add(pointsCount);
-        pointsCount = 0;
-      } else {
-        coords.add(new Point3f(modelPoint [0], 0.49f, modelPoint [1]));
-        pointsCount++;
+    // Create the 3D shape matching computed areas
+    Shape3D shadow = new Shape3D();
+    for (Map.Entry<Level, Area> levelArea : areasOnLevel.entrySet()) {
+      List<Point3f> coords = new ArrayList<Point3f>();
+      List<Integer> stripCounts = new ArrayList<Integer>();
+      int pointsCount = 0;
+      float [] modelPoint = new float[2];
+      for (PathIterator it = levelArea.getValue().getPathIterator(null); !it.isDone(); ) {
+        if (it.currentSegment(modelPoint) == PathIterator.SEG_CLOSE) {
+          stripCounts.add(pointsCount);
+          pointsCount = 0;
+        } else {
+          coords.add(new Point3f(modelPoint [0], levelArea.getKey().getElevation() + 0.49f, modelPoint [1]));
+          pointsCount++;
+        }
+        it.next();
       }
-      it.next();
-    }
-
-    if (coords.size() > 0) {
-      GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY);
-      geometryInfo.setCoordinates (coords.toArray(new Point3f [coords.size()]));
-      int [] stripCountsArray = new int [stripCounts.size()];
-      for (int i = 0; i < stripCountsArray.length; i++) {
-        stripCountsArray [i] = stripCounts.get(i);
+  
+      if (coords.size() > 0) {
+        GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY);
+        geometryInfo.setCoordinates (coords.toArray(new Point3f [coords.size()]));
+        int [] stripCountsArray = new int [stripCounts.size()];
+        for (int i = 0; i < stripCountsArray.length; i++) {
+          stripCountsArray [i] = stripCounts.get(i);
+        }
+        geometryInfo.setStripCounts(stripCountsArray);
+        shadow.addGeometry(geometryInfo.getIndexedGeometryArray());
       }
-      geometryInfo.setStripCounts(stripCountsArray);
- 
-      Shape3D shadow = new Shape3D(geometryInfo.getIndexedGeometryArray());
-      Appearance shadowAppearance = new Appearance();
-      shadowAppearance.setColoringAttributes(new ColoringAttributes(new Color3f(), ColoringAttributes.SHADE_FLAT));
-      shadowAppearance.setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.7f));
-      shadow.setAppearance(shadowAppearance);    
-      homeRoot.addChild(shadow);
     }
+    
+    Appearance shadowAppearance = new Appearance();
+    shadowAppearance.setColoringAttributes(new ColoringAttributes(new Color3f(), ColoringAttributes.SHADE_FLAT));
+    shadowAppearance.setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.7f));
+    shadow.setAppearance(shadowAppearance);    
+    homeRoot.addChild(shadow);
   }
 }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomeComponent3D.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomeComponent3D.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomeComponent3D.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomeComponent3D.properties	2011-12-21 00:48:52.000000000 +0000
@@ -17,7 +17,7 @@
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
 
-# Resources for Home3DAttributesPanel class
+# Resources for HomeComponent3D class
 # Note to translators: do not localize this file
 navigationPanel.icon=
 TURN_LEFT.SmallIcon=resources/icons/tango/go-previous.png
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomeFurniturePanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomeFurniturePanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomeFurniturePanel.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomeFurniturePanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -113,7 +113,7 @@
     
     // Create name label and its text field bound to NAME controller property
     this.nameLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, HomeFurniturePanel.class, "nameLabel.text"));
-    this.nameTextField = new JTextField(controller.getName(), 15);
+    this.nameTextField = new AutoCompleteTextField(controller.getName(), 15, preferences.getAutoCompletionStrings("HomePieceOfFurnitureName"));
     if (!OperatingSystem.isMacOSXLeopardOrSuperior()) {
       SwingTools.addAutoSelectionOnFocusGain(this.nameTextField);
     }
@@ -167,8 +167,9 @@
     // Create X label and its spinner bound to X controller property
     this.xLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         HomeFurniturePanel.class, "xLabel.text", unitName));
+    final float maximumLength = preferences.getLengthUnit().getMaximumLength();
     final NullableSpinner.NullableSpinnerLengthModel xSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, -100000f, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, -maximumLength, maximumLength);
     this.xSpinner = new NullableSpinner(xSpinnerModel);
     xSpinnerModel.setNullable(controller.getX() == null);
     xSpinnerModel.setLength(controller.getX());
@@ -191,7 +192,7 @@
     this.yLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         HomeFurniturePanel.class, "yLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel ySpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, -100000f, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, -maximumLength, maximumLength);
     this.ySpinner = new NullableSpinner(ySpinnerModel);
     ySpinnerModel.setNullable(controller.getY() == null);
     ySpinnerModel.setLength(controller.getY());
@@ -214,7 +215,7 @@
     this.elevationLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         HomeFurniturePanel.class, "elevationLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel elevationSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0f, 2500f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0f, preferences.getLengthUnit().getMaximumElevation());
     this.elevationSpinner = new NullableSpinner(elevationSpinnerModel);
     elevationSpinnerModel.setNullable(controller.getElevation() == null);
     elevationSpinnerModel.setLength(controller.getElevation());
@@ -297,7 +298,7 @@
         HomeFurniturePanel.class, "widthLabel.text", unitName));
     final float minimumLength = preferences.getLengthUnit().getMinimumLength();
     final NullableSpinner.NullableSpinnerLengthModel widthSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength);
     this.widthSpinner = new NullableSpinner(widthSpinnerModel);
     final PropertyChangeListener widthChangeListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
@@ -323,7 +324,7 @@
     this.depthLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         HomeFurniturePanel.class, "depthLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel depthSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength);
     this.depthSpinner = new NullableSpinner(depthSpinnerModel);
     final PropertyChangeListener depthChangeListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
@@ -349,7 +350,7 @@
     this.heightLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         HomeFurniturePanel.class, "heightLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel heightSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength);
     this.heightSpinner = new NullableSpinner(heightSpinnerModel);
     final PropertyChangeListener heightChangeListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomePane.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomePane.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomePane.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomePane.java	2011-12-21 00:48:52.000000000 +0000
@@ -23,20 +23,20 @@
 import java.awt.Component;
 import java.awt.ComponentOrientation;
 import java.awt.Container;
+import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.FocusTraversalPolicy;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.KeyboardFocusManager;
 import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
+import java.awt.dnd.DragSource;
 import java.awt.event.ActionEvent;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
@@ -47,6 +47,7 @@
 import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.geom.Rectangle2D;
@@ -62,19 +63,19 @@
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.lang.ref.WeakReference;
+import java.security.AccessControlException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import javax.jnlp.BasicService;
-import javax.jnlp.ServiceManager;
-import javax.jnlp.UnavailableServiceException;
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.ActionMap;
@@ -121,6 +122,9 @@
 import javax.swing.event.HyperlinkListener;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
+import javax.swing.event.MouseInputAdapter;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 import javax.swing.event.SwingPropertyChangeSupport;
 import javax.swing.text.JTextComponent;
 
@@ -131,13 +135,20 @@
 import com.eteks.sweethome3d.j3d.Wall3D;
 import com.eteks.sweethome3d.model.BackgroundImage;
 import com.eteks.sweethome3d.model.Camera;
+import com.eteks.sweethome3d.model.CatalogPieceOfFurniture;
+import com.eteks.sweethome3d.model.CollectionEvent;
+import com.eteks.sweethome3d.model.CollectionListener;
+import com.eteks.sweethome3d.model.Compass;
 import com.eteks.sweethome3d.model.Content;
 import com.eteks.sweethome3d.model.DimensionLine;
+import com.eteks.sweethome3d.model.Elevatable;
 import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.HomeEnvironment;
 import com.eteks.sweethome3d.model.HomeFurnitureGroup;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.InterruptedRecorderException;
 import com.eteks.sweethome3d.model.Label;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.RecorderException;
 import com.eteks.sweethome3d.model.Room;
 import com.eteks.sweethome3d.model.Selectable;
@@ -154,6 +165,7 @@
 import com.eteks.sweethome3d.viewcontroller.HomeController;
 import com.eteks.sweethome3d.viewcontroller.HomeView;
 import com.eteks.sweethome3d.viewcontroller.PlanController;
+import com.eteks.sweethome3d.viewcontroller.PlanView;
 import com.eteks.sweethome3d.viewcontroller.View;
 
 /**
@@ -163,7 +175,7 @@
 public class HomePane extends JRootPane implements HomeView {
   private enum MenuActionType {FILE_MENU, EDIT_MENU, FURNITURE_MENU, PLAN_MENU, VIEW_3D_MENU, HELP_MENU, 
       OPEN_RECENT_HOME_MENU, SORT_HOME_FURNITURE_MENU, DISPLAY_HOME_FURNITURE_PROPERTY_MENU, MODIFY_TEXT_STYLE, 
-      GO_TO_POINT_OF_VIEW}
+      GO_TO_POINT_OF_VIEW, SELECT_OBJECT_MENU}
   
   private static final String MAIN_PANE_DIVIDER_LOCATION_VISUAL_PROPERTY     = "com.eteks.sweethome3d.SweetHome3D.MainPaneDividerLocation";
   private static final String CATALOG_PANE_DIVIDER_LOCATION_VISUAL_PROPERTY  = "com.eteks.sweethome3d.SweetHome3D.CatalogPaneDividerLocation";
@@ -198,11 +210,18 @@
   // the matching tool bar buttons
   private final JToggleButton.ToggleButtonModel viewFromTopToggleModel;
   private final JToggleButton.ToggleButtonModel viewFromObserverToggleModel;
+  // Button models shared by Display all levels and Display selected level menu items and
+  // the matching tool bar buttons
+  private final JToggleButton.ToggleButtonModel displayAllLevelsToggleModel;
+  private final JToggleButton.ToggleButtonModel displaySelectedLevelToggleModel;
   private JComponent                            lastFocusedComponent;
   private PlanController.Mode                   previousPlanControllerMode;
   private TransferHandler                       catalogTransferHandler;
   private TransferHandler                       furnitureTransferHandler;
   private TransferHandler                       planTransferHandler;
+  private boolean                               transferHandlerEnabled;
+  private MouseInputAdapter                     furnitureCatalogDragAndDropListener;
+  private boolean                               clipboardEmpty = true;
   private ActionMap                             menuActionMap;
   private List<Action>                          pluginActions;
   
@@ -210,7 +229,7 @@
    * Creates home view associated with its controller.
    */
   public HomePane(Home home, UserPreferences preferences, 
-                  HomeController controller) {
+                  final HomeController controller) {
     this.home = home;
     this.preferences = preferences;
     this.controller = controller;
@@ -255,11 +274,24 @@
     this.viewFromTopToggleModel.setSelected(home.getCamera() == home.getTopCamera());
     this.viewFromObserverToggleModel = new JToggleButton.ToggleButtonModel();
     this.viewFromObserverToggleModel.setSelected(home.getCamera() == home.getObserverCamera());
-
+    
     ButtonGroup viewGroup = new ButtonGroup();
     this.viewFromTopToggleModel.setGroup(viewGroup);
     this.viewFromObserverToggleModel.setGroup(viewGroup);
 
+    // Create unique toggle button models for level display management
+    // so the matching menu items and tool bar buttons 
+    // always reflect the same toggle state at screen
+    this.displayAllLevelsToggleModel = new JToggleButton.ToggleButtonModel();
+    boolean allLevelsVisible = home.getEnvironment().isAllLevelsVisible();
+    this.displayAllLevelsToggleModel.setSelected(allLevelsVisible);
+    this.displaySelectedLevelToggleModel = new JToggleButton.ToggleButtonModel();
+    this.displaySelectedLevelToggleModel.setSelected(!allLevelsVisible);
+    
+    ButtonGroup displayLevelGroup = new ButtonGroup();
+    this.displayAllLevelsToggleModel.setGroup(displayLevelGroup);
+    this.displaySelectedLevelToggleModel.setGroup(displayLevelGroup);
+
     JPopupMenu.setDefaultLightWeightPopupEnabled(false);
     ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);    
     
@@ -268,6 +300,7 @@
     createPluginActions(controller.getPlugins());
     createTransferHandlers(home, controller);
     addHomeListener(home);
+    addLevelVisibilityListener(home);
     addLanguageListener(preferences);
     addPlanControllerListener(controller.getPlanController());
     addFocusListener();
@@ -312,9 +345,9 @@
     
     createAction(ActionType.UNDO, preferences, controller, "undo");
     createAction(ActionType.REDO, preferences, controller, "redo");
-    createClipboardAction(ActionType.CUT, preferences, TransferHandler.getCutAction());
-    createClipboardAction(ActionType.COPY, preferences, TransferHandler.getCopyAction());
-    createClipboardAction(ActionType.PASTE, preferences, TransferHandler.getPasteAction());
+    createClipboardAction(ActionType.CUT, preferences, TransferHandler.getCutAction(), true);
+    createClipboardAction(ActionType.COPY, preferences, TransferHandler.getCopyAction(), true);
+    createClipboardAction(ActionType.PASTE, preferences, TransferHandler.getPasteAction(), false);
     createAction(ActionType.DELETE, preferences, controller, "delete");
     createAction(ActionType.SELECT_ALL, preferences, controller, "selectAll");
     
@@ -358,6 +391,8 @@
         furnitureController, "toggleFurnitureSort", HomePieceOfFurniture.SortableProperty.ELEVATION);
     createAction(ActionType.SORT_HOME_FURNITURE_BY_ANGLE, preferences, 
         furnitureController, "toggleFurnitureSort", HomePieceOfFurniture.SortableProperty.ANGLE);
+    createAction(ActionType.SORT_HOME_FURNITURE_BY_LEVEL, preferences, 
+        furnitureController, "toggleFurnitureSort", HomePieceOfFurniture.SortableProperty.LEVEL);
     createAction(ActionType.SORT_HOME_FURNITURE_BY_COLOR, preferences, 
         furnitureController, "toggleFurnitureSort", HomePieceOfFurniture.SortableProperty.COLOR);
     createAction(ActionType.SORT_HOME_FURNITURE_BY_TEXTURE, preferences, 
@@ -396,6 +431,8 @@
         furnitureController, "toggleFurnitureVisibleProperty", HomePieceOfFurniture.SortableProperty.ELEVATION);
     createAction(ActionType.DISPLAY_HOME_FURNITURE_ANGLE, preferences, 
         furnitureController, "toggleFurnitureVisibleProperty", HomePieceOfFurniture.SortableProperty.ANGLE);
+    createAction(ActionType.DISPLAY_HOME_FURNITURE_LEVEL, preferences, 
+        furnitureController, "toggleFurnitureVisibleProperty", HomePieceOfFurniture.SortableProperty.LEVEL);
     createAction(ActionType.DISPLAY_HOME_FURNITURE_COLOR, preferences, 
         furnitureController, "toggleFurnitureVisibleProperty", HomePieceOfFurniture.SortableProperty.COLOR);
     createAction(ActionType.DISPLAY_HOME_FURNITURE_TEXTURE, preferences, 
@@ -464,6 +501,12 @@
           controller, "showBackgroundImage");
       createAction(ActionType.DELETE_BACKGROUND_IMAGE, preferences, 
           controller, "deleteBackgroundImage");
+      createAction(ActionType.ADD_LEVEL, preferences, 
+          controller.getPlanController(), "addLevel");
+      createAction(ActionType.MODIFY_LEVEL, preferences, 
+          controller.getPlanController(), "modifySelectedLevel");
+      createAction(ActionType.DELETE_LEVEL, preferences, 
+          controller.getPlanController(), "deleteSelectedLevel");
       createAction(ActionType.ZOOM_IN, preferences, controller, "zoomIn");
       createAction(ActionType.ZOOM_OUT, preferences, controller, "zoomOut");
       createAction(ActionType.EXPORT_TO_SVG, preferences, controller, "exportToSVG");
@@ -476,6 +519,10 @@
           controller.getHomeController3D(), "viewFromObserver");
       createAction(ActionType.STORE_POINT_OF_VIEW, preferences, 
           controller, "storeCamera");
+      createAction(ActionType.DISPLAY_ALL_LEVELS, preferences, 
+          controller.getHomeController3D(), "displayAllLevels");
+      createAction(ActionType.DISPLAY_SELECTED_LEVEL, preferences, 
+          controller.getHomeController3D(), "displaySelectedLevel");
       getActionMap().put(ActionType.DETACH_3D_VIEW, 
           new ResourceAction(preferences, HomePane.class, ActionType.DETACH_3D_VIEW.name()) {
             @Override
@@ -525,10 +572,14 @@
    */
   private void createClipboardAction(ActionType actionType,
                                      UserPreferences preferences,
-                                     final Action clipboardAction) {
+                                     final Action clipboardAction,
+                                     final boolean copyAction) {
     getActionMap().put(actionType,
         new ResourceAction (preferences, HomePane.class, actionType.name()) {
           public void actionPerformed(ActionEvent ev) {
+            if (copyAction) {
+              clipboardEmpty = false;
+            }
             ev = new ActionEvent(lastFocusedComponent, ActionEvent.ACTION_PERFORMED, null);
             clipboardAction.actionPerformed(ev);
           }
@@ -552,6 +603,7 @@
     createMenuAction(preferences, MenuActionType.DISPLAY_HOME_FURNITURE_PROPERTY_MENU);
     createMenuAction(preferences, MenuActionType.MODIFY_TEXT_STYLE);
     createMenuAction(preferences, MenuActionType.GO_TO_POINT_OF_VIEW);
+    createMenuAction(preferences, MenuActionType.SELECT_OBJECT_MENU);
   }
   
   /**
@@ -584,7 +636,8 @@
   private void createTransferHandlers(Home home, 
                                       HomeController controller) {
     this.catalogTransferHandler = 
-        new FurnitureCatalogTransferHandler(controller.getContentManager(), controller.getFurnitureCatalogController());
+        new FurnitureCatalogTransferHandler(controller.getContentManager(), 
+            controller.getFurnitureCatalogController(), controller.getFurnitureController());
     this.furnitureTransferHandler = 
         new FurnitureTransferHandler(home, controller.getContentManager(), controller);
     this.planTransferHandler = 
@@ -608,6 +661,22 @@
   }
 
   /**
+   * Adds listener to <code>home</code> to update
+   * Display all levels and Display selected level toggle models 
+   * according their visibility.
+   */
+  private void addLevelVisibilityListener(final Home home) {
+    home.getEnvironment().addPropertyChangeListener(HomeEnvironment.Property.ALL_LEVELS_VISIBLE, 
+        new PropertyChangeListener() {
+          public void propertyChange(PropertyChangeEvent ev) {
+            boolean allLevelsVisible = home.getEnvironment().isAllLevelsVisible();
+            displayAllLevelsToggleModel.setSelected(allLevelsVisible);
+            displaySelectedLevelToggleModel.setSelected(!allLevelsVisible);
+          }
+        });
+  }
+
+  /**
    * Adds a property change listener to <code>preferences</code> to update
    * actions when preferred language changes.
    */
@@ -951,6 +1020,10 @@
     }
     addActionToMenu(ActionType.DELETE_BACKGROUND_IMAGE, planMenu);
     planMenu.addSeparator();
+    addActionToMenu(ActionType.ADD_LEVEL, planMenu);
+    addActionToMenu(ActionType.MODIFY_LEVEL, planMenu);
+    addActionToMenu(ActionType.DELETE_LEVEL, planMenu);
+    planMenu.addSeparator();
     addActionToMenu(ActionType.ZOOM_IN, planMenu);
     addActionToMenu(ActionType.ZOOM_OUT, planMenu);
     planMenu.addSeparator();
@@ -963,12 +1036,19 @@
     addToggleActionToMenu(ActionType.VIEW_FROM_OBSERVER, 
         this.viewFromObserverToggleModel, true, preview3DMenu);
     addActionToMenu(ActionType.STORE_POINT_OF_VIEW, preview3DMenu);
-    preview3DMenu.add(createGoToPointOfViewMenu(home, preferences, controller));
+    JMenu goToPointOfViewMenu = createGoToPointOfViewMenu(home, preferences, controller);
+    if (goToPointOfViewMenu != null) {
+      preview3DMenu.add(goToPointOfViewMenu);
+    }
     preview3DMenu.addSeparator();
     JMenuItem attachDetach3DViewMenuItem = createAttachDetach3DViewMenuItem(controller, false);
     if (attachDetach3DViewMenuItem != null) {
       preview3DMenu.add(attachDetach3DViewMenuItem);
     }
+    addToggleActionToMenu(ActionType.DISPLAY_ALL_LEVELS, 
+        this.displayAllLevelsToggleModel, true, preview3DMenu);
+    addToggleActionToMenu(ActionType.DISPLAY_SELECTED_LEVEL, 
+        this.displaySelectedLevelToggleModel, true, preview3DMenu);
     addActionToMenu(ActionType.MODIFY_3D_ATTRIBUTES, preview3DMenu);
     preview3DMenu.addSeparator();
     addActionToMenu(ActionType.CREATE_PHOTO, preview3DMenu);
@@ -1031,14 +1111,14 @@
   }
 
   /**
-   * Adds the given action to <code>menu</code> and returns <code>true</code> if it was added.
+   * Adds the given action to <code>menu</code>.
    */
   private void addActionToMenu(ActionType actionType, JMenu menu) {
     addActionToMenu(actionType, false, menu);
   }
 
   /**
-   * Adds the given action to <code>menu</code> and returns <code>true</code> if it was added.
+   * Adds the given action to <code>menu</code>.
    */
   private void addActionToMenu(ActionType actionType, 
                                boolean popup,
@@ -1052,8 +1132,7 @@
   }
 
   /**
-   * Adds to <code>menu</code> the menu item matching the given <code>actionType</code> 
-   * and returns <code>true</code> if it was added.
+   * Adds to <code>menu</code> the menu item matching the given <code>actionType</code>.
    */
   private void addToggleActionToMenu(ActionType actionType,
                                      JToggleButton.ToggleButtonModel toggleButtonModel,
@@ -1063,8 +1142,7 @@
   }
 
   /**
-   * Adds to <code>menu</code> the menu item matching the given <code>actionType</code> 
-   * and returns <code>true</code> if it was added.
+   * Adds to <code>menu</code> the menu item matching the given <code>actionType</code>.
    */
   private void addToggleActionToMenu(ActionType actionType,
                                      boolean popup,
@@ -1180,6 +1258,8 @@
         sortActions, HomePieceOfFurniture.SortableProperty.ELEVATION);
     addActionToMap(ActionType.SORT_HOME_FURNITURE_BY_ANGLE, 
         sortActions, HomePieceOfFurniture.SortableProperty.ANGLE);
+    addActionToMap(ActionType.SORT_HOME_FURNITURE_BY_LEVEL, 
+        sortActions, HomePieceOfFurniture.SortableProperty.LEVEL);
     addActionToMap(ActionType.SORT_HOME_FURNITURE_BY_COLOR, 
         sortActions, HomePieceOfFurniture.SortableProperty.COLOR);
     addActionToMap(ActionType.SORT_HOME_FURNITURE_BY_TEXTURE, 
@@ -1281,6 +1361,8 @@
         displayPropertyActions, HomePieceOfFurniture.SortableProperty.ELEVATION);
     addActionToMap(ActionType.DISPLAY_HOME_FURNITURE_ANGLE, 
         displayPropertyActions, HomePieceOfFurniture.SortableProperty.ANGLE);
+    addActionToMap(ActionType.DISPLAY_HOME_FURNITURE_LEVEL, 
+        displayPropertyActions, HomePieceOfFurniture.SortableProperty.LEVEL);
     addActionToMap(ActionType.DISPLAY_HOME_FURNITURE_COLOR, 
         displayPropertyActions, HomePieceOfFurniture.SortableProperty.COLOR);
     addActionToMap(ActionType.DISPLAY_HOME_FURNITURE_TEXTURE, 
@@ -1541,15 +1623,14 @@
         && modifyBackgroundImageAction.getValue(Action.NAME) != null) {
       final JMenuItem importModifyBackgroundImageMenuItem = new JMenuItem(
           createImportModifyBackgroundImageAction(home, popup));
-      // Add a listener to home on backgroundImage property change to 
+      // Add a listener to home and levels on backgroundImage property change to 
       // switch action according to backgroundImage change
-      home.addPropertyChangeListener(Home.Property.BACKGROUND_IMAGE, 
-          new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent ev) {
-              importModifyBackgroundImageMenuItem.setAction(
-                  createImportModifyBackgroundImageAction(home, popup));
-            }
-          });    
+      addBackgroundImageChangeListener(home, new PropertyChangeListener() {
+          public void propertyChange(PropertyChangeEvent ev) {
+            importModifyBackgroundImageMenuItem.setAction(
+                createImportModifyBackgroundImageAction(home, popup));
+          }
+        });
       return importModifyBackgroundImageMenuItem;
     } else {
       return null;
@@ -1557,10 +1638,43 @@
   }
   
   /**
+   * Adds to home and levels the given listener to follow background image changes.
+   */
+  private void addBackgroundImageChangeListener(final Home home, final PropertyChangeListener listener) {
+    home.addPropertyChangeListener(Home.Property.BACKGROUND_IMAGE, listener);    
+    home.addPropertyChangeListener(Home.Property.SELECTED_LEVEL, listener);
+    final PropertyChangeListener levelChangeListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          if (Level.Property.BACKGROUND_IMAGE.name().equals(ev.getPropertyName())) {
+            listener.propertyChange(ev);
+          }
+        }
+      };
+    for (Level level : this.home.getLevels()) {
+      level.addPropertyChangeListener(levelChangeListener);
+    }
+    this.home.addLevelsListener(new CollectionListener<Level>() {
+        public void collectionChanged(CollectionEvent<Level> ev) {
+          switch (ev.getType()) {
+            case ADD :
+              ev.getItem().addPropertyChangeListener(levelChangeListener);
+              break;
+            case DELETE :
+              ev.getItem().removePropertyChangeListener(levelChangeListener);
+              break;
+          }
+        }
+      });
+  }
+  
+  /**
    * Returns the action active on Import / Modify menu item.
    */
   private Action createImportModifyBackgroundImageAction(Home home, boolean popup) {
-    ActionType backgroundImageActionType = home.getBackgroundImage() == null 
+    BackgroundImage backgroundImage = home.getSelectedLevel() != null
+        ? home.getSelectedLevel().getBackgroundImage()
+        : home.getBackgroundImage();
+    ActionType backgroundImageActionType = backgroundImage == null 
         ? ActionType.IMPORT_BACKGROUND_IMAGE
         : ActionType.MODIFY_BACKGROUND_IMAGE;
     Action backgroundImageAction = getActionMap().get(backgroundImageActionType);
@@ -1573,7 +1687,7 @@
    * Returns Hide / Show background image menu item.
    */
   private JMenuItem createHideShowBackgroundImageMenuItem(final Home home, 
-                                                            final boolean popup) {
+                                                          final boolean popup) {
     ActionMap actionMap = getActionMap();
     Action hideBackgroundImageAction = actionMap.get(ActionType.HIDE_BACKGROUND_IMAGE);
     Action showBackgroundImageAction = actionMap.get(ActionType.SHOW_BACKGROUND_IMAGE);
@@ -1582,26 +1696,27 @@
         && showBackgroundImageAction.getValue(Action.NAME) != null) {
       final JMenuItem hideShowBackgroundImageMenuItem = new JMenuItem(
           createHideShowBackgroundImageAction(home, popup));
-      // Add a listener to home on backgroundImage property change to 
+      // Add a listener to home and levels on backgroundImage property change to 
       // switch action according to backgroundImage change
-      home.addPropertyChangeListener(Home.Property.BACKGROUND_IMAGE, 
-          new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent ev) {
-              hideShowBackgroundImageMenuItem.setAction(
-                  createHideShowBackgroundImageAction(home, popup));
-            }
-          });    
+      addBackgroundImageChangeListener(home, new PropertyChangeListener() {
+          public void propertyChange(PropertyChangeEvent ev) {
+            hideShowBackgroundImageMenuItem.setAction(
+                createHideShowBackgroundImageAction(home, popup));
+          }
+        });
       return hideShowBackgroundImageMenuItem;
     } else {
       return null;
     }
   }
-  
+
   /**
    * Returns the action active on Hide / Show menu item.
    */
   private Action createHideShowBackgroundImageAction(Home home, boolean popup) {
-    BackgroundImage backgroundImage = home.getBackgroundImage();
+    BackgroundImage backgroundImage = home.getSelectedLevel() != null
+        ? home.getSelectedLevel().getBackgroundImage()
+        : home.getBackgroundImage();
     ActionType backgroundImageActionType = backgroundImage == null || backgroundImage.isVisible()        
         ? ActionType.HIDE_BACKGROUND_IMAGE
         : ActionType.SHOW_BACKGROUND_IMAGE;
@@ -1617,16 +1732,20 @@
   private JMenu createGoToPointOfViewMenu(final Home home,
                                           UserPreferences preferences,
                                           final HomeController controller) {
-    final JMenu goToPointOfViewMenu = 
-        new JMenu(this.menuActionMap.get(MenuActionType.GO_TO_POINT_OF_VIEW));
-    updateGoToPointOfViewMenu(goToPointOfViewMenu, home, controller);
-    home.addPropertyChangeListener(Home.Property.STORED_CAMERAS, 
-        new PropertyChangeListener() {
-          public void propertyChange(PropertyChangeEvent ev) {
-            updateGoToPointOfViewMenu(goToPointOfViewMenu, home, controller);
-          }
-        });
-    return goToPointOfViewMenu;
+    Action goToPointOfViewAction = this.menuActionMap.get(MenuActionType.GO_TO_POINT_OF_VIEW);
+    if (goToPointOfViewAction.getValue(Action.NAME) != null) {
+      final JMenu goToPointOfViewMenu = new JMenu(goToPointOfViewAction);
+      updateGoToPointOfViewMenu(goToPointOfViewMenu, home, controller);
+      home.addPropertyChangeListener(Home.Property.STORED_CAMERAS, 
+          new PropertyChangeListener() {
+            public void propertyChange(PropertyChangeEvent ev) {
+              updateGoToPointOfViewMenu(goToPointOfViewMenu, home, controller);
+            }
+          });
+      return goToPointOfViewMenu;
+    } else {
+      return null;
+    }
   }
   
   /**
@@ -1858,6 +1977,14 @@
    * Enables or disables transfer between components.  
    */
   public void setTransferEnabled(boolean enabled) {
+    boolean dragAndDropWithTransferHandlerSupported;
+    try {
+      // Don't use transfer handlers for drag and drop with Plugin2 under Mac OS X or when in an unsigned applet
+      dragAndDropWithTransferHandlerSupported = !Boolean.getBoolean("com.eteks.sweethome3d.dragAndDropWithoutTransferHandler");
+    } catch (AccessControlException ex) {
+      dragAndDropWithTransferHandlerSupported = false;
+    }
+    
     JComponent catalogView = (JComponent)this.controller.getFurnitureCatalogController().getView();
     JComponent furnitureView = (JComponent)this.controller.getFurnitureController().getView();
     JComponent planView = (JComponent)this.controller.getPlanController().getView();
@@ -1874,6 +2001,23 @@
       if (planView != null) {
         planView.setTransferHandler(this.planTransferHandler);
       }
+      if (!dragAndDropWithTransferHandlerSupported) {
+        if (catalogView != null) {
+          // Check if furniture catalog is handled by a subcomponent
+          List<JViewport> viewports = SwingTools.findChildren(catalogView, JViewport.class);
+          JComponent catalogComponent;
+          if (viewports.size() > 0) {
+            catalogComponent = (JComponent)viewports.get(0).getView();
+          } else {
+            catalogComponent = catalogView;
+          }
+          if (this.furnitureCatalogDragAndDropListener == null) {
+            this.furnitureCatalogDragAndDropListener = createFurnitureCatalogMouseListener();
+          }
+          catalogComponent.addMouseListener(this.furnitureCatalogDragAndDropListener);
+          catalogComponent.addMouseMotionListener(this.furnitureCatalogDragAndDropListener);
+        }
+      }
     } else {
       if (catalogView != null) {
         catalogView.setTransferHandler(null);
@@ -1887,7 +2031,159 @@
       if (planView != null) {
         planView.setTransferHandler(null);
       }
+      if (!dragAndDropWithTransferHandlerSupported) {
+        if (catalogView != null) {
+          List<JViewport> viewports = SwingTools.findChildren(catalogView, JViewport.class);
+          JComponent catalogComponent;
+          if (viewports.size() > 0) {
+            catalogComponent = (JComponent)viewports.get(0).getView();
+          } else {
+            catalogComponent = catalogView;
+          }
+          catalogComponent.removeMouseListener(this.furnitureCatalogDragAndDropListener);
+          catalogComponent.removeMouseMotionListener(this.furnitureCatalogDragAndDropListener);
+        }
+      }        
     }
+    this.transferHandlerEnabled = enabled;
+  }
+
+  /**
+   * Returns a mouse listener for catalog that acts as catalog view, furniture view and plan transfer handlers 
+   * for drag and drop operations.
+   */
+  private MouseInputAdapter createFurnitureCatalogMouseListener() {
+    return new MouseInputAdapter() {
+        private CatalogPieceOfFurniture selectedPiece;
+        private TransferHandler         transferHandler;
+        private boolean                 autoscrolls;
+        private Cursor                  previousCursor;
+        private View                    previousView;
+    
+        @Override
+        public void mousePressed(MouseEvent ev) {
+          if (SwingUtilities.isLeftMouseButton(ev)) {
+            List<CatalogPieceOfFurniture> selectedFurniture = controller.getFurnitureCatalogController().getSelectedFurniture();
+            if (selectedFurniture.size() > 0) {
+              JComponent source = (JComponent)ev.getSource();
+              this.transferHandler = source.getTransferHandler();
+              source.setTransferHandler(null);
+              this.autoscrolls = source.getAutoscrolls();
+              source.setAutoscrolls(false);
+              this.selectedPiece = selectedFurniture.get(0);
+              this.previousCursor = null;
+              this.previousView = null;
+            }
+          }
+        }
+        
+        @Override
+        public void mouseDragged(MouseEvent ev) {
+          if (SwingUtilities.isLeftMouseButton(ev)
+              && this.selectedPiece != null) {
+            // Force selection again
+            List<CatalogPieceOfFurniture> emptyList = Collections.emptyList();
+            controller.getFurnitureCatalogController().setSelectedFurniture(emptyList);
+            controller.getFurnitureCatalogController().setSelectedFurniture(Arrays.asList(new CatalogPieceOfFurniture [] {this.selectedPiece}));
+            
+            List<Selectable> transferredFurniture = Arrays.asList(
+                new Selectable [] {controller.getFurnitureController().createHomePieceOfFurniture(this.selectedPiece)});
+            View view;
+            float [] pointInView = getPointInPlanView(ev, transferredFurniture);
+            if (pointInView != null) {
+              view = controller.getPlanController().getView();
+            } else {
+              view = controller.getFurnitureController().getView();
+              pointInView = getPointInFurnitureView(ev);
+            }
+
+            if (this.previousView != view) {
+              if (this.previousView != null) {
+                if (this.previousView == controller.getPlanController().getView()) {
+                  controller.getPlanController().stopDraggedItems();
+                }
+                ((JComponent)this.previousView).setCursor(this.previousCursor);
+                this.previousCursor = null;
+                this.previousView = null;
+              }
+              if (view != null) {
+                JComponent component = (JComponent)view;
+                this.previousCursor = component.getCursor();
+                this.previousView = view;
+                component.setCursor(DragSource.DefaultCopyDrop);
+                if (component.getParent() instanceof JViewport) {
+                  ((JViewport)component.getParent()).setCursor(DragSource.DefaultCopyDrop);
+                }
+                if (view == controller.getPlanController().getView()) {
+                  controller.getPlanController().startDraggedItems(transferredFurniture, pointInView [0], pointInView [1]);
+                }
+              }
+            } else if (pointInView != null) {
+              controller.getPlanController().moveMouse(pointInView [0], pointInView [1]);
+            }
+          }
+        }
+        
+        private float [] getPointInPlanView(MouseEvent ev, List<Selectable> transferredFurniture) {
+          PlanView planView = controller.getPlanController().getView();
+          if (planView != null) {
+            JComponent planComponent = (JComponent)planView;
+            Point pointInPlanComponent = SwingUtilities.convertPoint(ev.getComponent(), ev.getPoint(), planComponent);
+            if (planComponent.getParent() instanceof JViewport 
+                    && ((JViewport)planComponent.getParent()).contains(
+                        SwingUtilities.convertPoint(ev.getComponent(), ev.getPoint(), planComponent.getParent()))
+                || !(planComponent.getParent() instanceof JViewport)
+                    && planView.canImportDraggedItems(transferredFurniture, pointInPlanComponent.x, pointInPlanComponent.y)) {
+              return new float [] {planView.convertXPixelToModel(pointInPlanComponent.x), planView.convertYPixelToModel(pointInPlanComponent.y)};
+            }
+          } 
+          return null;
+        }
+        
+        private float [] getPointInFurnitureView(MouseEvent ev) {
+          View furnitureView = controller.getFurnitureController().getView();
+          if (furnitureView != null) {
+            JComponent furnitureComponent = (JComponent)furnitureView;
+            Point point = SwingUtilities.convertPoint(ev.getComponent(), ev.getX(), ev.getY(), 
+                furnitureComponent.getParent() instanceof JViewport
+                   ? furnitureComponent.getParent()
+                   : furnitureComponent);
+            if (furnitureComponent.getParent() instanceof JViewport 
+                && ((JViewport)furnitureComponent.getParent()).contains(point)
+            || !(furnitureComponent.getParent() instanceof JViewport)
+                && furnitureComponent.contains(point)) {
+              return new float [] {0, 0};
+            }
+          } 
+          return null;
+        }
+        
+        @Override
+        public void mouseReleased(MouseEvent ev) {
+          if (SwingUtilities.isLeftMouseButton(ev)
+              && this.selectedPiece != null) {
+            List<Selectable> transferredFurniture = Arrays.asList(
+                new Selectable [] {controller.getFurnitureController().createHomePieceOfFurniture(this.selectedPiece)});
+            View view;
+            float [] pointInView = getPointInPlanView(ev, transferredFurniture);
+            if (pointInView != null) {
+              controller.getPlanController().stopDraggedItems();
+              view = controller.getPlanController().getView();
+            } else {
+              view = controller.getFurnitureController().getView();
+              pointInView = getPointInFurnitureView(ev);
+            }
+            if (pointInView != null) {
+              controller.drop(transferredFurniture, view, pointInView [0], pointInView [1]);
+              ((JComponent)this.previousView).setCursor(this.previousCursor);
+            }
+            this.selectedPiece = null;
+            JComponent source = (JComponent)ev.getSource();
+            source.setTransferHandler(this.transferHandler);
+            source.setAutoscrolls(this.autoscrolls);
+          }
+        }
+      };
   }
 
   /**
@@ -2079,10 +2375,11 @@
         // Replace previous furniture catalog view by the new one
         JComponent oldFurnitureCatalogView = this.furnitureCatalogView.get();        
         if (oldFurnitureCatalogView != null) {
+          boolean transferHandlerEnabled = homePane.transferHandlerEnabled; 
+          homePane.setTransferEnabled(false);
           JComponent newFurnitureCatalogView = (JComponent)homePane.controller.getFurnitureCatalogController().getView();
           newFurnitureCatalogView.setComponentPopupMenu(oldFurnitureCatalogView.getComponentPopupMenu());
-          TransferHandler transferHandler = oldFurnitureCatalogView.getTransferHandler();
-          newFurnitureCatalogView.setTransferHandler(transferHandler);
+          homePane.setTransferEnabled(transferHandlerEnabled);
           JComponent splitPaneTopComponent = newFurnitureCatalogView; 
           if (newFurnitureCatalogView instanceof Scrollable) {
             splitPaneTopComponent = new HomeScrollPane(newFurnitureCatalogView);
@@ -2114,6 +2411,14 @@
       addActionToPopupMenu(ActionType.PASTE, planViewPopup);
       planViewPopup.addSeparator();
       addActionToPopupMenu(ActionType.DELETE, planViewPopup);
+      Action selectObjectAction = this.menuActionMap.get(MenuActionType.SELECT_OBJECT_MENU);
+      JMenu selectObjectMenu;
+      if (selectObjectAction.getValue(Action.NAME) != null) {
+        selectObjectMenu = new JMenu(selectObjectAction);
+        planViewPopup.add(selectObjectMenu);
+      } else {
+        selectObjectMenu = null;
+      }
       addActionToPopupMenu(ActionType.SELECT_ALL, planViewPopup);
       planViewPopup.addSeparator();
       addToggleActionToPopupMenu(ActionType.SELECT, 
@@ -2154,27 +2459,48 @@
       }
       addActionToPopupMenu(ActionType.DELETE_BACKGROUND_IMAGE, planViewPopup);
       planViewPopup.addSeparator();
+      addActionToPopupMenu(ActionType.ADD_LEVEL, planViewPopup);
+      addActionToPopupMenu(ActionType.MODIFY_LEVEL, planViewPopup);
+      addActionToPopupMenu(ActionType.DELETE_LEVEL, planViewPopup);
+      planViewPopup.addSeparator();
       addActionToPopupMenu(ActionType.ZOOM_OUT, planViewPopup);
       addActionToPopupMenu(ActionType.ZOOM_IN, planViewPopup);
       planViewPopup.addSeparator();
       addActionToPopupMenu(ActionType.EXPORT_TO_SVG, planViewPopup);
       SwingTools.hideDisabledMenuItems(planViewPopup);
+      if (selectObjectMenu != null) {
+        // Add a second popup listener to manage Select object sub menu before the menu is hidden when empty
+        addSelectObjectMenuItems(selectObjectMenu, controller.getPlanController(), preferences);
+      }
       planView.setComponentPopupMenu(planViewPopup);
       
+      final JScrollPane planScrollPane;
       if (planView instanceof Scrollable) {
-        final JScrollPane planScrollPane = new HomeScrollPane(planView);
+        planView = planScrollPane
+                 = new HomeScrollPane(planView);
+      } else {
+        List<JScrollPane> scrollPanes = SwingTools.findChildren(planView, JScrollPane.class);
+        if (scrollPanes.size() == 1) {
+          planScrollPane = scrollPanes.get(0);
+        } else {
+          planScrollPane = null;
+        }
+      }
+      
+      if (planScrollPane != null) {
         setPlanRulersVisible(planScrollPane, controller, preferences.isRulersVisible());
-        final JComponent lockUnlockBasePlanButton = createLockUnlockBasePlanButton(home);
-        if (lockUnlockBasePlanButton != null) {
-          planScrollPane.setCorner(JScrollPane.UPPER_LEADING_CORNER, lockUnlockBasePlanButton);
-          planScrollPane.addPropertyChangeListener("componentOrientation", 
-              new PropertyChangeListener () {
-                public void propertyChange(PropertyChangeEvent ev) {
-                  if (lockUnlockBasePlanButton.getParent() != null) {
-                    planScrollPane.setCorner(JScrollPane.UPPER_LEADING_CORNER, lockUnlockBasePlanButton);
-                  }
+        if (planScrollPane.getCorner(JScrollPane.UPPER_LEADING_CORNER) == null) {
+          final JComponent lockUnlockBasePlanButton = createLockUnlockBasePlanButton(home);
+          if (lockUnlockBasePlanButton != null) {
+            planScrollPane.setCorner(JScrollPane.UPPER_LEADING_CORNER, lockUnlockBasePlanButton);
+            planScrollPane.addPropertyChangeListener("componentOrientation", new PropertyChangeListener() {
+              public void propertyChange(PropertyChangeEvent ev) {
+                if (lockUnlockBasePlanButton.getParent() != null) {
+                  planScrollPane.setCorner(JScrollPane.UPPER_LEADING_CORNER, lockUnlockBasePlanButton);
                 }
-              });
+              }
+            });
+          }
         }
         // Add a listener to update rulers visibility in preferences
         preferences.addPropertyChangeListener(UserPreferences.Property.RULERS_VISIBLE, 
@@ -2193,7 +2519,6 @@
               controller.setVisualProperty(PLAN_VIEWPORT_Y_VISUAL_PROPERTY, viewportPosition.y);
             }
           });
-        planView = planScrollPane;
       }
     }
 
@@ -2203,7 +2528,7 @@
       view3D.setPreferredSize(planView != null 
           ? planView.getPreferredSize()
           : new Dimension(400, 400));
-      view3D.setMinimumSize(new Dimension(0, 0));
+      view3D.setMinimumSize(new Dimension());
       
       // Create 3D view popup menu
       JPopupMenu view3DPopup = new JPopupMenu();
@@ -2212,12 +2537,19 @@
       addToggleActionToPopupMenu(ActionType.VIEW_FROM_OBSERVER, 
           this.viewFromObserverToggleModel, true, view3DPopup);
       addActionToPopupMenu(ActionType.STORE_POINT_OF_VIEW, view3DPopup);
-      view3DPopup.add(createGoToPointOfViewMenu(home, preferences, controller));
+      JMenu goToPointOfViewMenu = createGoToPointOfViewMenu(home, preferences, controller);
+      if (goToPointOfViewMenu != null) {
+        view3DPopup.add(goToPointOfViewMenu);
+      }
       view3DPopup.addSeparator();
       JMenuItem attachDetach3DViewMenuItem = createAttachDetach3DViewMenuItem(controller, true);
       if (attachDetach3DViewMenuItem != null) {
         view3DPopup.add(attachDetach3DViewMenuItem);
       }
+      addToggleActionToPopupMenu(ActionType.DISPLAY_ALL_LEVELS, 
+          this.displayAllLevelsToggleModel, true, view3DPopup);
+      addToggleActionToPopupMenu(ActionType.DISPLAY_SELECTED_LEVEL, 
+          this.displaySelectedLevelToggleModel, true, view3DPopup);
       addActionToPopupMenu(ActionType.MODIFY_3D_ATTRIBUTES, view3DPopup);
       view3DPopup.addSeparator();
       addActionToPopupMenu(ActionType.CREATE_PHOTO, view3DPopup);
@@ -2248,22 +2580,17 @@
         // Check 3D view can be viewed in one of the available screens      
         final Integer dialogX = (Integer)this.home.getVisualProperty(view3D.getClass().getName() + DETACHED_VIEW_X_VISUAL_PROPERTY);
         final Integer dialogY = (Integer)this.home.getVisualProperty(view3D.getClass().getName() + DETACHED_VIEW_Y_VISUAL_PROPERTY);
-        if (dialogX != null) {
-          for (GraphicsDevice screenDevice : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) {
-            for (GraphicsConfiguration screenConfiguration : screenDevice.getConfigurations()) {
-              if (screenConfiguration.getBounds().contains(dialogX, dialogY)) {
-                EventQueue.invokeLater(new Runnable() {
-                    public void run() {
-                      View view3D = controller.getHomeController3D().getView();
-                      detachView(view3D, dialogX, dialogY,
-                          (Integer)home.getVisualProperty(view3D.getClass().getName() + DETACHED_VIEW_WIDTH_VISUAL_PROPERTY),
-                          (Integer)home.getVisualProperty(view3D.getClass().getName() + DETACHED_VIEW_HEIGHT_VISUAL_PROPERTY));
-                    }
-                  });
-                return planView3DPane;
+        final Integer dialogWidth = (Integer)home.getVisualProperty(view3D.getClass().getName() + DETACHED_VIEW_WIDTH_VISUAL_PROPERTY);
+        final Integer dialogHeight = (Integer)home.getVisualProperty(view3D.getClass().getName() + DETACHED_VIEW_HEIGHT_VISUAL_PROPERTY);
+        if (dialogX != null && dialogY != null && dialogWidth != null && dialogHeight != null
+            && SwingTools.isRectangleVisibleAtScreen(new Rectangle(dialogX, dialogY, dialogWidth, dialogHeight))) {
+          EventQueue.invokeLater(new Runnable() {
+              public void run() {
+                View view3D = controller.getHomeController3D().getView();
+                detachView(view3D, dialogX, dialogY, dialogWidth, dialogHeight);
               }
-            }
-          }
+            });
+          return planView3DPane;
         }
         if (planView3DPane instanceof JSplitPane) {
           ((JSplitPane)planView3DPane).setDividerLocation(0.5);
@@ -2276,6 +2603,118 @@
       return planView;
     }    
   }
+
+  /**
+   * Adds to the menu a listener that will update the menu items able to select 
+   * the selectable items in plan at the location where the menu will be triggered.
+   */
+  private void addSelectObjectMenuItems(final JMenu            selectObjectMenu, 
+                                         final PlanController  planController, 
+                                         final UserPreferences preferences) {
+    JComponent planView = (JComponent)planController.getView();
+    final Point lastMouseMoveLocation = new Point(-1, -1);
+    ((JPopupMenu)selectObjectMenu.getParent()).addPopupMenuListener(new PopupMenuListener() {
+        @SuppressWarnings({"rawtypes", "unchecked"})
+        public void popupMenuWillBecomeVisible(PopupMenuEvent ev) {
+          if (lastMouseMoveLocation.getX() >= 0
+              && !planController.isModificationState()) {
+            final List<Selectable> items = planController.getSelectableItemsAt(
+                planController.getView().convertXPixelToModel(lastMouseMoveLocation.x),
+                planController.getView().convertYPixelToModel(lastMouseMoveLocation.y));
+            // Prepare localized formatters
+            Map<Class<? extends Selectable>, SelectableFormat> formatters = 
+                new HashMap<Class<? extends Selectable>, SelectableFormat>();            
+            formatters.put(Compass.class, new SelectableFormat<Compass>() {
+                public String format(Compass compass) {
+                  return preferences.getLocalizedString(HomePane.class, "selectObject.compass");
+                }
+              });
+            formatters.put(HomePieceOfFurniture.class, new SelectableFormat<HomePieceOfFurniture>() {
+                public String format(HomePieceOfFurniture piece) {
+                  if (piece.getName().length() > 0) {
+                    return piece.getName();
+                  } else {
+                    return preferences.getLocalizedString(HomePane.class, "selectObject.furniture");
+                  }
+                }
+              });
+            formatters.put(Wall.class, new SelectableFormat<Wall>() {
+                public String format(Wall wall) {
+                  return preferences.getLocalizedString(HomePane.class, "selectObject.wall", 
+                      preferences.getLengthUnit().getFormatWithUnit().format(wall.getLength()));
+                }
+              });
+            formatters.put(Room.class, new SelectableFormat<Room>() {
+                public String format(Room room) {
+                  String roomInfo = room.getName() != null && room.getName().length() > 0
+                      ? room.getName()
+                      : (room.isAreaVisible() 
+                            ? preferences.getLengthUnit().getAreaFormatWithUnit().format(room.getArea())
+                            : "");
+                  if (room.isFloorVisible() && !room.isCeilingVisible()) {
+                    return preferences.getLocalizedString(HomePane.class, "selectObject.floor", roomInfo);
+                  } else if (!room.isFloorVisible() && room.isCeilingVisible()) {
+                    return preferences.getLocalizedString(HomePane.class, "selectObject.ceiling", roomInfo);
+                  } else {
+                    return preferences.getLocalizedString(HomePane.class, "selectObject.room", roomInfo);
+                  }
+                }
+              });
+            formatters.put(DimensionLine.class, new SelectableFormat<DimensionLine>() {
+                public String format(DimensionLine dimensionLine) {
+                  return preferences.getLocalizedString(HomePane.class, "selectObject.dimensionLine", 
+                      preferences.getLengthUnit().getFormatWithUnit().format(dimensionLine.getLength()));
+                }
+              });
+            formatters.put(Label.class, new SelectableFormat<Label>() {
+                public String format(Label label) {
+                  if (label.getText().length() > 0) {
+                    return label.getText();
+                  } else {
+                    return preferences.getLocalizedString(HomePane.class, "selectObject.label");
+                  }
+                }
+              });
+            
+            for (final Selectable item : items) {
+              String format = null;
+              for (Map.Entry<Class<? extends Selectable>, SelectableFormat> entry : formatters.entrySet()) {
+                if (entry.getKey().isInstance(item)) {
+                  format = entry.getValue().format(item);
+                  break;
+                }
+              }
+              if (format != null) {
+                selectObjectMenu.add(new JMenuItem(new AbstractAction(format) {
+                    public void actionPerformed(ActionEvent ev) {
+                      planController.selectItem(item);
+                    }
+                  }));
+              }
+            }
+          }
+        }
+ 
+        public void popupMenuWillBecomeInvisible(PopupMenuEvent ev) {
+          selectObjectMenu.removeAll();
+        }
+ 
+        public void popupMenuCanceled(PopupMenuEvent ev) {
+        }
+      });
+    planView.addMouseMotionListener(new MouseMotionAdapter() {
+        @Override
+        public void mouseMoved(MouseEvent ev) {
+          lastMouseMoveLocation.setLocation(ev.getPoint());
+        }
+      });      
+    planView.addMouseListener(new MouseAdapter() {
+        @Override
+        public void mouseExited(MouseEvent e) {
+          lastMouseMoveLocation.x = -1;
+        }
+      });
+  }
   
   /**
    * Preferences property listener bound to this component with a weak reference to avoid
@@ -2326,7 +2765,7 @@
       planScrollPane.setRowHeaderView(null);
     }
   }
-  
+
   /**
    * Adds to <code>view</code> a mouse listener that disables all menu items of
    * <code>menuBar</code> during a drag and drop operation in <code>view</code>.
@@ -2478,8 +2917,7 @@
     }
     JFrame defaultFrame = (JFrame)window;
     // Create a dialog with the same title as home frame 
-    final JDialog separateDialog = new JDialog(defaultFrame, defaultFrame.getTitle(), false,
-        component.getGraphicsConfiguration());
+    final JDialog separateDialog = new JDialog(defaultFrame, defaultFrame.getTitle(), false);
     separateDialog.setResizable(true);
     defaultFrame.addPropertyChangeListener("title", new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
@@ -2523,6 +2961,7 @@
       });
 
     separateDialog.setBounds(x, y, width, height);
+    separateDialog.setLocationByPlatform(!SwingTools.isRectangleVisibleAtScreen(separateDialog.getBounds()));
     separateDialog.setVisible(true);
     
     this.controller.setVisualProperty(view.getClass().getName() + DETACHED_VIEW_VISUAL_PROPERTY, true);
@@ -2588,6 +3027,15 @@
   }
 
   /**
+   * Displays a content chooser open dialog to choose a language library.
+   */
+  public String showImportLanguageLibraryDialog() {
+    return this.controller.getContentManager().showOpenDialog(this, 
+        this.preferences.getLocalizedString(HomePane.class, "importLanguageLibraryDialog.title"), 
+        ContentManager.ContentType.LANGUAGE_LIBRARY);
+  }
+
+  /**
    * Displays a dialog that lets user choose whether he wants to overwrite
    * an existing language library or not. 
    */
@@ -2817,23 +3265,14 @@
     JEditorPane messagePane = new JEditorPane("text/html", message);
     messagePane.setOpaque(false);
     messagePane.setEditable(false);
-    try { 
-      // Lookup the javax.jnlp.BasicService object 
-      final BasicService service = (BasicService)ServiceManager.lookup("javax.jnlp.BasicService");
-      // If basic service supports  web browser
-      if (service.isWebBrowserSupported()) {
-        // Add a listener that displays hyperlinks content in browser
-        messagePane.addHyperlinkListener(new HyperlinkListener() {
-          public void hyperlinkUpdate(HyperlinkEvent ev) {
-            if (ev.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-              service.showDocument(ev.getURL()); 
-            }
-          }
-        });
+    // Add a listener that displays hyperlinks content in browser
+    messagePane.addHyperlinkListener(new HyperlinkListener() {
+      public void hyperlinkUpdate(HyperlinkEvent ev) {
+        if (ev.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+          SwingTools.showDocumentInBrowser(ev.getURL()); 
+        }
       }
-    } catch (UnavailableServiceException ex) {
-      // Too bad : service is unavailable             
-    } 
+    });
     
     String title = this.preferences.getLocalizedString(HomePane.class, "about.title");
     Icon   icon  = new ImageIcon(HomePane.class.getResource(
@@ -3057,13 +3496,11 @@
       // Compute bounds that include walls and furniture
       Rectangle2D homeBounds = updateObjectsBounds(null, home.getWalls());
       for (HomePieceOfFurniture piece : getVisibleFurniture(home.getFurniture())) {
-        if (piece.isVisible()) {
-          for (float [] point : piece.getPoints()) {
-            if (homeBounds == null) {
-              homeBounds = new Rectangle2D.Float(point [0], point [1], 0, 0);
-            } else {
-              homeBounds.add(point [0], point [1]);
-            }
+        for (float [] point : piece.getPoints()) {
+          if (homeBounds == null) {
+            homeBounds = new Rectangle2D.Float(point [0], point [1], 0, 0);
+          } else {
+            homeBounds.add(point [0], point [1]);
           }
         }
       }
@@ -3076,7 +3513,9 @@
     private static List<HomePieceOfFurniture> getVisibleFurniture(List<HomePieceOfFurniture> furniture) {
       List<HomePieceOfFurniture> visibleFurniture = new ArrayList<HomePieceOfFurniture>(furniture.size());
       for (HomePieceOfFurniture piece : furniture) {
-        if (piece.isVisible()) {
+        if (piece.isVisible()
+            && (piece.getLevel() == null
+                || piece.getLevel().isVisible())) {
           if (piece instanceof HomeFurnitureGroup) {
             visibleFurniture.addAll(getVisibleFurniture(((HomeFurnitureGroup)piece).getFurniture()));
           } else {
@@ -3093,11 +3532,15 @@
     private static Rectangle2D updateObjectsBounds(Rectangle2D objectBounds,
                                             Collection<? extends Selectable> items) {
       for (Selectable item : items) {
-        for (float [] point : item.getPoints()) {
-          if (objectBounds == null) {
-            objectBounds = new Rectangle2D.Float(point [0], point [1], 0, 0);
-          } else {
-            objectBounds.add(point [0], point [1]);
+        if (!(item instanceof Elevatable)
+            || ((Elevatable)item).getLevel() == null
+            || ((Elevatable)item).getLevel().isVisible()) {
+          for (float [] point : item.getPoints()) {
+            if (objectBounds == null) {
+              objectBounds = new Rectangle2D.Float(point [0], point [1], 0, 0);
+            } else {
+              objectBounds.add(point [0], point [1]);
+            }
           }
         }
       }
@@ -3170,9 +3613,14 @@
    * components are able to handle.
    */
   public boolean isClipboardEmpty() {
-    Clipboard clipboard = getToolkit().getSystemClipboard();
-    return !(clipboard.isDataFlavorAvailable(HomeTransferableList.HOME_FLAVOR)
-        || getToolkit().getSystemClipboard().isDataFlavorAvailable(DataFlavor.javaFileListFlavor));    
+    try {
+      Clipboard clipboard = getToolkit().getSystemClipboard();
+      return !(clipboard.isDataFlavorAvailable(HomeTransferableList.HOME_FLAVOR)
+          || getToolkit().getSystemClipboard().isDataFlavorAvailable(DataFlavor.javaFileListFlavor));
+    } catch (AccessControlException ex) {
+      // AWT uses a private clipboard that won't be empty as soon as a copy action will be done
+      return this.clipboardEmpty;
+    }    
   }
 
   /**
@@ -3197,7 +3645,7 @@
           public void propertyChange(PropertyChangeEvent ev) {
             String propertyName = ev.getPropertyName();
             Object oldValue = ev.getOldValue();
-            Object newValue = getValue(propertyName);
+            Object newValue = ev.getNewValue();
             if (PluginAction.Property.ENABLED.name().equals(propertyName)) {
               propertyChangeSupport.firePropertyChange(
                   new PropertyChangeEvent(ev.getSource(), "enabled", oldValue, newValue));
@@ -3210,7 +3658,7 @@
                       Action.NAME, oldValue, newValue));
                 } else if (PluginAction.Property.SHORT_DESCRIPTION.name().equals(propertyName)) {
                   propertyChangeSupport.firePropertyChange(new PropertyChangeEvent(ev.getSource(), 
-                      Action.NAME, oldValue, newValue));
+                      Action.SHORT_DESCRIPTION, oldValue, newValue));
                 } else if (PluginAction.Property.MNEMONIC.name().equals(propertyName)) {
                   propertyChangeSupport.firePropertyChange(new PropertyChangeEvent(ev.getSource(), 
                       Action.MNEMONIC_KEY, 
@@ -3309,4 +3757,11 @@
       setMinimumSize(new Dimension());
     }
   }
+
+  /**
+   * An object able to format a selectable item;
+   */
+  private abstract interface SelectableFormat<T extends Selectable> {
+    public abstract String format(T item);
+  }
 }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomePrintableComponent.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomePrintableComponent.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/HomePrintableComponent.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/HomePrintableComponent.java	2011-12-21 00:48:52.000000000 +0000
@@ -44,8 +44,10 @@
 import javax.swing.JLabel;
 
 import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.HomePrint;
 import com.eteks.sweethome3d.model.LengthUnit;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.viewcontroller.ContentManager;
 import com.eteks.sweethome3d.viewcontroller.HomeController;
 import com.eteks.sweethome3d.viewcontroller.PlanView;
@@ -302,8 +304,31 @@
     View furnitureView = this.controller.getFurnitureController().getView();
     if (furnitureView != null 
         && (homePrint == null || homePrint.isFurniturePrinted())) {
-      // Try to print next furniture view page
+      FurnitureTable furnitureTable = null;
+      final FurnitureTable.FurnitureFilter furnitureFilter;
+      if (furnitureView instanceof FurnitureTable
+          && (homePrint == null
+              || homePrint.isPlanPrinted()
+              || homePrint.isView3DPrinted())) {
+        final Level selectedLevel = home.getSelectedLevel();
+        furnitureTable = (FurnitureTable)furnitureView;
+        furnitureFilter = furnitureTable.getFurnitureFilter();
+        furnitureTable.setFurnitureFilter(new FurnitureTable.FurnitureFilter() {
+            public boolean include(Home home, HomePieceOfFurniture piece) {
+              // Print only furniture at selected level when the plan or the 3D view is printed
+              return (furnitureFilter == null || furnitureFilter.include(home, piece))
+                  && piece.isAtLevel(selectedLevel);
+            }
+          });
+      } else {
+        furnitureFilter = null;
+      }
+      // Try to print next furniture view page      
       pageExists = ((Printable)furnitureView).print(g2D, pageFormat, page);
+      if (furnitureTable != null) {
+        // Restore previous filter
+        ((FurnitureTable)furnitureView).setFurnitureFilter(furnitureFilter);
+      }
       if (pageExists == PAGE_EXISTS) {
         this.furniturePageCount++;
       }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/ImportedFurnitureWizardStepsPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/ImportedFurnitureWizardStepsPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/ImportedFurnitureWizardStepsPanel.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/ImportedFurnitureWizardStepsPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -26,10 +26,14 @@
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.EventQueue;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
 import java.awt.Insets;
+import java.awt.MouseInfo;
+import java.awt.Point;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
@@ -37,6 +41,8 @@
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
@@ -53,13 +59,11 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import javax.jnlp.BasicService;
-import javax.jnlp.ServiceManager;
-import javax.jnlp.UnavailableServiceException;
 import javax.media.j3d.BranchGroup;
 import javax.media.j3d.Canvas3D;
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.View;
+import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.ComboBoxEditor;
 import javax.swing.DefaultListCellRenderer;
@@ -74,8 +78,11 @@
 import javax.swing.JSpinner;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
+import javax.swing.JToolTip;
+import javax.swing.JWindow;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
+import javax.swing.Timer;
 import javax.swing.TransferHandler;
 import javax.swing.UIManager;
 import javax.swing.border.EtchedBorder;
@@ -86,6 +93,7 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.vecmath.Matrix3f;
+import javax.vecmath.Vector3d;
 import javax.vecmath.Vector3f;
 
 import com.eteks.sweethome3d.j3d.Component3DManager;
@@ -117,10 +125,15 @@
   private JLabel                            modelChoiceErrorLabel;
   private ModelPreviewComponent             modelPreviewComponent;
   private JLabel                            orientationLabel;
+  private JButton                           defaultOrientationButton;
   private JButton                           turnLeftButton;
   private JButton                           turnRightButton;
   private JButton                           turnUpButton;
   private JButton                           turnDownButton;
+  private int                               horizontalAngle;
+  private int                               verticalAngle;
+  private JToolTip                          orientationToolTip;
+  private JWindow                           orientationToolTipWindow;
   private RotationPreviewComponent          rotationPreviewComponent;
   private JLabel                            backFaceShownLabel;
   private JCheckBox                         backFaceShownCheckBox;
@@ -142,6 +155,7 @@
   private AttributesPreviewComponent        attributesPreviewComponent;
   private JCheckBox                         movableCheckBox;
   private JCheckBox                         doorOrWindowCheckBox;
+  private JCheckBox                         staircaseCheckBox;
   private JLabel                            colorLabel;
   private ColorButton                       colorButton;
   private JButton                           clearColorButton;
@@ -207,31 +221,17 @@
       });
     this.findModelsButton = new JButton(SwingTools.getLocalizedLabelText(preferences, 
         ImportedFurnitureWizardStepsPanel.class, "findModelsButton.text"));
-    BasicService basicService = null;
-    try { 
-      // Lookup the javax.jnlp.BasicService object 
-      basicService = (BasicService)ServiceManager.lookup("javax.jnlp.BasicService"); 
-      // Ignore the basic service, if it doesn't support web browser
-      if (!basicService.isWebBrowserSupported()) {
-        basicService = null;
-      }
-    } catch (UnavailableServiceException ex) {
-      // Too bad : service is unavailable
-    }
-    final BasicService service = basicService;
     this.findModelsButton.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent ev) {
           boolean documentShown = false;
-          if (service != null) {
-            try { 
-              // Display Find models page in browser
-              final URL findModelsUrl = new URL(preferences.getLocalizedString(
-                  ImportedFurnitureWizardStepsPanel.class, "findModelsButton.url"));
-              documentShown = service.showDocument(findModelsUrl); 
-            } catch (MalformedURLException ex) {
-              // Document isn't shown
-            }
-          } 
+          try { 
+            // Display Find models page in browser
+            final URL findModelsUrl = new URL(preferences.getLocalizedString(
+                ImportedFurnitureWizardStepsPanel.class, "findModelsButton.url"));
+            documentShown = SwingTools.showDocumentInBrowser(findModelsUrl); 
+          } catch (MalformedURLException ex) {
+            // Document isn't shown
+          }
           if (!documentShown) {
             // If the document wasn't shown, display a message 
             // with a copiable URL in a message box 
@@ -292,50 +292,87 @@
     // Orientation panel components
     this.orientationLabel = new JLabel(preferences.getLocalizedString(
         ImportedFurnitureWizardStepsPanel.class, "orientationLabel.text"));
-    this.turnLeftButton = new JButton(new ResourceAction(preferences, 
+    this.defaultOrientationButton = new JButton(new ResourceAction(preferences, 
+            ImportedFurnitureWizardStepsPanel.class, "DEFAULT_ORIENTATION", true) {
+        @Override
+        public void actionPerformed(ActionEvent ev) {
+          updateModelRotation(new Transform3D());
+          horizontalAngle = 0;
+          verticalAngle = 0;
+        }
+      });
+    final String angleTooltipFormat = preferences.getLocalizedString(
+        ImportedFurnitureWizardStepsPanel.class, "angleTooltipFeedback");
+    this.orientationToolTip = new JToolTip();
+    this.turnLeftButton = new AutoRepeatButton(new ResourceAction(preferences, 
             ImportedFurnitureWizardStepsPanel.class, "TURN_LEFT", true) {
         @Override
         public void actionPerformed(ActionEvent ev) {
           Transform3D oldTransform = getModelRotationTransform();
           Transform3D leftRotation = new Transform3D();
-          leftRotation.rotY(-Math.PI / 2);
+          int deltaAngle = (ev.getModifiers() & ActionEvent.SHIFT_MASK) == 0 
+              ? -90 
+              : -1;
+          leftRotation.rotY(Math.toRadians(deltaAngle));
           leftRotation.mul(oldTransform);
           updateModelRotation(leftRotation);
+          horizontalAngle = (horizontalAngle + deltaAngle) % 360;
+          orientationToolTip.setTipText(String.format(angleTooltipFormat, horizontalAngle));
+          verticalAngle = 0;
         }
       });
-    this.turnRightButton = new JButton(new ResourceAction(preferences, 
+    this.turnRightButton = new AutoRepeatButton(new ResourceAction(preferences, 
             ImportedFurnitureWizardStepsPanel.class, "TURN_RIGHT", true) {
         @Override
         public void actionPerformed(ActionEvent ev) {
           Transform3D oldTransform = getModelRotationTransform();
           Transform3D rightRotation = new Transform3D();
-          rightRotation.rotY(Math.PI / 2);
+          int deltaAngle = (ev.getModifiers() & ActionEvent.SHIFT_MASK) == 0 
+              ? 90 
+              : 1;
+          rightRotation.rotY(Math.toRadians(deltaAngle));
           rightRotation.mul(oldTransform);
           updateModelRotation(rightRotation);
+          horizontalAngle = (horizontalAngle + deltaAngle) % 360;
+          orientationToolTip.setTipText(String.format(angleTooltipFormat, horizontalAngle));
+          verticalAngle = 0;
         }
       });
-    this.turnUpButton = new JButton(new ResourceAction(preferences, 
+    this.turnUpButton = new AutoRepeatButton(new ResourceAction(preferences, 
             ImportedFurnitureWizardStepsPanel.class, "TURN_UP", true) {
         @Override
         public void actionPerformed(ActionEvent ev) {
           Transform3D oldTransform = getModelRotationTransform();
           Transform3D upRotation = new Transform3D();
-          upRotation.rotX(-Math.PI / 2);
+          int deltaAngle = (ev.getModifiers() & ActionEvent.SHIFT_MASK) == 0 
+              ? -90 
+              : -1;
+          upRotation.rotX(Math.toRadians(deltaAngle));
           upRotation.mul(oldTransform);
           updateModelRotation(upRotation);
+          verticalAngle = (verticalAngle + deltaAngle) % 360;
+          orientationToolTip.setTipText(String.format(angleTooltipFormat, verticalAngle));
+          horizontalAngle = 0;
         }
       });
-    this.turnDownButton = new JButton(new ResourceAction(preferences, 
+    this.turnDownButton = new AutoRepeatButton(new ResourceAction(preferences, 
             ImportedFurnitureWizardStepsPanel.class, "TURN_DOWN", true) {
         @Override
         public void actionPerformed(ActionEvent ev) {
           Transform3D oldTransform = getModelRotationTransform();
           Transform3D downRotation = new Transform3D();
-          downRotation.rotX(Math.PI / 2);
+          int deltaAngle = (ev.getModifiers() & ActionEvent.SHIFT_MASK) == 0 
+              ? 90 
+              : 1;
+          downRotation.rotX(Math.toRadians(deltaAngle));
           downRotation.mul(oldTransform);
           updateModelRotation(downRotation);
+          verticalAngle = (verticalAngle + deltaAngle) % 360;
+          orientationToolTip.setTipText(String.format(angleTooltipFormat, verticalAngle));
+          horizontalAngle = 0;
         }
       });
+    
     this.backFaceShownLabel = new JLabel(preferences.getLocalizedString(
         ImportedFurnitureWizardStepsPanel.class, "backFaceShownLabel.text"));
     this.backFaceShownCheckBox = new JCheckBox(SwingTools.getLocalizedLabelText(preferences, 
@@ -486,8 +523,9 @@
     this.widthLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         ImportedFurnitureWizardStepsPanel.class, "widthLabel.text", unitName)); 
     final float minimumLength = preferences.getLengthUnit().getMinimumLength();
+    final float maximumLength = preferences.getLengthUnit().getMaximumLength();
     final NullableSpinner.NullableSpinnerLengthModel widthSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, Math.min(controller.getWidth(), minimumLength), 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, Math.min(controller.getWidth(), minimumLength), maximumLength);
     this.widthSpinner = new NullableSpinner(widthSpinnerModel);
     widthSpinnerModel.addChangeListener(new ChangeListener () {
         public void stateChanged(ChangeEvent ev) {
@@ -509,7 +547,7 @@
     this.depthLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         ImportedFurnitureWizardStepsPanel.class, "depthLabel.text", unitName)); 
     final NullableSpinner.NullableSpinnerLengthModel depthSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, Math.min(controller.getDepth(), minimumLength), 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, Math.min(controller.getDepth(), minimumLength), maximumLength);
     this.depthSpinner = new NullableSpinner(depthSpinnerModel);
     depthSpinnerModel.addChangeListener(new ChangeListener () {
         public void stateChanged(ChangeEvent ev) {
@@ -531,7 +569,7 @@
     this.heightLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
             ImportedFurnitureWizardStepsPanel.class, "heightLabel.text", unitName)); 
     final NullableSpinner.NullableSpinnerLengthModel heightSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, Math.min(controller.getHeight(), minimumLength), 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, Math.min(controller.getHeight(), minimumLength), maximumLength);
     this.heightSpinner = new NullableSpinner(heightSpinnerModel);
     heightSpinnerModel.addChangeListener(new ChangeListener () {
         public void stateChanged(ChangeEvent ev) {
@@ -567,7 +605,7 @@
     this.elevationLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         ImportedFurnitureWizardStepsPanel.class, "elevationLabel.text", unitName)); 
     final NullableSpinner.NullableSpinnerLengthModel elevationSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0f, 2500f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, 0f, preferences.getLengthUnit().getMaximumElevation());
     this.elevationSpinner = new NullableSpinner(elevationSpinnerModel);
     elevationSpinnerModel.addChangeListener(new ChangeListener() {
         public void stateChanged(ChangeEvent ev) {
@@ -612,7 +650,26 @@
             // If door or window changes update door or window check box
             boolean doorOrWindow = controller.isDoorOrWindow();
             doorOrWindowCheckBox.setSelected(doorOrWindow);
-            movableCheckBox.setEnabled(!doorOrWindow);
+            movableCheckBox.setEnabled(!doorOrWindow && controller.getStaircaseCutOutShape() == null);
+          }
+        });
+
+    this.staircaseCheckBox = new JCheckBox(SwingTools.getLocalizedLabelText(preferences, 
+        ImportedFurnitureWizardStepsPanel.class, "staircaseCheckBox.text"));
+    this.staircaseCheckBox.addItemListener(new ItemListener() {
+        public void itemStateChanged(ItemEvent ev) {
+          controller.setStaircaseCutOutShape(staircaseCheckBox.isSelected() 
+              ? "M0,0 v1 h1 v-1 z" 
+              : null);
+        }
+      });
+    controller.addPropertyChangeListener(ImportedFurnitureWizardController.Property.STAIRCASE_CUT_OUT_SHAPE,
+        new PropertyChangeListener() {
+          public void propertyChange(PropertyChangeEvent ev) {
+            // If staircase cut out shape changes update its check box
+            String staircaseCutOutShape = controller.getStaircaseCutOutShape();
+            staircaseCheckBox.setSelected(staircaseCutOutShape != null);
+            movableCheckBox.setEnabled(!controller.isDoorOrWindow() && staircaseCutOutShape == null);
           }
         });
 
@@ -654,6 +711,106 @@
   }
 
   /**
+   * A button that repeats its action when kept pressed.
+   */
+  private class AutoRepeatButton extends JButton {
+    private boolean shiftPressed;
+
+    public AutoRepeatButton(final Action action) {
+      super(action);
+      // Create a timer that will repeat action each 40 ms when SHIFT is pressed
+      final Timer timer = new Timer(40, new ActionListener() {
+          public void actionPerformed(final ActionEvent ev) {
+            action.actionPerformed(
+                new ActionEvent(this, ActionEvent.ACTION_PERFORMED, null, ev.getWhen(), ActionEvent.SHIFT_MASK));
+            showOrientationToolTip();
+          }
+        });
+      timer.setInitialDelay(250);
+      
+      // Update timer when button is armed
+      addChangeListener(new ChangeListener() {
+          public void stateChanged(ChangeEvent ev) {
+            EventQueue.invokeLater(new Runnable() {
+                public void run() {
+                  if (shiftPressed) {
+                    if (getModel().isArmed()
+                        && !timer.isRunning()) {
+                      timer.restart();
+                    } else if (!getModel().isArmed()
+                               && timer.isRunning()) {
+                      timer.stop();
+                    }
+                  }
+                }
+              });
+          }
+        });
+      addMouseListener(new MouseAdapter() {
+          @Override
+          public void mousePressed(final MouseEvent ev) {
+            shiftPressed = ev.isShiftDown();
+          }
+          
+          @Override
+          public void mouseClicked(final MouseEvent ev) {
+            showOrientationToolTip();
+          }
+          
+          @Override
+          public void mouseReleased(MouseEvent ev) {
+            new Timer(500, new ActionListener() {
+                public void actionPerformed(final ActionEvent ev) {
+                  deleteOrientationToolTip();
+                  ((Timer)ev.getSource()).stop();
+                }
+              }).start();
+          }
+        });
+    }
+  }
+
+  /**
+   * Shows the orientation tool tip.
+   */
+  private void showOrientationToolTip() {
+    if (this.orientationToolTipWindow == null) {
+      // Show tool tip in a window (we don't use a Swing Popup because 
+      // we require the tool tip window to resize itself depending on the content)
+      this.orientationToolTipWindow = new JWindow(SwingUtilities.getWindowAncestor(this));
+      this.orientationToolTipWindow.setFocusableWindowState(false);
+      this.orientationToolTipWindow.add(this.orientationToolTip);
+    } else {
+      this.orientationToolTip.revalidate();
+    }
+    Point point = MouseInfo.getPointerInfo().getLocation();
+    // Add to point the half of cursor size
+    Dimension cursorSize = getToolkit().getBestCursorSize(16, 16);
+    if (cursorSize.width != 0) {
+      point.x += cursorSize.width + 2;
+      point.y += cursorSize.height + 2;
+    } else {
+      // If custom cursor isn't supported let's consider 
+      // default cursor size is 16 pixels wide
+      point.x += 18;
+      point.y += 18;
+    }
+    this.orientationToolTipWindow.setLocation(point);
+    this.orientationToolTipWindow.pack();
+    this.orientationToolTipWindow.setVisible(true);
+    this.orientationToolTip.paintImmediately(this.orientationToolTip.getBounds());
+  }
+  
+  /**
+   * Deletes tool tip text window from screen. 
+   */
+  private void deleteOrientationToolTip() {
+    if (this.orientationToolTipWindow != null) {
+      this.orientationToolTipWindow.setVisible(false);
+    }
+  }
+
+  /**
    * Sets components mnemonics and label / component associations.
    */
   private void setMnemonics(UserPreferences preferences) {
@@ -688,6 +845,8 @@
           ImportedFurnitureWizardStepsPanel.class, "movableCheckBox.mnemonic")).getKeyCode());;
       this.doorOrWindowCheckBox.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
           ImportedFurnitureWizardStepsPanel.class, "doorOrWindowCheckBox.mnemonic")).getKeyCode());;
+      this.staircaseCheckBox.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
+          ImportedFurnitureWizardStepsPanel.class, "staircaseCheckBox.mnemonic")).getKeyCode());;
       this.colorLabel.setDisplayedMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
           ImportedFurnitureWizardStepsPanel.class, "colorLabel.mnemonic")).getKeyCode());
       this.colorLabel.setLabelFor(this.colorButton);
@@ -739,6 +898,9 @@
     rotationButtonsPanel.add(this.turnLeftButton, new GridBagConstraints(
         0, 1, 1, 1, 0, 0, GridBagConstraints.EAST, 
         GridBagConstraints.NONE, new Insets(0, 0, 5, 5), 0, 0));
+    rotationButtonsPanel.add(this.defaultOrientationButton, new GridBagConstraints(
+        1, 1, 1, 1, 0, 0, GridBagConstraints.CENTER, 
+        GridBagConstraints.NONE, new Insets(0, 0, 5, 0), 0, 0));
     rotationButtonsPanel.add(this.turnRightButton, new GridBagConstraints(
         2, 1, 1, 1, 1, 0, GridBagConstraints.WEST, 
         GridBagConstraints.NONE, new Insets(0, 5, 5, 0), 0, 0));
@@ -810,18 +972,21 @@
     attributesPanel.add(this.doorOrWindowCheckBox, new GridBagConstraints(
         1, 10, 2, 1, 0, 0, GridBagConstraints.LINE_START, 
         GridBagConstraints.NONE, new Insets(0, 0, 10, 0), 0, 0));
+    attributesPanel.add(this.staircaseCheckBox, new GridBagConstraints(
+        1, 11, 2, 1, 0, 0, GridBagConstraints.LINE_START, 
+        GridBagConstraints.NONE, new Insets(0, 0, 10, 0), 0, 0));
     attributesPanel.add(this.colorLabel, new GridBagConstraints(
-        1, 11, 1, 1, 0, 0, GridBagConstraints.LINE_START, 
+        1, 12, 1, 1, 0, 0, GridBagConstraints.LINE_START, 
         GridBagConstraints.NONE, new Insets(0, 0, 5, 5), 0, 0));
     attributesPanel.add(this.colorButton, new GridBagConstraints(
-        2, 11, 1, 1, 0, 0, GridBagConstraints.CENTER, 
+        2, 12, 1, 1, 0, 0, GridBagConstraints.CENTER, 
         GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 0), 0, 0));
     attributesPanel.add(this.clearColorButton, new GridBagConstraints(
-        2, 12, 1, 1, 0, 0, GridBagConstraints.CENTER, 
+        2, 13, 1, 1, 0, 0, GridBagConstraints.CENTER, 
         GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 0), 0, 0));
     // Add a dummy label to force components to be at top of panel
     attributesPanel.add(new JLabel(), new GridBagConstraints(
-        1, 13, 1, 1, 1, 1, GridBagConstraints.CENTER, 
+        1, 14, 1, 1, 1, 1, GridBagConstraints.CENTER, 
         GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
 
     JPanel iconPanel = new JPanel(new GridBagLayout());
@@ -841,7 +1006,7 @@
   /**
    * Switches to the component card matching current step.   
    */
-  public void updateStep(ImportedFurnitureWizardController controller) {
+  private void updateStep(ImportedFurnitureWizardController controller) {
     ImportedFurnitureWizardController.Step step = controller.getStep();
     this.cardLayout.show(this, step.name());
     switch (step) {
@@ -1234,7 +1399,7 @@
      * displayed by this component.
      */
     protected void addRotationListener(final ImportedFurnitureWizardController controller) {
-      controller.addPropertyChangeListener(ImportedFurnitureWizardController.Property.BACK_FACE_SHOWN, 
+      controller.addPropertyChangeListener(ImportedFurnitureWizardController.Property.BACK_FACE_SHOWN,  
           new PropertyChangeListener() {
             public void propertyChange(PropertyChangeEvent ev) {
               setBackFaceShown(controller.isBackFaceShown());
@@ -1245,38 +1410,41 @@
             setModelRotation(controller.getModelRotation());
             
             // Update size when a new rotation is provided
-            if (ev.getOldValue() != null) {
-              float width = controller.getWidth();
-              float depth = controller.getDepth();
-              float height = controller.getHeight();
-              
-              // Compute size before old model rotation
-              float [][] oldModelRotation = (float [][])ev.getOldValue();
-              Matrix3f oldModelRotationMatrix = new Matrix3f(oldModelRotation [0][0], oldModelRotation [0][1], oldModelRotation [0][2],
-                  oldModelRotation [1][0], oldModelRotation [1][1], oldModelRotation [1][2],
-                  oldModelRotation [2][0], oldModelRotation [2][1], oldModelRotation [2][2]);
-              oldModelRotationMatrix.invert();
-              float oldWidth = oldModelRotationMatrix.m00 * width 
-                  + oldModelRotationMatrix.m01 * height 
-                  + oldModelRotationMatrix.m02 * depth;
-              float oldHeight = oldModelRotationMatrix.m10 * width 
-                  + oldModelRotationMatrix.m11 * height 
-                  + oldModelRotationMatrix.m12 * depth;
-              float oldDepth = oldModelRotationMatrix.m20 * width 
-                  + oldModelRotationMatrix.m21 * height 
-                  + oldModelRotationMatrix.m22 * depth;
-              
-              // Compute size after new model rotation
-              float [][] newModelRotation = (float [][])ev.getNewValue();
-              controller.setWidth(Math.abs(newModelRotation [0][0] * oldWidth 
-                  + newModelRotation [0][1] * oldHeight 
-                  + newModelRotation [0][2] * oldDepth));
-              controller.setHeight(Math.abs(newModelRotation [1][0] * oldWidth 
-                  + newModelRotation [1][1] * oldHeight 
-                  + newModelRotation [1][2] * oldDepth));
-              controller.setDepth(Math.abs(newModelRotation [2][0] * oldWidth 
-                  + newModelRotation [2][1] * oldHeight 
-                  + newModelRotation [2][2] * oldDepth));
+            BranchGroup model = getModel();
+            if (ev.getOldValue() != null
+                && model != null) {
+              try {
+                float [][] oldModelRotation = (float [][])ev.getOldValue();
+                Transform3D normalization = ModelManager.getInstance().getNormalizedTransform(model, oldModelRotation, 1f);
+                Transform3D scaleTransform = new Transform3D();
+                scaleTransform.setScale(new Vector3d(controller.getWidth(), controller.getHeight(), controller.getDepth()));
+                scaleTransform.mul(normalization);
+                
+                // Compute rotation before old model rotation
+                Matrix3f oldModelRotationMatrix = new Matrix3f(oldModelRotation [0][0], oldModelRotation [0][1], oldModelRotation [0][2],
+                    oldModelRotation [1][0], oldModelRotation [1][1], oldModelRotation [1][2],
+                    oldModelRotation [2][0], oldModelRotation [2][1], oldModelRotation [2][2]);
+                oldModelRotationMatrix.invert();
+                Transform3D backRotationTransform = new Transform3D();
+                backRotationTransform.setRotation(oldModelRotationMatrix);
+                backRotationTransform.mul(scaleTransform);
+                
+                // Compute size after new model rotation
+                float [][] newModelRotation = (float [][])ev.getNewValue();
+                Matrix3f newModelRotationMatrix = new Matrix3f(newModelRotation [0][0], newModelRotation [0][1], newModelRotation [0][2],
+                    newModelRotation [1][0], newModelRotation [1][1], newModelRotation [1][2],
+                    newModelRotation [2][0], newModelRotation [2][1], newModelRotation [2][2]);
+                Transform3D transform = new Transform3D();
+                transform.setRotation(newModelRotationMatrix);
+                transform.mul(backRotationTransform);
+                
+                Vector3f newSize = ModelManager.getInstance().getSize(model, transform);
+                controller.setWidth(newSize.x);
+                controller.setHeight(newSize.y);
+                controller.setDepth(newSize.z);
+              } catch (IllegalArgumentException ex) {
+                // Model is empty
+              }
             }
           }
         };
@@ -1295,7 +1463,7 @@
               setBackFaceShown(controller.isBackFaceShown());
             }
           });
-      PropertyChangeListener sizeChangeListener = new PropertyChangeListener () {
+      PropertyChangeListener sizeChangeListener = new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent ev) {
             setModelRotationAndSize(controller.getModelRotation(),
                 controller.getWidth(), controller.getDepth(), controller.getHeight());
@@ -1346,10 +1514,13 @@
    */
   private static class RotationPreviewComponent extends AbstractModelPreviewComponent {
     private JLabel   frontViewLabel;
+    private JPanel   frontViewPanel;
     private Canvas3D frontViewCanvas;
     private JLabel   sideViewLabel;
+    private JPanel   sideViewPanel;
     private Canvas3D sideViewCanvas;
     private JLabel   topViewLabel;
+    private JPanel   topViewPanel;
     private Canvas3D topViewCanvas;
     private JLabel   perspectiveViewLabel;
 
@@ -1358,6 +1529,12 @@
       addRotationListener(controller);
       createComponents(preferences);
       layoutComponents();
+      GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
+      if (graphicsEnvironment.getScreenDevices().length == 1) {
+        // If only one screen device is available, create canvases 3D immediately, 
+        // otherwise create it once the screen device of the parent is known
+        createOtherViewsCanvas3D(graphicsEnvironment.getDefaultScreenDevice().getDefaultConfiguration());
+      }
     }
 
     /**
@@ -1366,20 +1543,36 @@
     private void createComponents(UserPreferences preferences) {
       this.frontViewLabel = new JLabel(preferences.getLocalizedString(
           ImportedFurnitureWizardStepsPanel.class, "frontViewLabel.text"));
-      Component3DManager canvas3DManager = Component3DManager.getInstance();
-      this.frontViewCanvas = canvas3DManager.getOnscreenCanvas3D();
+      this.frontViewPanel = new JPanel(new GridLayout());
       this.sideViewLabel = new JLabel(preferences.getLocalizedString(
           ImportedFurnitureWizardStepsPanel.class, "sideViewLabel.text"));
-      this.sideViewCanvas = canvas3DManager.getOnscreenCanvas3D();
+      this.sideViewPanel = new JPanel(new GridLayout());
       this.topViewLabel = new JLabel(preferences.getLocalizedString(
           ImportedFurnitureWizardStepsPanel.class, "topViewLabel.text"));
-      this.topViewCanvas = canvas3DManager.getOnscreenCanvas3D();
+      this.topViewPanel = new JPanel(new GridLayout());
       this.perspectiveViewLabel = new JLabel(preferences.getLocalizedString(
           ImportedFurnitureWizardStepsPanel.class, "perspectiveViewLabel.text"));
       
       setBorder(null);
       // Add a hierarchy listener to link canvases to universe once this component is made visible 
-      addHierarchyListener();
+      addAncestorListener();
+    }
+
+    /**
+     * Creates the 3D canvases for front, side and top view.
+     */
+    private void createOtherViewsCanvas3D(GraphicsConfiguration configuration) {
+      Component3DManager canvas3DManager = Component3DManager.getInstance();
+      frontViewCanvas = canvas3DManager.getOnscreenCanvas3D(configuration, null);
+      Color backgroundColor = new Color(0xE5E5E5);
+      frontViewCanvas.setBackground(backgroundColor);
+      frontViewPanel.add(frontViewCanvas);
+      sideViewCanvas = canvas3DManager.getOnscreenCanvas3D(configuration, null);
+      sideViewCanvas.setBackground(backgroundColor);
+      sideViewPanel.add(sideViewCanvas);
+      topViewCanvas = canvas3DManager.getOnscreenCanvas3D(configuration, null);
+      topViewCanvas.setBackground(backgroundColor);
+      topViewPanel.add(topViewCanvas);
     }
 
     @Override
@@ -1388,21 +1581,30 @@
     }
 
     /**
-     * Adds a hierarchy listener to this component to manage canvases attachment to universe.  
+     * Adds an ancestor listener to this component to manage canvases attachment to universe.  
      */
-    private void addHierarchyListener() {
+    private void addAncestorListener() {
       addAncestorListener(new AncestorListener() {
-          public void ancestorAdded(AncestorEvent event) {
-            // Attach the 3 other canvases to super class universe with their own view
-            createView(0, 0, 1, View.PARALLEL_PROJECTION).addCanvas3D(frontViewCanvas);
-            createView(Locale.getDefault().equals(Locale.US) 
-                          ? -(float)Math.PI / 2 
+          public void ancestorAdded(AncestorEvent ev) {
+            if (frontViewCanvas == null) {
+              createOtherViewsCanvas3D(ev.getAncestor().getGraphicsConfiguration());
+            }
+            EventQueue.invokeLater(new Runnable() {
+                public void run() {
+                  // Attach the 3 other canvases to super class universe with their own view once main view is attached           
+                  createView(0, 0, 1, View.PARALLEL_PROJECTION).addCanvas3D(frontViewCanvas);
+                  createView(Locale.getDefault().equals(Locale.US) 
+                      ? -(float)Math.PI / 2 
                           : (float)Math.PI / 2, 
-                0, 1, View.PARALLEL_PROJECTION).addCanvas3D(sideViewCanvas);
-            createView(0, -(float)Math.PI / 2, 1, View.PARALLEL_PROJECTION).addCanvas3D(topViewCanvas);
+                          0, 1, View.PARALLEL_PROJECTION).addCanvas3D(sideViewCanvas);
+                  createView(0, -(float)Math.PI / 2, 1, View.PARALLEL_PROJECTION).addCanvas3D(topViewCanvas);
+                  revalidate();
+                  repaint();
+                }
+              });
           }
           
-          public void ancestorRemoved(AncestorEvent event) {
+          public void ancestorRemoved(AncestorEvent ev) {
             // Detach the 3 canvases from their view
             frontViewCanvas.getView().removeCanvas3D(frontViewCanvas);
             sideViewCanvas.getView().removeCanvas3D(sideViewCanvas);
@@ -1410,18 +1612,18 @@
             // Super class did the remaining of clean up
           }
           
-          public void ancestorMoved(AncestorEvent event) {
+          public void ancestorMoved(AncestorEvent ev) {
           }        
         });
     }
     
     /**
-     * Returns a bordered panel that includes <code>canvas3D</code>.
+     * Returns a bordered panel that includes <code>component3D</code>.
      */
-    private JPanel getCanvas3DBorderedPanel(Canvas3D canvas3D) {
+    private JPanel getCanvas3DBorderedPanel(Component component3D) {
       JPanel canvasPanel = new JPanel(new GridLayout(1, 1));
-      canvasPanel.add(canvas3D);
-      canvas3D.setFocusable(false);      
+      canvasPanel.add(component3D);
+      component3D.setFocusable(false);      
       canvasPanel.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));      
       return canvasPanel;
     }
@@ -1430,8 +1632,8 @@
      * Layouts components. 
      */
     private void layoutComponents() {
-      // Remove default canvas 3D to put it in another place
-      Canvas3D defaultCanvas = getCanvas3D(); 
+      // Remove default component 3D to put it in another place
+      JComponent defaultCanvas = getComponent3D(); 
       remove(defaultCanvas);
       setLayout(new GridBagLayout());
       
@@ -1448,21 +1650,21 @@
         add(this.topViewLabel, new GridBagConstraints(
             1, 0, 1, 1, 0, 0, GridBagConstraints.CENTER, 
             GridBagConstraints.NONE, new Insets(0, 0, 2, 0), 0, 0));
-        add(getCanvas3DBorderedPanel(this.topViewCanvas), new GridBagConstraints(
+        add(getCanvas3DBorderedPanel(this.topViewPanel), new GridBagConstraints(
             1, 1, 1, 1, 1, 1, GridBagConstraints.CENTER, 
             GridBagConstraints.BOTH, new Insets(0, 0, 5, 0), 0, 0));
         // Left view at bottom left
         add(this.sideViewLabel, new GridBagConstraints(
             0, 2, 1, 1, 0, 0, GridBagConstraints.CENTER, 
             GridBagConstraints.NONE, new Insets(0, 0, 2, 5), 0, 0));
-        add(getCanvas3DBorderedPanel(this.sideViewCanvas), new GridBagConstraints(
+        add(getCanvas3DBorderedPanel(this.sideViewPanel), new GridBagConstraints(
             0, 3, 1, 1, 1, 1, GridBagConstraints.CENTER, 
             GridBagConstraints.BOTH, new Insets(0, 0, 0, 5), 0, 0));
         // Front view at bottom right
         add(this.frontViewLabel, new GridBagConstraints(
             1, 2, 1, 1, 0, 0, GridBagConstraints.CENTER, 
             GridBagConstraints.NONE, new Insets(0, 0, 2, 0), 0, 0));
-        add(getCanvas3DBorderedPanel(this.frontViewCanvas), new GridBagConstraints(
+        add(getCanvas3DBorderedPanel(this.frontViewPanel), new GridBagConstraints(
             1, 3, 1, 1, 1, 1, GridBagConstraints.CENTER, 
             GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
       } else {
@@ -1470,14 +1672,14 @@
         add(this.sideViewLabel, new GridBagConstraints(
             0, 0, 1, 1, 0, 0, GridBagConstraints.CENTER, 
             GridBagConstraints.NONE, new Insets(0, 0, 2, 5), 0, 0));
-        add(getCanvas3DBorderedPanel(this.sideViewCanvas), new GridBagConstraints(
+        add(getCanvas3DBorderedPanel(this.sideViewPanel), new GridBagConstraints(
             0, 1, 1, 1, 1, 1, GridBagConstraints.CENTER, 
             GridBagConstraints.BOTH, new Insets(0, 0, 5, 5), 0, 0));
         // Front view at top right
         add(this.frontViewLabel, new GridBagConstraints(
             1, 0, 1, 1, 0, 0, GridBagConstraints.CENTER, 
             GridBagConstraints.NONE, new Insets(0, 0, 2, 0), 0, 0));
-        add(getCanvas3DBorderedPanel(this.frontViewCanvas), new GridBagConstraints(
+        add(getCanvas3DBorderedPanel(this.frontViewPanel), new GridBagConstraints(
             1, 1, 1, 1, 1, 1, GridBagConstraints.CENTER, 
             GridBagConstraints.BOTH, new Insets(0, 0, 5, 0), 0, 0));
         // Default projection view at bottom left
@@ -1491,7 +1693,7 @@
         add(this.topViewLabel, new GridBagConstraints(
             1, 2, 1, 1, 0, 0, GridBagConstraints.CENTER, 
             GridBagConstraints.NONE, new Insets(0, 0, 2, 0), 0, 0));
-        add(getCanvas3DBorderedPanel(this.topViewCanvas), new GridBagConstraints(
+        add(getCanvas3DBorderedPanel(this.topViewPanel), new GridBagConstraints(
             1, 3, 1, 1, 1, 1, GridBagConstraints.CENTER, 
             GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
       }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/ImportedTextureWizardStepsPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/ImportedTextureWizardStepsPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/ImportedTextureWizardStepsPanel.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/ImportedTextureWizardStepsPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -302,8 +302,9 @@
     this.widthLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences,
         ImportedTextureWizardStepsPanel.class, "widthLabel.text", unitName)); 
     float minimumLength = preferences.getLengthUnit().getMinimumLength();
+    float maximumLength = preferences.getLengthUnit().getMaximumLength();
     final NullableSpinner.NullableSpinnerLengthModel widthSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength);
     this.widthSpinner = new NullableSpinner(widthSpinnerModel);
     widthSpinnerModel.addChangeListener(new ChangeListener () {
         public void stateChanged(ChangeEvent ev) {
@@ -324,7 +325,7 @@
     this.heightLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences,
             ImportedTextureWizardStepsPanel.class, "heightLabel.text", unitName)); 
     final NullableSpinner.NullableSpinnerLengthModel heightSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength);
     this.heightSpinner = new NullableSpinner(heightSpinnerModel);
     heightSpinnerModel.addChangeListener(new ChangeListener () {
         public void stateChanged(ChangeEvent ev) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/LabelPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/LabelPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/LabelPanel.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/LabelPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -77,7 +77,7 @@
     // Create text label and its text field bound to NAME controller property
     this.textLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         LabelPanel.class, "textLabel.text"));
-    this.textTextField = new JTextField(controller.getText(), 20);
+    this.textTextField = new AutoCompleteTextField(controller.getText(), 20, preferences.getAutoCompletionStrings("LabelText"));
     if (!OperatingSystem.isMacOSXLeopardOrSuperior()) {
       SwingTools.addAutoSelectionOnFocusGain(this.textTextField);
     }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/LevelPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/LevelPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/LevelPanel.java	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/LevelPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,423 @@
+/*
+ * LevelPanel.java  27 oct 2011
+ *
+ * Sweet Home 3D, Copyright (c) 2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package com.eteks.sweethome3d.swing;
+
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.DefaultListSelectionModel;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JSpinner;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.table.AbstractTableModel;
+
+import com.eteks.sweethome3d.model.Level;
+import com.eteks.sweethome3d.model.UserPreferences;
+import com.eteks.sweethome3d.tools.OperatingSystem;
+import com.eteks.sweethome3d.viewcontroller.DialogView;
+import com.eteks.sweethome3d.viewcontroller.LevelController;
+import com.eteks.sweethome3d.viewcontroller.View;
+
+/**
+ * Level editing panel.
+ * @author Emmanuel Puybaret
+ */
+public class LevelPanel extends JPanel implements DialogView {
+  private final LevelController controller;
+  private JLabel                nameLabel;
+  private JTextField            nameTextField;
+  private JLabel                elevationLabel;
+  private JSpinner              elevationSpinner;
+  private JLabel                floorThicknessLabel;
+  private JSpinner              floorThicknessSpinner;
+  private JLabel                heightLabel;
+  private JSpinner              heightSpinner;
+  private JLabel                levelsSummaryLabel;
+  private JTable                levelsSummaryTable;
+  private String                dialogTitle;
+
+  /**
+   * Creates a panel that displays home levels data according to the units 
+   * set in <code>preferences</code>.
+   * @param preferences user preferences
+   * @param controller the controller of this panel
+   */
+  public LevelPanel(UserPreferences preferences,
+                    LevelController controller) {
+    super(new GridBagLayout());
+    this.controller = controller;
+    createComponents(preferences, controller);
+    setMnemonics(preferences);
+    layoutComponents(preferences, controller);
+  }
+
+  /**
+   * Creates and initializes components and spinners model.
+   */
+  private void createComponents(UserPreferences preferences, 
+                                final LevelController controller) {
+    // Get unit name matching current unit 
+    String unitName = preferences.getLengthUnit().getName();
+    
+    if (controller.isPropertyEditable(LevelController.Property.NAME)) {
+      // Create name label and its text field bound to NAME controller property
+      this.nameLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, LevelPanel.class, "nameLabel.text"));
+      this.nameTextField = new AutoCompleteTextField(controller.getName(), 15, preferences.getAutoCompletionStrings("LevelName"));
+      if (!OperatingSystem.isMacOSXLeopardOrSuperior()) {
+        SwingTools.addAutoSelectionOnFocusGain(this.nameTextField);
+      }
+      final PropertyChangeListener nameChangeListener = new PropertyChangeListener() {
+          public void propertyChange(PropertyChangeEvent ev) {
+            nameTextField.setText(controller.getName());
+          }
+        };
+      controller.addPropertyChangeListener(LevelController.Property.NAME, nameChangeListener);
+      this.nameTextField.getDocument().addDocumentListener(new DocumentListener() {
+          public void changedUpdate(DocumentEvent ev) {
+            controller.removePropertyChangeListener(LevelController.Property.NAME, nameChangeListener);
+            String name = nameTextField.getText(); 
+            if (name == null || name.trim().length() == 0) {
+              controller.setName(null);
+            } else {
+              controller.setName(name);
+            }
+            controller.addPropertyChangeListener(LevelController.Property.NAME, nameChangeListener);
+          }
+    
+          public void insertUpdate(DocumentEvent ev) {
+            changedUpdate(ev);
+          }
+    
+          public void removeUpdate(DocumentEvent ev) {
+            changedUpdate(ev);
+          }
+        });
+    }
+        
+    final float maximumLength = preferences.getLengthUnit().getMaximumLength();
+    if (controller.isPropertyEditable(LevelController.Property.ELEVATION)) {
+      // Create elevation label and its spinner bound to ELEVATION controller property
+      this.elevationLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
+          LevelPanel.class, "elevationLabel.text", unitName));
+      final NullableSpinner.NullableSpinnerLengthModel elevationSpinnerModel = 
+          new NullableSpinner.NullableSpinnerLengthModel(preferences, -1000f, preferences.getLengthUnit().getMaximumElevation());
+      this.elevationSpinner = new NullableSpinner(elevationSpinnerModel);
+      elevationSpinnerModel.setNullable(controller.getElevation() == null);
+      elevationSpinnerModel.setLength(controller.getElevation());
+      final PropertyChangeListener elevationChangeListener = new PropertyChangeListener() {
+          public void propertyChange(PropertyChangeEvent ev) {
+            elevationSpinnerModel.setNullable(ev.getNewValue() == null);
+            elevationSpinnerModel.setLength((Float)ev.getNewValue());
+          }
+        };
+      controller.addPropertyChangeListener(LevelController.Property.ELEVATION, 
+          elevationChangeListener);
+      elevationSpinnerModel.addChangeListener(new ChangeListener() {
+          public void stateChanged(ChangeEvent ev) {
+            controller.removePropertyChangeListener(LevelController.Property.ELEVATION, 
+                elevationChangeListener);
+            controller.setElevation(elevationSpinnerModel.getLength());
+            controller.addPropertyChangeListener(LevelController.Property.ELEVATION, 
+                elevationChangeListener);
+          }
+        });
+    }
+    
+    final float minimumLength = preferences.getLengthUnit().getMinimumLength();
+    if (controller.isPropertyEditable(LevelController.Property.FLOOR_THICKNESS)) {
+      // Create floor thickness label and its spinner bound to FLOOR_THICKNESS controller property
+      this.floorThicknessLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
+          LevelPanel.class, "floorThicknessLabel.text", unitName));
+      final NullableSpinner.NullableSpinnerLengthModel floorThicknessSpinnerModel = 
+          new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength / 10);
+      this.floorThicknessSpinner = new NullableSpinner(floorThicknessSpinnerModel);
+      final PropertyChangeListener floorThicknessChangeListener = new PropertyChangeListener() {
+          public void propertyChange(PropertyChangeEvent ev) {
+            Float floorThickness = controller.getFloorThickness();
+            floorThicknessSpinnerModel.setNullable(floorThickness == null);
+            floorThicknessSpinnerModel.setLength(floorThickness);
+          }
+        };
+      floorThicknessChangeListener.propertyChange(null);
+      controller.addPropertyChangeListener(LevelController.Property.FLOOR_THICKNESS, floorThicknessChangeListener);
+      floorThicknessSpinnerModel.addChangeListener(new ChangeListener() {
+          public void stateChanged(ChangeEvent ev) {
+            controller.removePropertyChangeListener(LevelController.Property.FLOOR_THICKNESS, floorThicknessChangeListener);
+            controller.setFloorThickness(floorThicknessSpinnerModel.getLength());
+            controller.addPropertyChangeListener(LevelController.Property.FLOOR_THICKNESS, floorThicknessChangeListener);
+          }
+        });
+    }
+    
+    if (controller.isPropertyEditable(LevelController.Property.HEIGHT)) {
+      // Create floor thickness label and its spinner bound to HEIGHT controller property
+      this.heightLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
+          LevelPanel.class, "heightLabel.text", unitName));
+      final NullableSpinner.NullableSpinnerLengthModel heightSpinnerModel = 
+          new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength);
+      this.heightSpinner = new NullableSpinner(heightSpinnerModel);
+      final PropertyChangeListener heightChangeListener = new PropertyChangeListener() {
+          public void propertyChange(PropertyChangeEvent ev) {
+            Float height = controller.getHeight();
+            heightSpinnerModel.setNullable(height == null);
+            heightSpinnerModel.setLength(height);
+          }
+        };
+      heightChangeListener.propertyChange(null);
+      controller.addPropertyChangeListener(LevelController.Property.HEIGHT, heightChangeListener);
+      heightSpinnerModel.addChangeListener(new ChangeListener() {
+          public void stateChanged(ChangeEvent ev) {
+            controller.removePropertyChangeListener(LevelController.Property.HEIGHT, heightChangeListener);
+            controller.setHeight(heightSpinnerModel.getLength());
+            controller.addPropertyChangeListener(LevelController.Property.HEIGHT, heightChangeListener);
+          }
+        });
+    }
+    
+    this.levelsSummaryLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
+        LevelPanel.class, "levelsSummaryLabel.text", unitName));
+    final String [] columnNames = {
+         SwingTools.getLocalizedLabelText(preferences, LevelPanel.class, "nameColumn"),
+         SwingTools.getLocalizedLabelText(preferences, LevelPanel.class, "elevationColumn"),
+         SwingTools.getLocalizedLabelText(preferences, LevelPanel.class, "floorThicknessColumn"),
+         SwingTools.getLocalizedLabelText(preferences, LevelPanel.class, "heightColumn")};
+    this.levelsSummaryTable = new JTable(new LevelsTableModel(controller.getLevels(), columnNames));
+    // Ensure only selected level is selected in the table
+    this.levelsSummaryTable.setSelectionModel(new DefaultListSelectionModel() {
+        public void setSelectionInterval(int index0, int index1) {
+        }
+        
+        public void setLeadSelectionIndex(int index) {
+        }
+        
+        public void setAnchorSelectionIndex(int index) {
+        }
+        
+        public boolean isSelectionEmpty() {
+          return controller.getSelectedLevelIndex() != null;
+        }
+        
+        public boolean isSelectedIndex(int index) {
+          return controller.getSelectedLevelIndex() == index;
+        }
+        
+        public void insertIndexInterval(int index, int length, boolean before) {
+        }
+      });
+    this.levelsSummaryTable.setFocusable(false);
+    this.levelsSummaryTable.addAncestorListener(new AncestorListener() {
+        public void ancestorAdded(AncestorEvent ev) {
+          // Ensure selected row is visible when table is displayed 
+          Integer selectedRow = controller.getSelectedLevelIndex();
+          if (selectedRow != null) {
+            levelsSummaryTable.scrollRectToVisible(levelsSummaryTable.getCellRect(selectedRow, 0, true));
+          }  
+          ev.getComponent().removeAncestorListener(this);        
+        }
+        
+        public void ancestorRemoved(AncestorEvent ev) {
+        }
+        
+        public void ancestorMoved(AncestorEvent ev) {
+        }
+      });
+    
+    this.dialogTitle = preferences.getLocalizedString(LevelPanel.class, "level.title");
+  }
+  
+  /**
+   * Sets components mnemonics and label / component associations.
+   */
+  private void setMnemonics(UserPreferences preferences) {
+    if (!OperatingSystem.isMacOSX()) {
+      if (this.nameLabel != null) {
+        this.nameLabel.setDisplayedMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
+            LevelPanel.class, "nameLabel.mnemonic")).getKeyCode());
+        this.nameLabel.setLabelFor(this.nameTextField);
+      }
+      if (this.elevationLabel != null) {
+        this.elevationLabel.setDisplayedMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
+            LevelPanel.class, "elevationLabel.mnemonic")).getKeyCode());
+        this.elevationLabel.setLabelFor(this.elevationSpinner);
+      }
+      if (this.floorThicknessLabel != null) {
+        this.floorThicknessLabel.setDisplayedMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
+            LevelPanel.class, "floorThicknessLabel.mnemonic")).getKeyCode());
+        this.floorThicknessLabel.setLabelFor(this.floorThicknessSpinner);
+      }
+      if (this.heightLabel != null) {
+        this.heightLabel.setDisplayedMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
+            LevelPanel.class, "heightLabel.mnemonic")).getKeyCode());
+        this.heightLabel.setLabelFor(this.heightSpinner);
+      }
+    }
+  }
+  
+  /**
+   * Layouts panel components in panel with their labels. 
+   */
+  private void layoutComponents(UserPreferences preferences, 
+                                final LevelController controller) {
+    int labelAlignment = OperatingSystem.isMacOSX() 
+        ? GridBagConstraints.LINE_END
+        : GridBagConstraints.LINE_START;
+    Insets labelInsets = new Insets(0, 0, 5, 5);
+    Insets rightComponentInsets = new Insets(0, 0, 5, 0);
+    if (this.nameLabel != null) {
+      // First row    
+      add(this.nameLabel, new GridBagConstraints(
+          0, 0, 1, 1, 0, 0, labelAlignment, 
+          GridBagConstraints.NONE, labelInsets, 0, 0));
+      add(this.nameTextField, new GridBagConstraints(
+          1, 0, 2, 1, 0, 0, GridBagConstraints.LINE_START, 
+          GridBagConstraints.HORIZONTAL, rightComponentInsets, 0, 0));
+    }
+    if (this.elevationLabel != null) {
+      // Second row
+      add(this.elevationLabel, new GridBagConstraints(
+          0, 1, 1, 1, 0, 0, labelAlignment, 
+          GridBagConstraints.NONE, labelInsets, 0, 0));
+      add(this.elevationSpinner, new GridBagConstraints(
+          1, 1, 1, 1, 0.1, 0, GridBagConstraints.LINE_START, 
+          GridBagConstraints.HORIZONTAL, rightComponentInsets, -15, 0));
+      add(new JLabel(), new GridBagConstraints(
+          2, 1, 1, 1, 0.2, 0, GridBagConstraints.LINE_START, 
+          GridBagConstraints.HORIZONTAL, rightComponentInsets, 0, 0));
+    }
+    if (this.floorThicknessLabel != null) {
+      // Third row
+      add(this.floorThicknessLabel, new GridBagConstraints(
+          0, 2, 1, 1, 0, 0, labelAlignment, 
+          GridBagConstraints.NONE, labelInsets, 0, 0));
+      add(this.floorThicknessSpinner, new GridBagConstraints(
+          1, 2, 1, 1, 0.1, 0, GridBagConstraints.LINE_START, 
+          GridBagConstraints.HORIZONTAL, rightComponentInsets, -15, 0));
+      add(new JLabel(), new GridBagConstraints(
+          2, 3, 1, 1, 0.2, 0, GridBagConstraints.LINE_START, 
+          GridBagConstraints.HORIZONTAL, rightComponentInsets, 0, 0));
+    }
+    if (this.heightLabel != null) {
+      // Last row
+      add(this.heightLabel, new GridBagConstraints(
+          0, 3, 1, 1, 0, 0, labelAlignment, 
+          GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
+      add(this.heightSpinner, new GridBagConstraints(
+          1, 3, 1, 1, 0.1, 0, GridBagConstraints.LINE_START, 
+          GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), -15, 0));
+      add(new JLabel(), new GridBagConstraints(
+          2, 3, 1, 1, 0.2, 0, GridBagConstraints.LINE_START, 
+          GridBagConstraints.HORIZONTAL, rightComponentInsets, 0, 0));
+    }
+    add(new JSeparator(), new GridBagConstraints(
+        0, 4, 3, 1, 0, 0, GridBagConstraints.LINE_START, 
+        GridBagConstraints.HORIZONTAL, new Insets(5, 0, 5, 0), 0, 0));
+    add(this.levelsSummaryLabel, new GridBagConstraints(
+        0, 5, 3, 1, 0, 0, GridBagConstraints.LINE_START, 
+        GridBagConstraints.NONE, new Insets(0, 0, 5, 0), 0, 0));
+    JScrollPane levelsSummaryPane = new JScrollPane(this.levelsSummaryTable);
+    levelsSummaryPane.setPreferredSize(new Dimension(320, 150));
+    add(levelsSummaryPane, new GridBagConstraints(
+        0, 6, 4, 1, 1, 1, GridBagConstraints.CENTER, 
+        GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
+  }
+
+  /**
+   * Displays this panel in a modal dialog box. 
+   */
+  public void displayView(View parentView) {
+    if (SwingTools.showConfirmDialog((JComponent)parentView, 
+            this, this.dialogTitle, this.nameTextField) == JOptionPane.OK_OPTION) {
+      this.controller.modifyLevels();
+    }
+  }
+
+  /**
+   * The model of the table used to show levels information. 
+   */
+  private static final class LevelsTableModel extends AbstractTableModel {
+    private final Level  []  levels;
+    private final String [] columnNames;
+
+    private LevelsTableModel(Level [] levels, String [] columnNames) {
+      this.levels = levels;
+      this.columnNames = columnNames;
+    }
+
+    public int getRowCount() {
+      return this.levels.length;
+    }
+
+    public int getColumnCount() {
+      return 4;
+    }
+
+    public Object getValueAt(int rowIndex, int columnIndex) {
+      Level level = this.levels [rowIndex];
+      switch (columnIndex) {
+        case 0 : return level.getName();
+        case 1 : return level.getElevation();
+        case 2 :
+          for ( ; rowIndex > 0; rowIndex--) {
+            if (this.levels [rowIndex - 1].getElevation() < level.getElevation()) {
+              break;
+            }
+          }
+          if (rowIndex == 0) {
+            return null; // Don't display floor thickness of first levels 
+          } else {
+            return level.getFloorThickness();
+          }
+        case 3 : return level.getHeight();
+      }
+      return null;
+    }
+
+    @Override
+    public String getColumnName(int column) {
+      return this.columnNames [column];
+    }
+
+    @Override
+    public Class<?> getColumnClass(int columnIndex) {
+      if (columnIndex == 0) {
+        return String.class;
+      } else {
+        return Float.class;
+      }
+    }
+  }
+}
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/ModelPreviewComponent.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/ModelPreviewComponent.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/ModelPreviewComponent.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/ModelPreviewComponent.java	2011-12-21 00:48:52.000000000 +0000
@@ -20,11 +20,14 @@
 package com.eteks.sweethome3d.swing;
 
 import java.awt.AWTException;
+import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridLayout;
 import java.awt.KeyboardFocusManager;
 import java.awt.Point;
@@ -32,6 +35,8 @@
 import java.awt.Robot;
 import java.awt.Toolkit;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 import java.awt.image.BufferedImage;
@@ -65,6 +70,7 @@
 import javax.media.j3d.View;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
+import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.border.EtchedBorder;
 import javax.swing.event.AncestorEvent;
@@ -89,6 +95,7 @@
  */
 public class ModelPreviewComponent extends JComponent {
   private SimpleUniverse     universe;
+  private JPanel             canvasPanel;
   private Canvas3D           canvas3D;
   private BranchGroup        sceneTree;
   private float              viewYaw = (float) Math.PI / 8;
@@ -108,32 +115,24 @@
    * if <code>pitchAndScaleChangeSupported</code> is <code>true</code>.
    */
   public ModelPreviewComponent(boolean pitchAndScaleChangeSupported) {
-    this.canvas3D = Component3DManager.getInstance().getOnscreenCanvas3D(
-        new Component3DManager.RenderingObserver() {
-          public void canvas3DPreRendered(Canvas3D canvas3d) {
-          }
-          
-          public void canvas3DPostRendered(Canvas3D canvas3d) {
-          }
-          
-          public void canvas3DSwapped(Canvas3D canvas3d) {
-            ModelPreviewComponent.this.canvas3DSwapped();
-          }            
-        });
-
-    // Layout canvas3D
-    setLayout(new GridLayout(1, 1));
-    add(this.canvas3D);
-    this.canvas3D.setFocusable(false);      
-    addMouseListeners(this.canvas3D, pitchAndScaleChangeSupported);
-    
     setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
 
     this.sceneTree = createSceneTree();
     
-    // Add an ancestor listener to create canvas universe once this component is made visible 
+    this.canvasPanel = new JPanel();
+    setLayout(new BorderLayout());
+    add(this.canvasPanel);
+
+    GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
+    if (graphicsEnvironment.getScreenDevices().length == 1) {
+      // If only one screen device is available, create canvas 3D immediately, 
+      // otherwise create it once the screen device of the parent is known
+      createCanvas3D(graphicsEnvironment.getDefaultScreenDevice().getDefaultConfiguration(), pitchAndScaleChangeSupported);
+    }
+
+    // Add an ancestor listener to create canvas 3D and its universe once this component is made visible 
     // and clean up universe once its parent frame is disposed
-    addAncestorListener();
+    addAncestorListener(pitchAndScaleChangeSupported);
   }
 
   /**
@@ -149,16 +148,68 @@
   }
 
   /**
-   * Returns the canvas 3D displayed by this component.
+   * Returns the component displaying the canvas 3D of this component.
    */
-  protected Canvas3D getCanvas3D() {
-    return this.canvas3D;
+  JComponent getComponent3D() {
+    return this.canvasPanel;
+  }
+  
+  /**
+   * Adds an ancestor listener to this component to manage the creation of the canvas and its universe 
+   * and clean up the universe.  
+   */
+  private void addAncestorListener(final boolean pitchAndScaleChangeSupported) {
+    addAncestorListener(new AncestorListener() {
+        public void ancestorAdded(AncestorEvent ev) {
+          if (canvas3D == null) {
+            createCanvas3D(ev.getAncestor().getGraphicsConfiguration(), pitchAndScaleChangeSupported);
+          }
+          if (universe == null) {
+            createUniverse();
+          }
+        }
+        
+        public void ancestorRemoved(AncestorEvent ev) {
+          if (universe != null) {
+            disposeUniverse();
+          }
+        }
+        
+        public void ancestorMoved(AncestorEvent ev) {
+        }        
+      });
   }
   
   /**
+   * Creates the canvas 3D associated with the given <code>configuration</code> device.
+   */
+  private void createCanvas3D(GraphicsConfiguration graphicsConfiguration, 
+                              boolean pitchAndScaleChangeSupported) {
+    this.canvas3D = Component3DManager.getInstance().getOnscreenCanvas3D(graphicsConfiguration,
+        new Component3DManager.RenderingObserver() {
+            public void canvas3DPreRendered(Canvas3D canvas3d) {
+            }
+            
+            public void canvas3DPostRendered(Canvas3D canvas3d) {
+            }
+            
+            public void canvas3DSwapped(Canvas3D canvas3d) {
+              ModelPreviewComponent.this.canvas3DSwapped();
+            }            
+          });
+    this.canvas3D.setBackground(new Color(0xE5E5E5));
+
+    // Layout canvas3D
+    this.canvasPanel.setLayout(new GridLayout());
+    this.canvasPanel.add(this.canvas3D);
+    this.canvas3D.setFocusable(false);      
+    addMouseListeners(this.canvas3D, pitchAndScaleChangeSupported);
+  }
+
+  /**
    * Adds an AWT mouse listener to canvas that will update view platform transform.  
    */
-  private void addMouseListeners(Canvas3D canvas3D, 
+  private void addMouseListeners(final Canvas3D canvas3D, 
                                  final boolean pitchAndScaleChangeSupported) {
     final float ANGLE_FACTOR = 0.02f;
     final float ZOOM_FACTOR = 0.02f;
@@ -204,64 +255,69 @@
           }
         });
     }
-  }
-
-  /**
-   * Adds an ancestor listener to this component to manage canvas universe 
-   * creation and clean up.  
-   */
-  private void addAncestorListener() {
-    addAncestorListener(new AncestorListener() {
-        public void ancestorAdded(AncestorEvent event) {
-          if (universe == null) {
-            createUniverse();
+    
+    // Redirect mouse events to the canvas 3D
+    for (final MouseListener l : getMouseListeners()) {
+      canvas3D.addMouseListener(new MouseListener() {
+          public void mouseReleased(MouseEvent ev) {
+            l.mouseReleased(SwingUtilities.convertMouseEvent(ev.getComponent(), ev, canvas3D));
           }
-        }
-        
-        public void ancestorRemoved(AncestorEvent event) {
-          if (universe != null) {
-            disposeUniverse();
+          
+          public void mousePressed(MouseEvent ev) {
+            l.mousePressed(SwingUtilities.convertMouseEvent(ev.getComponent(), ev, canvas3D));
           }
-        }
-        
-        public void ancestorMoved(AncestorEvent event) {
-        }        
-      });
+          
+          public void mouseExited(MouseEvent ev) {
+            l.mouseExited(SwingUtilities.convertMouseEvent(ev.getComponent(), ev, canvas3D));
+          }
+          
+          public void mouseEntered(MouseEvent ev) {
+            l.mouseEntered(SwingUtilities.convertMouseEvent(ev.getComponent(), ev, canvas3D));
+          }
+          
+          public void mouseClicked(MouseEvent ev) {
+            l.mouseClicked(SwingUtilities.convertMouseEvent(ev.getComponent(), ev, canvas3D));
+          }
+        });
+    }
+    for (final MouseMotionListener l : getMouseMotionListeners()) {
+      canvas3D.addMouseMotionListener(new MouseMotionListener() {
+          public void mouseMoved(MouseEvent ev) {
+            l.mouseMoved(SwingUtilities.convertMouseEvent(ev.getComponent(), ev, canvas3D));
+          }
+          
+          public void mouseDragged(MouseEvent ev) {
+            l.mouseDragged(SwingUtilities.convertMouseEvent(ev.getComponent(), ev, canvas3D));
+          }
+        });
+    }
   }
-  
+
   /**
    * Creates universe bound to canvas.
    */
   private void createUniverse() {
     // Link canvas 3D to a default universe
     this.universe = new SimpleUniverse(this.canvas3D);
-    this.canvas3D.setFocusable(false);
     // Set viewer location 
     updateViewPlatformTransform(this.universe.getViewingPlatform().getViewPlatformTransform(), 
         getViewYaw(), getViewPitch(), getViewScale());
     // Link scene to universe
     this.universe.addBranchGraph(this.sceneTree);
 
+    revalidate();
+    repaint();
     if (OperatingSystem.isMacOSX()) {
       final Component root = SwingUtilities.getRoot(this);
       EventQueue.invokeLater(new Runnable() {
           public void run() {
-            // Force a real repaint of the component with a resize of its root, 
-            // otherwise some canvas 3D may not be displayed
-            Dimension rootSize = root.getSize();
-            root.setSize(new Dimension(rootSize.width + 1, rootSize.height));
-            try {
-              Thread.sleep(100);
-            } catch (InterruptedException ex) {
-            }
-            root.setSize(new Dimension(rootSize.width, rootSize.height));
             // Request focus again even if dialog isn't supposed to have lost focus !
             if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow() != root) {
               root.requestFocus();
             }
-          } 
+          }
         });
-    }
+    } 
   }
   
   /**
@@ -463,7 +519,7 @@
   
   /**
    * Sets the <code>model</code> displayed by this component. 
-   * The model is shown at its default orientation and in a box of 1 unit wide.
+   * The model is shown at its default orientation and in a box 1 unit wide.
    */
   public void setModel(BranchGroup model) {
     TransformGroup modelTransformGroup = (TransformGroup)this.sceneTree.getChild(0);
@@ -635,46 +691,20 @@
                                          float width, float depth, float height) {
     BranchGroup model = getModel();
     if (model != null && model.numChildren() > 0) {
-      BoundingBox bounds = ModelManager.getInstance().getBounds(model);
-      Point3d lower = new Point3d();
-      bounds.getLower(lower);
-      Point3d upper = new Point3d();
-      bounds.getUpper(upper);
-      
-      // Translate model to center
-      Transform3D translation = new Transform3D ();
-      translation.setTranslation(
-          new Vector3d(-lower.x - (upper.x - lower.x) / 2, 
-                       -lower.y - (upper.y - lower.y) / 2, 
-                       -lower.z - (upper.z - lower.z) / 2));
-      // Scale model to make it fill a 1 unit wide box
-      Transform3D scaleOneTransform = new Transform3D();
-      scaleOneTransform.setScale (
-          new Vector3d(1 / Math.max(0.0001, upper.x -lower.x), 
-              1 / Math.max(0.0001, upper.y - lower.y), 
-              1 / Math.max(0.0001, upper.z - lower.z)));
-      scaleOneTransform.mul(translation);
-      // Apply model rotation
-      Transform3D rotationTransform = new Transform3D();
-      if (modelRotation != null) {
-        Matrix3f modelRotationMatrix = new Matrix3f(modelRotation [0][0], modelRotation [0][1], modelRotation [0][2],
-            modelRotation [1][0], modelRotation [1][1], modelRotation [1][2],
-            modelRotation [2][0], modelRotation [2][1], modelRotation [2][2]);
-        rotationTransform.setRotation(modelRotationMatrix);
-      }
-      rotationTransform.mul(scaleOneTransform);
+      Transform3D normalization = ModelManager.getInstance().getNormalizedTransform(model, modelRotation, 1f);
       // Scale model to its size
       Transform3D scaleTransform = new Transform3D();
       if (width != 0 && depth != 0 && height != 0) {
         scaleTransform.setScale(new Vector3d(width, height, depth));
       }
-      scaleTransform.mul(rotationTransform);
+      scaleTransform.mul(normalization);
       // Scale model to make it fit in a 1.8 unit wide box      
       Transform3D modelTransform = new Transform3D();
       if (width != 0 && depth != 0 && height != 0) {
         modelTransform.setScale(1.8 / Math.max(Math.max(width, height), depth));
       } else {
-        modelTransform.setScale(1.8 / Math.max(Math.max((upper.x -lower.x), (upper.z - lower.z)), (upper.y - lower.y)));
+        Vector3f size = ModelManager.getInstance().getSize(model);
+        modelTransform.setScale(1.8 / Math.max(Math.max(size.x, size.z), size.y));
       }
       modelTransform.mul(scaleTransform);
       
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/MultipleLevelsPlanPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/MultipleLevelsPlanPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/MultipleLevelsPlanPanel.java	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/MultipleLevelsPlanPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,574 @@
+/*
+ * MultipleLevelsPlanPanel.java 23 oct. 2011
+ *
+ * Sweet Home 3D, Copyright (c) 2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package com.eteks.sweethome3d.swing;
+
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JViewport;
+import javax.swing.SwingUtilities;
+import javax.swing.TransferHandler;
+import javax.swing.UIManager;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import com.eteks.sweethome3d.model.CollectionEvent;
+import com.eteks.sweethome3d.model.CollectionListener;
+import com.eteks.sweethome3d.model.DimensionLine;
+import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.Level;
+import com.eteks.sweethome3d.model.Selectable;
+import com.eteks.sweethome3d.model.TextStyle;
+import com.eteks.sweethome3d.model.UserPreferences;
+import com.eteks.sweethome3d.tools.OperatingSystem;
+import com.eteks.sweethome3d.viewcontroller.PlanController;
+import com.eteks.sweethome3d.viewcontroller.PlanController.EditableProperty;
+import com.eteks.sweethome3d.viewcontroller.PlanView;
+import com.eteks.sweethome3d.viewcontroller.View;
+
+/**
+ * A panel for multiple levels plans where users can select the displayed level.
+ * @author Emmanuel Puybaret
+ */
+public class MultipleLevelsPlanPanel extends JPanel implements PlanView, Printable {
+  private static final String ONE_LEVEL_PANEL_NAME = "oneLevelPanel";
+  private static final String MULTIPLE_LEVELS_PANEL_NAME = "multipleLevelsPanel";
+  
+  private PlanComponent planComponent;
+  private JScrollPane   planScrollPane;
+  private JTabbedPane   multipleLevelsTabbedPane;
+  private JPanel        oneLevelPanel;
+
+  public MultipleLevelsPlanPanel(Home home, 
+                                 UserPreferences preferences, 
+                                 PlanController controller) {
+    super(new CardLayout());
+    createComponents(home, preferences, controller);
+    layoutComponents();
+    updateSelectedTab(home);
+  }
+
+  /**
+   * Creates components displayed by this panel.
+   */
+  private void createComponents(final Home home, 
+                                final UserPreferences preferences, final PlanController controller) {
+    this.planComponent = new PlanComponent(home, preferences, controller);
+    
+    UIManager.getDefaults().put("TabbedPane.contentBorderInsets", OperatingSystem.isMacOSX()
+        ? new Insets(2, 2, 2, 2)
+        : new Insets(-1, 0, 2, 2));
+    this.multipleLevelsTabbedPane = new JTabbedPane();
+    if (OperatingSystem.isMacOSX()) {
+      this.multipleLevelsTabbedPane.setBorder(new EmptyBorder(-2, -6, -7, -6));
+    }
+    List<Level> levels = home.getLevels();
+    this.planScrollPane = new JScrollPane(this.planComponent);
+    this.planScrollPane.setMinimumSize(new Dimension());
+    if (OperatingSystem.isMacOSX()) {
+      this.planScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+      this.planScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+    }
+    
+    createTabs(home, preferences);
+    final ChangeListener changeListener = new ChangeListener() {
+        public void stateChanged(ChangeEvent ev) {
+          Component selectedComponent = multipleLevelsTabbedPane.getSelectedComponent();
+          if (selectedComponent instanceof LevelLabel) {
+            controller.setSelectedLevel(((LevelLabel)selectedComponent).getLevel());
+          }
+        }
+      };
+    this.multipleLevelsTabbedPane.addChangeListener(changeListener);
+    // Add a mouse listener that will give focus to plan component only if a change in tabbed pane comes from the mouse
+    // and will add a level only if user clicks on the last tab 
+    this.multipleLevelsTabbedPane.addMouseListener(new MouseAdapter() {
+        @Override
+        public void mouseClicked(MouseEvent ev) {
+          int indexAtLocation = multipleLevelsTabbedPane.indexAtLocation(ev.getX(), ev.getY());
+          if (ev.getClickCount() == 1) {
+            if (indexAtLocation == multipleLevelsTabbedPane.getTabCount() - 1) {
+              controller.addLevel();
+            }
+            final Level oldSelectedLevel = home.getSelectedLevel();
+            EventQueue.invokeLater(new Runnable() {
+                public void run() {
+                  if (oldSelectedLevel == home.getSelectedLevel()) {
+                    planComponent.requestFocusInWindow();
+                  }
+                }
+              });
+          } else if (indexAtLocation != -1) {
+            if (multipleLevelsTabbedPane.getSelectedIndex() == multipleLevelsTabbedPane.getTabCount() - 1) {
+              // May happen with a row of tabs is full
+              multipleLevelsTabbedPane.setSelectedIndex(multipleLevelsTabbedPane.getTabCount() - 2);
+            } 
+            controller.modifySelectedLevel();
+          }
+        }
+      });
+
+     // Add listeners to levels to maintain tabs name and order
+    final PropertyChangeListener levelChangeListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          if (Level.Property.NAME.name().equals(ev.getPropertyName())) {
+            multipleLevelsTabbedPane.setTitleAt(home.getLevels().indexOf(ev.getSource()), (String)ev.getNewValue());
+          } else if (Level.Property.ELEVATION.name().equals(ev.getPropertyName())
+              || Level.Property.HEIGHT.name().equals(ev.getPropertyName())) {
+            multipleLevelsTabbedPane.removeChangeListener(changeListener);
+            multipleLevelsTabbedPane.removeAll();
+            createTabs(home, preferences);
+            updateSelectedTab(home);
+            multipleLevelsTabbedPane.addChangeListener(changeListener);
+          }
+        }
+      };
+    for (Level level : levels) {
+      level.addPropertyChangeListener(levelChangeListener);
+    }
+    home.addLevelsListener(new CollectionListener<Level>() {
+        public void collectionChanged(CollectionEvent<Level> ev) {
+          multipleLevelsTabbedPane.removeChangeListener(changeListener);
+          switch (ev.getType()) {
+            case ADD:
+              multipleLevelsTabbedPane.insertTab(ev.getItem().getName(), null, new LevelLabel(ev.getItem()), null, ev.getIndex());
+              ev.getItem().addPropertyChangeListener(levelChangeListener);
+              break;
+            case DELETE:
+              ev.getItem().removePropertyChangeListener(levelChangeListener);
+              multipleLevelsTabbedPane.remove(ev.getIndex());
+              break;
+          }
+          updateLayout(home);
+          multipleLevelsTabbedPane.addChangeListener(changeListener);
+        }
+      });
+    
+    home.addPropertyChangeListener(Home.Property.SELECTED_LEVEL, new PropertyChangeListener() {
+      public void propertyChange(PropertyChangeEvent ev) {
+        multipleLevelsTabbedPane.removeChangeListener(changeListener);
+        updateSelectedTab(home);
+        multipleLevelsTabbedPane.addChangeListener(changeListener);
+      }
+    });
+    
+    this.oneLevelPanel = new JPanel(new BorderLayout());
+    
+    preferences.addPropertyChangeListener(UserPreferences.Property.LANGUAGE, 
+        new LanguageChangeListener(this));
+  }
+
+  /**
+   * Preferences property listener bound to this component with a weak reference to avoid
+   * strong link between preferences and this component.  
+   */
+  private static class LanguageChangeListener implements PropertyChangeListener {
+    private WeakReference<MultipleLevelsPlanPanel> planPanel;
+
+    public LanguageChangeListener(MultipleLevelsPlanPanel planPanel) {
+      this.planPanel = new WeakReference<MultipleLevelsPlanPanel>(planPanel);
+    }
+    
+    public void propertyChange(PropertyChangeEvent ev) {
+      // If help pane was garbage collected, remove this listener from preferences
+      MultipleLevelsPlanPanel planPanel = this.planPanel.get();
+      UserPreferences preferences = (UserPreferences)ev.getSource();
+      if (planPanel == null) {
+        preferences.removePropertyChangeListener(UserPreferences.Property.LANGUAGE, this);
+      } else {
+        // Update create level tooltip in new locale
+        String createNewLevelTooltip = preferences.getLocalizedString(MultipleLevelsPlanPanel.class, "ADD_LEVEL.ShortDescription");
+        planPanel.multipleLevelsTabbedPane.setToolTipTextAt(planPanel.multipleLevelsTabbedPane.getTabCount() - 1, createNewLevelTooltip);
+      }
+    }
+  }
+
+  /**
+   * Creates the tabs from <code>home</code> levels.
+   */
+  private void createTabs(Home home, UserPreferences preferences) {
+    for (Level level : home.getLevels()) {
+      this.multipleLevelsTabbedPane.addTab(level.getName(), new LevelLabel(level));
+    }
+    String createNewLevelIcon = preferences.getLocalizedString(MultipleLevelsPlanPanel.class, "ADD_LEVEL.SmallIcon");
+    String createNewLevelTooltip = preferences.getLocalizedString(MultipleLevelsPlanPanel.class, "ADD_LEVEL.ShortDescription");
+    ImageIcon newLevelIcon = new ImageIcon(MultipleLevelsPlanPanel.class.getResource(createNewLevelIcon));
+    this.multipleLevelsTabbedPane.addTab("", newLevelIcon, new JLabel(), createNewLevelTooltip);
+    // Disable last tab to avoid user stops on it
+    this.multipleLevelsTabbedPane.setEnabledAt(this.multipleLevelsTabbedPane.getTabCount() - 1, false);
+    this.multipleLevelsTabbedPane.setDisabledIconAt(this.multipleLevelsTabbedPane.getTabCount() - 1, newLevelIcon);
+  }
+  
+  /**
+   * Selects the tab matching the selected level in <code>home</code>.
+   */
+  private void updateSelectedTab(Home home) {
+    List<Level> levels = home.getLevels();
+    Level selectedLevel = home.getSelectedLevel();
+    if (levels.size() >= 2 && selectedLevel != null) {
+      this.multipleLevelsTabbedPane.setSelectedIndex(levels.indexOf(selectedLevel));
+      displayPlanComponentAtSelectedIndex(home);
+    }
+    updateLayout(home);
+  }
+
+  /**
+   * Display the plan component at the selected tab index.
+   */
+  private void displayPlanComponentAtSelectedIndex(Home home) {
+    int planIndex = this.multipleLevelsTabbedPane.indexOfComponent(this.planScrollPane);
+    if (planIndex != -1) {
+      // Replace plan component by a dummy label to avoid losing tab
+      this.multipleLevelsTabbedPane.setComponentAt(planIndex, new LevelLabel(home.getLevels().get(planIndex)));
+    }
+    this.multipleLevelsTabbedPane.setComponentAt(this.multipleLevelsTabbedPane.getSelectedIndex(), this.planScrollPane);
+  }
+
+  /**
+   * Switches between a simple plan component view and a tabbed pane for multiple levels.
+   */
+  private void updateLayout(Home home) {
+    CardLayout layout = (CardLayout)getLayout();
+    List<Level> levels = home.getLevels();
+    boolean focus = this.planComponent.hasFocus();
+    if (levels.size() < 2 || home.getSelectedLevel() == null) {
+      int planIndex = this.multipleLevelsTabbedPane.indexOfComponent(this.planScrollPane);
+      if (planIndex != -1) {
+        // Replace plan component by a dummy label to avoid losing tab
+        this.multipleLevelsTabbedPane.setComponentAt(planIndex, new LevelLabel(home.getLevels().get(planIndex)));
+      }
+      this.oneLevelPanel.add(this.planScrollPane);      
+      layout.show(this, ONE_LEVEL_PANEL_NAME);
+    } else {
+      layout.show(this, MULTIPLE_LEVELS_PANEL_NAME);
+    }
+    if (focus) {
+      this.planComponent.requestFocusInWindow();
+    }
+  }
+
+  /**
+   * Layouts the components displayed by this panel.
+   */
+  private void layoutComponents() {
+    add(this.multipleLevelsTabbedPane, MULTIPLE_LEVELS_PANEL_NAME);
+    add(this.oneLevelPanel, ONE_LEVEL_PANEL_NAME);
+    
+    SwingTools.installFocusBorder(this.planComponent);
+    setFocusTraversalPolicyProvider(false);
+    setMinimumSize(new Dimension());
+  }
+
+  @Override
+  public void setTransferHandler(TransferHandler newHandler) {
+    this.planComponent.setTransferHandler(newHandler);
+  }
+  
+  @Override
+  public void setComponentPopupMenu(JPopupMenu popup) {
+    this.planComponent.setComponentPopupMenu(popup);
+  }
+  
+  @Override
+  public void addMouseMotionListener(final MouseMotionListener l) {
+    this.planComponent.addMouseMotionListener(new MouseMotionListener() {
+        public void mouseMoved(MouseEvent ev) {
+          l.mouseMoved(SwingUtilities.convertMouseEvent(planComponent, ev, MultipleLevelsPlanPanel.this));
+        }
+        
+        public void mouseDragged(MouseEvent ev) {
+          l.mouseDragged(SwingUtilities.convertMouseEvent(planComponent, ev, MultipleLevelsPlanPanel.this));
+        }
+      });
+  }
+  
+  @Override
+  public void addMouseListener(final MouseListener l) {
+    this.planComponent.addMouseListener(new MouseListener() {
+        public void mouseReleased(MouseEvent ev) {
+          l.mouseReleased(SwingUtilities.convertMouseEvent(planComponent, ev, MultipleLevelsPlanPanel.this));
+        }
+        
+        public void mousePressed(MouseEvent ev) {
+          l.mousePressed(SwingUtilities.convertMouseEvent(planComponent, ev, MultipleLevelsPlanPanel.this));
+        }
+        
+        public void mouseExited(MouseEvent ev) {
+          l.mouseExited(SwingUtilities.convertMouseEvent(planComponent, ev, MultipleLevelsPlanPanel.this));
+        }
+        
+        public void mouseEntered(MouseEvent ev) {
+          l.mouseEntered(SwingUtilities.convertMouseEvent(planComponent, ev, MultipleLevelsPlanPanel.this));
+        }
+        
+        public void mouseClicked(MouseEvent ev) {
+          l.mouseClicked(SwingUtilities.convertMouseEvent(planComponent, ev, MultipleLevelsPlanPanel.this));
+        }
+      });
+  }
+  
+  @Override
+  public void addFocusListener(final FocusListener l) {
+    FocusListener componentFocusListener = new FocusListener() {
+        public void focusGained(FocusEvent ev) {
+          l.focusGained(new FocusEvent(MultipleLevelsPlanPanel.this, FocusEvent.FOCUS_GAINED, ev.isTemporary(), ev.getOppositeComponent()));
+        }
+        
+        public void focusLost(FocusEvent ev) {
+          l.focusLost(new FocusEvent(MultipleLevelsPlanPanel.this, FocusEvent.FOCUS_LOST, ev.isTemporary(), ev.getOppositeComponent()));
+        }
+      };
+    this.planComponent.addFocusListener(componentFocusListener);
+    this.multipleLevelsTabbedPane.addFocusListener(componentFocusListener);
+  }
+  
+  /**
+   * Sets rectangle selection feedback coordinates. 
+   */
+  public void setRectangleFeedback(float x0, float y0, float x1, float y1) {
+    this.planComponent.setRectangleFeedback(x0, y0, x1, y1);
+  }
+
+  /**
+   * Ensures selected items are visible in the plan displayed by this component and moves
+   * its scroll bars if needed.
+   */
+  public void makeSelectionVisible() {
+    this.planComponent.makeSelectionVisible();
+  }
+
+  /**
+   * Ensures the point at (<code>x</code>, <code>y</code>) is visible in the plan displayed by this component,
+   * moving its scroll bars if needed.
+   */
+  public void makePointVisible(float x, float y) {
+    this.planComponent.makePointVisible(x, y);
+  }
+
+  /**
+   * Returns the scale used to display the plan displayed by this component.
+   */
+  public float getScale() {
+    return this.planComponent.getScale();
+  }
+
+  /**
+   * Sets the scale used to display the plan displayed by this component.
+   */
+  public void setScale(float scale) {
+    this.planComponent.setScale(scale);
+  }
+
+  /**
+   * Moves the plan displayed by this component from (dx, dy) unit in the scrolling zone it belongs to.
+   */
+  public void moveView(float dx, float dy) {
+    this.planComponent.moveView(dx, dy);
+  }
+
+  /**
+   * Returns <code>x</code> converted in model coordinates space.
+   */
+  public float convertXPixelToModel(int x) {
+    return this.planComponent.convertXPixelToModel(SwingUtilities.convertPoint(this, x, 0, this.planComponent).x);
+  }
+
+  /**
+   * Returns <code>y</code> converted in model coordinates space.
+   */
+  public float convertYPixelToModel(int y) {
+    return this.planComponent.convertYPixelToModel(SwingUtilities.convertPoint(this, 0, y, this.planComponent).y);
+  }
+
+  /**
+   * Returns <code>x</code> converted in screen coordinates space.
+   */
+  public int convertXModelToScreen(float x) {
+    return this.planComponent.convertXModelToScreen(x);
+  }
+
+  /**
+   * Returns <code>y</code> converted in screen coordinates space.
+   */
+  public int convertYModelToScreen(float y) {
+    return this.planComponent.convertYModelToScreen(y);
+  }
+
+  /**
+   * Returns the length in centimeters of a pixel with the current scale.
+   */
+  public float getPixelLength() {
+    return this.planComponent.getPixelLength();
+  }
+
+  /**
+   * Returns the coordinates of the bounding rectangle of the <code>text</code> displayed at
+   * the point (<code>x</code>,<code>y</code>).  
+   */
+  public float [][] getTextBounds(String text, TextStyle style, float x, float y, float angle) {
+    return this.planComponent.getTextBounds(text, style, x, y, angle);
+  }
+
+  /**
+   * Sets the cursor of this component as rotation cursor. 
+   */
+  public void setCursor(CursorType cursorType) {
+    this.planComponent.setCursor(cursorType);
+  }
+
+  /**
+   * Sets tool tip text displayed as feedback. 
+   */
+  public void setToolTipFeedback(String toolTipFeedback, float x, float y) {
+    this.planComponent.setToolTipFeedback(toolTipFeedback, x, y);
+  }
+
+  /**
+   * Set properties edited in tool tip.
+   */
+  public void setToolTipEditedProperties(EditableProperty [] toolTipEditedProperties, Object [] toolTipPropertyValues,
+                                         float x, float y) {
+    this.planComponent.setToolTipEditedProperties(toolTipEditedProperties, toolTipPropertyValues, x, y);
+  }
+
+  /**
+   * Deletes tool tip text from screen. 
+   */
+  public void deleteToolTipFeedback() {
+    this.planComponent.deleteToolTipFeedback();
+  }
+
+  /**
+   * Sets whether the resize indicator of selected wall or piece of furniture 
+   * should be visible or not. 
+   */
+  public void setResizeIndicatorVisible(boolean visible) {
+    this.planComponent.setResizeIndicatorVisible(visible);
+  }
+
+  /**
+   * Sets the location point for alignment feedback.
+   */
+  public void setAlignmentFeedback(Class<? extends Selectable> alignedObjectClass, Selectable alignedObject, float x,
+                                   float y, boolean showPoint) {
+    this.planComponent.setAlignmentFeedback(alignedObjectClass, alignedObject, x, y, showPoint);
+  }
+
+  /**
+   * Sets the points used to draw an angle in the plan displayed by this component.
+   */
+  public void setAngleFeedback(float xCenter, float yCenter, float x1, float y1, float x2, float y2) {
+    this.planComponent.setAngleFeedback(xCenter, yCenter, x1, y1, x2, y2);
+  }
+
+  /**
+   * Sets the feedback of dragged items drawn during a drag and drop operation, 
+   * initiated from outside of the plan displayed by this component.
+   */
+  public void setDraggedItemsFeedback(List<Selectable> draggedItems) {
+    this.planComponent.setDraggedItemsFeedback(draggedItems);
+  }
+
+  /**
+   * Sets the given dimension lines to be drawn as feedback.
+   */
+  public void setDimensionLinesFeedback(List<DimensionLine> dimensionLines) {
+    this.planComponent.setDimensionLinesFeedback(dimensionLines);
+  }
+
+  /**
+   * Deletes all elements shown as feedback.
+   */
+  public void deleteFeedback() {
+    this.planComponent.deleteFeedback();
+  }
+  
+  /**
+   * Returns <code>true</code> if the given coordinates belong to the plan displayed by this component.
+   */
+  public boolean canImportDraggedItems(List<Selectable> items, int x, int y) {
+    JViewport viewport = this.planScrollPane.getViewport();
+    Point point = SwingUtilities.convertPoint(this, x, y, viewport);
+    return viewport.contains(point);
+  }
+
+  /**
+   * Returns the component used as an horizontal ruler for the plan displayed by this component.
+   */
+  public View getHorizontalRuler() {
+    return this.planComponent.getHorizontalRuler();
+  }
+
+  /**
+   * Returns the component used as a vertical ruler for the plan displayed by this component.
+   */
+  public View getVerticalRuler() {
+    return this.planComponent.getVerticalRuler();
+  }
+
+  /**
+   * Prints the plan component.
+   */
+  public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) throws PrinterException {
+    return this.planComponent.print(graphics, pageFormat, pageIndex);
+  }
+  
+  /**
+   * A dummy label used to track tabs matching levels.
+   */
+  private static class LevelLabel extends JLabel {
+    private final Level level;
+
+    public LevelLabel(Level level) {
+      this.level = level;
+      
+    }
+    
+    public Level getLevel() {
+      return this.level;
+    }
+  }
+}
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_bg.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_bg.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_bg.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_bg.properties	2011-12-21 00:48:52.000000000 +0000
@@ -2,7 +2,7 @@
 #
 # Translated to Bulgarian by Valentin Laskov
 #
-# Sweet Home 3D, Copyright (c) 2007-2009 Emmanuel PUYBARET / eTeks <info@eteks.com>
+# Sweet Home 3D, Copyright (c) 2007-2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -114,6 +114,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=\u041f\u043e\u0432\u0434\u0438\u0433\u0430\u043d\u0435
 FurnitureTable.angleColumn=\u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435
+FurnitureTable.levelColumn=\u0415\u0442\u0430\u0436
 FurnitureTable.colorColumn=\u0426\u0432\u044f\u0442
 FurnitureTable.textureColumn=\u0428\u0430\u0440\u043a\u0430
 FurnitureTable.movableColumn=\u041f\u043e\u0434\u0432\u0438\u0436\u043d\u043e
@@ -150,6 +151,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=F
 Home3DAttributesPanel.observerHeightLabel.text=\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430 \u043d\u0430 \u043f\u043e\u0441\u0435\u0442\u0438\u0442\u0435\u043b\u044f (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=L
+Home3DAttributesPanel.observerCameraElevationLabel.text=\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430 \u043d\u0430 \u043e\u0447\u0438\u0442\u0435 (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=L
 Home3DAttributesPanel.groundColorRadioButton.text=\u0426\u0432\u044f\u0442 \u043d\u0430\u0441\u0442\u0438\u043b\u043a\u0430:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=K
 Home3DAttributesPanel.groundColorDialog.title=\u0426\u0432\u044f\u0442 \u043d\u0430 \u043d\u0430\u0441\u0442\u0438\u043b\u043a\u0430\u0442\u0430
@@ -417,6 +420,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=\u0421\u043e\u0440\u0442\u0438\u0440\u0430\u0439 \u043c\u0435\u0431\u0435\u043b\u0438\u0440\u043e\u0432\u043a\u0430\u0442\u0430 \u043f\u043e \u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=P
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=\u0415\u0442\u0430\u0436
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=\u0421\u043E\u0440\u0442\u0438\u0440\u0430\u0439 \u043C\u0435\u0431\u0435\u043B\u0438\u0440\u043E\u0432\u043A\u0430\u0442\u0430 \u043F\u043E \u0435\u0442\u0430\u0436
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=G
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=\u0426\u0432\u044f\u0442
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=\u0421\u043e\u0440\u0442\u0438\u0440\u0430\u0439 \u043c\u0435\u0431\u0435\u043b\u0438\u0440\u043e\u0432\u043a\u0430\u0442\u0430 \u043f\u043e \u0446\u0432\u044f\u0442
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=S
@@ -497,6 +504,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=\u041f\u043e\u043a\u0430\u0436\u0438 \u043a\u043e\u043b\u043e\u043d\u0430\u0442\u0430 \u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=P
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=\u0415\u0442\u0430\u0436
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=\u041F\u043E\u043A\u0430\u0436\u0438 \u043A\u043E\u043B\u043E\u043D\u0430\u0442\u0430 \u0415\u0442\u0430\u0436
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=G
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=\u0426\u0432\u044f\u0442
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=\u041f\u043e\u043a\u0430\u0436\u0438 \u043a\u043e\u043b\u043e\u043d\u0430\u0442\u0430 \u0426\u0432\u044f\u0442
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=S
@@ -635,7 +646,19 @@
 
 HomePane.DELETE_BACKGROUND_IMAGE.Name=\u041f\u0440\u0435\u043c\u0430\u0445\u043d\u0438 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e \u0444\u043e\u043d
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e \u0437\u0430 \u0444\u043e\u043d \u043d\u0430 \u043f\u043b\u0430\u043d\u0430
-HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=M
+HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=E
+
+HomePane.ADD_LEVEL.Name=\u0414\u043E\u0431\u0430\u0432\u0438 \u0435\u0442\u0430\u0436
+HomePane.ADD_LEVEL.ShortDescription=\u0414\u043E\u0431\u0430\u0432\u044F \u043D\u043E\u0432 \u0435\u0442\u0430\u0436 \u0432 \u043F\u043B\u0430\u043D\u0430
+HomePane.ADD_LEVEL.MnemonicKey=L
+
+HomePane.MODIFY_LEVEL.Name=\u041F\u0440\u043E\u043C\u0435\u043D\u0438 \u0435\u0442\u0430\u0436\u0430...
+HomePane.MODIFY_LEVEL.ShortDescription=\u041F\u0440\u043E\u043C\u0435\u043D\u044F \u043C\u0430\u0440\u043A\u0438\u0440\u0430\u043D\u0438\u044F \u0435\u0442\u0430\u0436
+HomePane.MODIFY_LEVEL.MnemonicKey=J
+
+HomePane.DELETE_LEVEL.Name=\u0418\u0437\u0442\u0440\u0438\u0439 \u0435\u0442\u0430\u0436\u0430
+HomePane.DELETE_LEVEL.ShortDescription=\u0418\u0437\u0442\u0440\u0438\u0432\u0430 \u043C\u0430\u0440\u043A\u0438\u0440\u0430\u043D\u0438\u044F \u0435\u0442\u0430\u0436 \u043E\u0442 \u043F\u043B\u0430\u043D\u0430
+HomePane.DELETE_LEVEL.MnemonicKey=D
 
 HomePane.ZOOM_IN.Name=\u0423\u0433\u043e\u043b\u0435\u043c\u0438
 HomePane.ZOOM_IN.ShortDescription=\u0423\u0433\u043e\u043b\u0435\u043c\u044f\u0432\u0430 \u043f\u043b\u0430\u043d\u0430
@@ -679,6 +702,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=\u0412\u0440\u044a\u0449\u0430 3D \u0438\u0437\u0433\u043b\u0435\u0434\u0430 \u0432 \u043e\u0441\u043d\u043e\u0432\u043d\u0438\u044f \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446
 HomePane.ATTACH_3D_VIEW.MnemonicKey=M
 
+HomePane.DISPLAY_ALL_LEVELS.Name=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u0439 \u0432\u0441\u0438\u0447\u043A\u0438 \u0435\u0442\u0430\u0436\u0438
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=\u041F\u043E\u043A\u0430\u0437\u0432\u0430 \u0432\u0441\u0438\u0447\u043A\u0438 \u043D\u0438\u0432\u0430 \u0432 3D \u0438\u0437\u0433\u043B\u0435\u0434\u0430
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=P
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u0439 \u0438\u0437\u0431\u0440\u0430\u043D\u0438\u044F \u0435\u0442\u0430\u0436
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=\u041F\u043E\u043A\u0430\u0437\u0432\u0430 \u0438\u0437\u0431\u0440\u0430\u043D\u043E\u0442\u043E \u043D\u0438\u0432\u043E \u0432 3D \u0438\u0437\u0433\u043B\u0435\u0434\u0430
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=C
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=\u041f\u0440\u043e\u043c\u0435\u043d\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u043d\u0430 3D \u0438\u0437\u0433\u043b\u0435\u0434\u0430
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=K
@@ -707,10 +738,24 @@
 HomePane.ABOUT.ShortDescription=\u041f\u043e\u043a\u0430\u0437\u0432\u0430 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u0437\u0430 Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=F
 
+
+HomePane.SELECT_OBJECT_MENU.Name=\u041E\u0442 \u043E\u0431\u0435\u043A\u0442\u0438\u0442\u0435 \u043C\u0430\u0440\u043A\u0438\u0440\u0430\u0439
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=D
+
+HomePane.selectObject.compass=\u043A\u043E\u043C\u043F\u0430\u0441\u0430
+HomePane.selectObject.furniture=\u043C\u0435\u0431\u0435\u043B\u0438\u0440\u043E\u0432\u043A\u0430\u0442\u0430
+HomePane.selectObject.wall=\u0441\u0442\u0435\u043D\u0430\u0442\u0430 %s
+HomePane.selectObject.floor=\u043F\u043E\u0434\u0430 %s
+HomePane.selectObject.ceiling=\u0442\u0430\u0432\u0430\u043D\u0430 %s
+HomePane.selectObject.room=\u0441\u0442\u0430\u044F\u0442\u0430 %s
+HomePane.selectObject.dimensionLine=\u043E\u0440\u0430\u0437\u043C. \u043B\u0438\u043D\u0438\u044F %s
+HomePane.selectObject.label=\u0442\u0435\u043A\u0441\u0442\u0430
+
 # Open / Save dialogs title
 HomePane.openHomeDialog.title=\u041e\u0442\u0432\u0430\u0440\u044f\u043d\u0435 \u043d\u0430 \u043f\u043b\u0430\u043d
 HomePane.importFurnitureLibraryDialog.title=\u0418\u043c\u043f\u043e\u0440\u0442 \u043d\u0430 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0441 \u043c\u043e\u0434\u0435\u043b\u0438
 HomePane.importTexturesLibraryDialog.title=\u0418\u043c\u043f\u043e\u0440\u0442 \u043d\u0430 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0441 \u0448\u0430\u0440\u043a\u0438
+HomePane.importLanguageLibraryDialog.title=\u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0435\u0437\u0438\u043A\u043E\u0432\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430
 HomePane.saveHomeDialog.title=\u0417\u0430\u043f\u0438\u0441\u0432\u0430\u043d\u0435 \u043d\u0430 \u043f\u043b\u0430\u043d
 HomePane.printToPDFDialog.title=\u041e\u0442\u043f\u0435\u0447\u0430\u0442\u0432\u0430\u043d\u0435 \u0432 PDF
 HomePane.exportToSVGDialog.title=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u0432 SVG
@@ -855,12 +900,16 @@
 ImportedFurnitureWizardStepsPanel.modelChoiceFormatError=<html>\u0424\u043e\u0440\u043c\u0430\u0442\u044a\u0442 \u043d\u0430 \u0438\u0437\u0431\u0440\u0430\u043d\u0438\u044f \u043c\u043e\u0434\u0435\u043b \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430.\
     <br>\u041c\u043e\u043b\u044f \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0434\u0440\u0443\u0433 \u043c\u043e\u0434\u0435\u043b.
 
-ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>\u041f\u0440\u043e\u0432\u0435\u0440\u0435\u0442\u0435 \u0434\u0430\u043b\u0438 \u043c\u043e\u0434\u0435\u043b\u044a\u0442 \u0435 \u043e\u0440\u0438\u0435\u043d\u0442\u0438\u0440\u0430\u043d \u043f\u0440\u0430\u0432\u0438\u043b\u043d\u043e. \u0410\u043a\u043e \u043d\u0435 \u0435, \u0432\u044a\u0440\u0442\u0435\u0442\u0435 \
-    <br>\u0433\u043e \u0441\u044a\u0441 \u0441\u0442\u0440\u0435\u043b\u043a\u0438\u0442\u0435 \u0434\u043e\u043a\u0430\u0442\u043e \u0441\u0442\u0440\u0430\u043d\u0438\u0442\u0435 \u043c\u0443 \u0441\u044a\u0432\u043f\u0430\u0434\u043d\u0430\u0442 \u0441 \u043f\u043e\u0441\u043e\u0447\u0435\u043d\u0438\u0442\u0435.
+ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>\u041F\u0440\u043E\u0432\u0435\u0440\u0435\u0442\u0435 \u0434\u0430\u043B\u0438 \u043C\u043E\u0434\u0435\u043B\u044A\u0442 \u0435 \u043E\u0440\u0438\u0435\u043D\u0442\u0438\u0440\u0430\u043D \u043F\u0440\u0430\u0432\u0438\u043B\u043D\u043E. \u0410\u043A\u043E \u043D\u0435 \u0435,<br>\
+    \u0432\u044A\u0440\u0442\u0435\u0442\u0435 \u0433\u043E \u0441\u044A\u0441 \u0441\u0442\u0440\u0435\u043B\u043A\u0438\u0442\u0435, \u0434\u043E\u043A\u0430\u0442\u043E \u0441\u0442\u0440\u0430\u043D\u0438\u0442\u0435 \u043C\u0443 \u0441\u044A\u0432\u043F\u0430\u0434\u043D\u0430\u0442 \u0441 \u043F\u043E\u0441\u043E\u0447\u0435\u043D\u0438\u0442\u0435.<br>\
+    \u041D\u0430\u0442\u0438\u0441\u043D\u0435\u0442\u0435 \u0438 \u0437\u0430\u0434\u0440\u044A\u0436\u0442\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0430 <i>Shift</i> \u0434\u043E\u043A\u0430\u0442\u043E \u0446\u044A\u043A\u0430\u0442\u0435 \u043F\u043E \u0441\u0442\u0440\u0435\u043B\u043A\u0438\u0442\u0435,<br>\
+    \u0437\u0430 \u0434\u0430 \u0432\u044A\u0440\u0442\u0438\u0442\u0435 \u043C\u043E\u0434\u0435\u043B\u0430 \u0441 \u043F\u043E-\u043C\u0430\u043B\u043A\u0438 \u0441\u0442\u044A\u043F\u043A\u0438.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=\u041b\u0438\u0446\u0435
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=\u0414\u044f\u0441\u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0430
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=\u041e\u0442\u0433\u043e\u0440\u0435
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=\u0412 \u043f\u0435\u0440\u0441\u043f\u0435\u043a\u0442\u0438\u0432\u0430
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=\u0412\u044A\u0440\u043D\u0438 \u0433\u043E \u043A\u0430\u043A\u0442\u043E \u0431\u0435\u0448\u0435
+
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>\u0410\u043a\u043e \u043c\u043e\u0434\u0435\u043b\u044a\u0442 \u0438\u0437\u0433\u043b\u0435\u0436\u0434\u0430 \u043d\u0435\u043a\u043e\u0440\u0435\u043a\u0442\u043d\u043e, \u043c\u0430\u0440\u043a\u0438\u0440\u0430\u0439\u0442\u0435 \u043a\u0432\u0430\u0434\u0440\u0430\u0442\u0447\u0435\u0442\u043e \
     <br>\u043e\u0442\u0434\u043e\u043b\u0443 \u0438 \u043e\u043f\u0438\u0442\u0430\u0439\u0442\u0435 \u043e\u0442\u043d\u043e\u0432\u043e \u0441\u044a\u0441 \u0441\u0442\u0440\u0435\u043b\u043a\u0438\u0442\u0435.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=\u0420\u0430\u0437\u043c\u0435\u043d\u0438 \u043b\u0438\u0446\u0435\u0442\u043e \u0438 \u0433\u044a\u0440\u0431\u0430
@@ -888,6 +937,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=G
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=\u0412\u0440\u0430\u0442\u0430 \u0438\u043b\u0438 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=D
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=\u0421\u0442\u044a\u043b\u0431\u0438\u0449\u0435
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=\u0426\u0432\u044f\u0442:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorDialog.title=\u0426\u0432\u044f\u0442 \u043d\u0430 \u043e\u0431\u0435\u043a\u0442\u0430
@@ -938,6 +989,28 @@
 LabelPanel.labelCreation.title=\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0442\u0435\u043a\u0441\u0442
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=\u0418\u043C\u0435:
+LevelPanel.nameLabel.mnemonic=R
+LevelPanel.elevationLabel.text=\u041F\u043E\u0432\u0434\u0438\u0433\u0430\u043D\u0435 (%s):
+LevelPanel.elevationLabel.mnemonic=M
+LevelPanel.floorThicknessLabel.text=\u0414\u0435\u0431\u0435\u043B\u0438\u043D\u0430 \u043D\u0430 \u043F\u043E\u0434\u0430 (%s):
+LevelPanel.floorThicknessLabel.mnemonic=O
+LevelPanel.heightLabel.text=\u0412\u0438\u0441\u043E\u0447\u0438\u043D\u0430 (%s):
+LevelPanel.heightLabel.mnemonic=K
+LevelPanel.levelsSummaryLabel.text=\u041E\u0431\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u043F\u043E \u0435\u0442\u0430\u0436\u0438 (\u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u043D\u0438\u044F\u0442 \u0435 \u043C\u0430\u0440\u043A\u0438\u0440\u0430\u043D):
+LevelPanel.nameColumn=\u0418\u043C\u0435
+LevelPanel.elevationColumn=\u041F\u043E\u0432\u0434\u0438\u0433\u0430\u043D\u0435
+LevelPanel.floorThicknessColumn=\u0414\u0435\u0431\u0435\u043B\u0438\u043D\u0430 \u043D\u0430 \u043F\u043E\u0434\u0430
+LevelPanel.heightColumn=\u0412\u0438\u0441\u043E\u0447\u0438\u043D\u0430
+
+LevelPanel.level.title=\u041F\u0440\u043E\u043C\u0435\u043D\u0438 \u0435\u0442\u0430\u0436\u0430
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=\u0414\u043E\u0431\u0430\u0432\u0438 \u0435\u0442\u0430\u0436
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=\u0424\u043e\u0440\u043c\u0430\u0442 \u043d\u0430 \u043b\u0438\u0441\u0442\u0430
 PageSetupPanel.pageFormatButton.mnemonic=B
@@ -1153,10 +1226,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=D
 UserPreferencesPanel.newWallHeightLabel.text=\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430 \u043d\u0430 \u043d\u043e\u0432\u0438\u0442\u0435 \u0441\u0442\u0435\u043d\u0438:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=I
+UserPreferencesPanel.newFloorThicknessLabel.text=\u0414\u0435\u0431\u0435\u043B\u0438\u043D\u0430 \u043D\u0430 \u043F\u043E\u0434\u0430 \u0437\u0430 \u043D\u043E\u0432\u0438\u0442\u0435 \u0435\u0442\u0430\u0436\u0438:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=G
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=\u0417\u0430\u043f\u0438\u0441\u0432\u0430\u0439 \u0440\u0435\u0437\u0435\u0440\u0432\u043d\u043e \u043a\u043e\u043f\u0438\u0435 \u043f\u0440\u0435\u0437:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=F
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=\u043c\u0438\u043d\u0443\u0442\u0438
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=\u0418\u043C\u043F\u043E\u0440\u0442\u0438\u0440\u0430\u0439 \u0435\u0437\u0438\u043A\u043E\u0432 \u0444\u0430\u0439\u043B
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=\u0412\u044a\u0440\u043d\u0438 \u043f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435\u0442\u043e \u043d\u0430 \u0441\u044a\u0432\u0435\u0442\u0438
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=C
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_cs.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_cs.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_cs.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_cs.properties	2011-12-21 00:48:52.000000000 +0000
@@ -1,6 +1,6 @@
 # package_cs.properties 11 Dec 2008
 #
-# Translated to Czech by Stefan Novak, Kamil Paral, Roman Polasek and Emmanuel Puybaret
+# Translated to Czech by Stefan Novak, Kamil Paral, Roman Polasek, Ondrej Dolejsi and Emmanuel Puybaret
 #
 # Sweet Home 3D, Copyright (c) 2008 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
@@ -107,6 +107,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=Nadzvednut\u00ed
 FurnitureTable.angleColumn=Oto\u010den\u00ed
+FurnitureTable.levelColumn=\u00darove\u0148
 FurnitureTable.colorColumn=Barva
 FurnitureTable.textureColumn=Textura
 FurnitureTable.movableColumn=Pohybliv\u00e9
@@ -142,6 +143,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=Z
 Home3DAttributesPanel.observerHeightLabel.text=V\u00fd\u0161ka n\u00e1v\u0161t\u011bvn\u00edka (%s) :
 Home3DAttributesPanel.observerHeightLabel.mnemonic=V
+Home3DAttributesPanel.observerCameraElevationLabel.text=V\u00fd\u0161ka o\u010d\u00ed (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=E
 Home3DAttributesPanel.groundColorRadioButton.text=Barva podkladu:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=B
 Home3DAttributesPanel.groundColorDialog.title=Barva podkladu
@@ -404,6 +407,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Se\u0159adit n\u00e1bytek podle oto\u010den\u00ed
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=O
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=\u00darove\u0148
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=Se\u0159adit n\u00e1bytek podle \u00farovn\u00ed
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=R
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=Barva
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Se\u0159adit n\u00e1bytek podle barvy
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=B
@@ -483,6 +490,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Zobrazit sloupec Oto\u010den\u00ed
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=O
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=\u00darove\u0148
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Zobrazit sloupec \u00farove\u0148
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=R
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=Barva
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Zobrazit sloupec Barva
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=B
@@ -579,8 +590,8 @@
 HomePane.MODIFY_ROOM.ShortDescription=Upravit vybran\u00e9 m\u00edstnosti
 HomePane.MODIFY_ROOM.MnemonicKey=F
 
-HomePane.MODIFY_LABEL.Name=Upravit text...
-HomePane.MODIFY_LABEL.ShortDescription=Upravit text
+HomePane.MODIFY_LABEL.Name=Upravit textu...
+HomePane.MODIFY_LABEL.ShortDescription=Upravit textu
 HomePane.MODIFY_LABEL.MnemonicKey=X
 
 # Text style sub menu
@@ -624,6 +635,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=Smazat obr\u00e1zek zobrazen\u00fd v pozad\u00ed pl\u00e1nu
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=O
 
+HomePane.ADD_LEVEL.Name=P\u0159idat \u00farove\u0148
+HomePane.ADD_LEVEL.ShortDescription=P\u0159idat novou horizont\u00e1ln\u00ed \u016frove\u0148
+HomePane.ADD_LEVEL.MnemonicKey=R
+
+HomePane.MODIFY_LEVEL.Name=Upravit \u00farove\u0148
+HomePane.MODIFY_LEVEL.ShortDescription=Upravit zvolenou horizont\u00e1ln\u00ed \u00farove\u0148
+HomePane.MODIFY_LEVEL.MnemonicKey=U
+
+HomePane.DELETE_LEVEL.Name=Smazat \u00farove\u0148
+HomePane.DELETE_LEVEL.ShortDescription=Smazat zvolenou horizont\u00e1ln\u00ed \u00farove\u0148
+HomePane.DELETE_LEVEL.MnemonicKey=Z
+
 HomePane.ZOOM_OUT.Name=Zmen\u0161it
 HomePane.ZOOM_OUT.ShortDescription=Zmen\u0161it
 HomePane.ZOOM_OUT.MnemonicKey=M
@@ -664,6 +687,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=Zobrazit 3D pohled v hlavn\u00edm okn\u011b
 HomePane.ATTACH_3D_VIEW.MnemonicKey=Z
 
+HomePane.DISPLAY_ALL_LEVELS.Name=Zobrazit v\u0161echny \u00farovn\u011b
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Zobrazit v\u0161echny \u00farovn\u011b v 3D pohledu
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=R
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Zobrazit zvolenou \u00farove\u0148
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Zobrazit zvolenou \u00farove\u0148 v 3D pohledu
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=B
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=Upravit...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Upravit 3D n\u00e1hled
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=U
@@ -692,9 +723,24 @@
 HomePane.ABOUT.ShortDescription=Zobrazit informace o programu Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=O
 
+
+HomePane.SELECT_OBJECT_MENU.Name=Vybrat objektu
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=Kompas
+HomePane.selectObject.furniture=N�bytek
+HomePane.selectObject.wall=Ze\u010F %s
+HomePane.selectObject.floor=Podlaha %s
+HomePane.selectObject.ceiling=Strop %s
+HomePane.selectObject.room=M�stnost %s
+HomePane.selectObject.dimensionLine=Rozm\u011Br %s 
+HomePane.selectObject.label=Text
+
+
 HomePane.openHomeDialog.title=Otev\u0159\u00edt
 HomePane.importFurnitureLibraryDialog.title=Import knihovny s n\u00e1bytkem
 HomePane.importTexturesLibraryDialog.title=Import knihovnu textur
+HomePane.importLanguageLibraryDialog.title=Importovat jazykovou knihovnu
 HomePane.saveHomeDialog.title=Ulo\u017eit
 HomePane.printToPDFDialog.title=Tisk do PDF
 HomePane.exportToSVGDialog.title=Exportovat do SVG
@@ -802,7 +848,7 @@
               <br><font size="-1">SVG export zaji\u0161\u0165uje <a href="http://java.freehep.org/">FreeHEP</a></font>\
               <br><font size="-1">Glob\u00e1ln\u00ed osv\u011btlen\u00ed zaji\u0161\u0165uje <a href="http://sunflow.sourceforge.net/">SunFlow</a></font>\
               <p>P\u0159eklad do \u010desk\u00e9ho jazyka:\
-              <br>\u0160tefan Nov\u00e1k a Roman Pol\u00e1\u0161ek\
+              <br>\u0160tefan Nov\u00e1k, Roman Pol\u00e1\u0161ek a Ondrej Dolejsi\
               <p>Pro aktualizace \u010di s informacemi o chyb\u00e1ch se obracejte na:\
               <br><a href="http://www.sweethome3d.com/">http://www.sweethome3d.com/</a>.</p>\
               <p><font size="-2">\u00a9 Copyrights 2006-2011 eTeks \
@@ -832,11 +878,13 @@
     <br>Vyberte pros\u00edm jin\u00fd model.
 
 ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Zkontrolujte, zda je model spr\u00e1vn\u011b oto\u010den. Pokud nen\u00ed, ot\u00e1\u010dejte jej \u0161ipkami n\u00ed\u017ee,\
-    <br>dokud se nebude \u010deln\u00ed pohled shodovat s \u010deln\u00ed stranou n\u00e1bytku.
+    <br>dokud se nebude \u010deln\u00ed pohled shodovat s \u010deln\u00ed stranou n\u00e1bytku. Dr\u017ete kl\u00e1vesu \
+    <br><i>Shift</i> p\u0159i klik\u00e1n\u00ed na \u0161ipku a model se bude ot\u00e1\u017eet po men\u0161\u00edch kroc\u00edch.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=Pohled zep\u0159edu
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Pohled zprava
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Pohled z vrchu
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=Perspektiva
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=Obnovit p\u016fvodn\u00ed orientaci
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Pokud je zobrazen\u00ed modelu nespr\u00e1vn\u00e9, aktivujte n\u00e1sleduj\u00edc\u00ed pole\
     <br>pro prohozen\u00ed jeho zobrazen\u00fdch tv\u00e1\u0159\u00ed.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Invertovat zadn\u00ed a p\u0159edn\u00ed tv\u00e1\u0159e
@@ -863,6 +911,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=P
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=Dve\u0159e nebo okno
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=E
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Schodi\u0161t\u011B
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=Barva:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=B
 ImportedFurnitureWizardStepsPanel.colorDialog.title=Barva n\u00e1bytku
@@ -944,6 +994,29 @@
 LabelPanel.labelCreation.title=P\u0159idat text
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=Jm\u00e9no:
+LevelPanel.nameLabel.mnemonic=J
+LevelPanel.elevationLabel.text=Elevace (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=Tlou\u0161\u0165ka podlahy (%s):
+LevelPanel.floorThicknessLabel.mnemonic=T
+LevelPanel.heightLabel.text=V\u00fd\u0161ka (%s):
+LevelPanel.heightLabel.mnemonic=V
+LevelPanel.levelsSummaryLabel.text=V\u00fdpis \u00farovn\u00ed (editovan\u00e1 \u00farove\u0148 je zv\u00fdrazn\u011bna)
+LevelPanel.nameColumn=Jm\u00e9no
+LevelPanel.elevationColumn=Elevace
+LevelPanel.floorThicknessColumn=Tlou\u0161\u0165ka podlahy
+LevelPanel.heightColumn=V\u00fd\u0161ka
+
+LevelPanel.level.title= \u00farove\u0148
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=P\u0159idat \u00farove\u0148
+
+
+# Resources for PhotoPanel class
 PhotoPanel.widthLabel.text=\u0160\u00ed\u0159ka (pixel):
 PhotoPanel.widthLabel.mnemonic=A
 PhotoPanel.heightLabel.text=V\u00fd\u0161ka (pixel):
@@ -1120,10 +1193,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=T
 UserPreferencesPanel.newWallHeightLabel.text=V\u00fd\u0161ka nov\u00fdch zd\u00ed:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=V
+UserPreferencesPanel.newFloorThicknessLabel.text=Tlou\u0161\u0165ka nov\u00e9 podlahy:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=L
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Ulo\u017e data ka\u017ed\u00fdch:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=U
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=minut
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=Importovat soubor jazykov\u00e9 knihovny
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=Vr\u00e1tit p\u016fvodn\u00ed nastaven\u00ed tip\u016f
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=P
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_de.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_de.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_de.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_de.properties	2011-12-21 00:48:52.000000000 +0000
@@ -19,8 +19,8 @@
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
 # Resources for BackgroundImageWizardStepsPanel class
-BackgroundImageWizardStepsPanel.imageChoiceLabel.text=<html>Um ein Hintergrundbild auszuw�hlen ziehen Sie per Drag and Drop ein Bild\
-     <br>in den Bereich unten oder klicken Sie auf den Button <i>Bild ausw�hlen</i>\
+BackgroundImageWizardStepsPanel.imageChoiceLabel.text=<html>Um ein Hintergrundbild auszuw�hlen, ziehen Sie per Drag and Drop ein Bild\
+     <br>in den Bereich unten oder klicken Sie auf die Schaltfl�che <i>Bild ausw�hlen</i>\
      <br>(unterst�tze Formate: BMP, JPEG, GIF, PNG).
 BackgroundImageWizardStepsPanel.imageChangeLabel.text=�ndern Sie das Hintergrundbild des Plans hier.
 BackgroundImageWizardStepsPanel.imageChoiceButton.text=Bild ausw�hlen
@@ -40,7 +40,7 @@
 BackgroundImageWizardStepsPanel.scaleDistanceLabel.text=L�nge der Linie (%s):
 BackgroundImageWizardStepsPanel.scaleDistanceLabel.mnemonic=L
 
-BackgroundImageWizardStepsPanel.originLabel.text=<html>Definieren Sie die Position des Bildes indem Sie es durch anklicken markieren<br>\
+BackgroundImageWizardStepsPanel.originLabel.text=<html>Definieren Sie die Position des Bildesn indem Sie es durch einen Klick markieren<br>\
     oder indem Sie seine Koordinaten ver�ndern.
 BackgroundImageWizardStepsPanel.xOriginLabel.text=X (%s):
 BackgroundImageWizardStepsPanel.xOriginLabel.mnemonic=X
@@ -109,6 +109,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=H�he �ber Boden
 FurnitureTable.angleColumn=Winkel
+FurnitureTable.levelColumn=Niveau
 FurnitureTable.colorColumn=Farbe
 FurnitureTable.textureColumn=Textur
 FurnitureTable.movableColumn=Beweglich
@@ -144,6 +145,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=S
 Home3DAttributesPanel.observerHeightLabel.text=Beobachterh�he (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=B
+Home3DAttributesPanel.observerCameraElevationLabel.text=Augenh�he (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=A
 Home3DAttributesPanel.groundColorRadioButton.text=Bodenfarbe:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=F
 Home3DAttributesPanel.groundColorDialog.title=Boden Farbe
@@ -257,11 +260,11 @@
 HomePane.CLOSE.ShortDescription=Haus schlie�en
 HomePane.CLOSE.MnemonicKey=C
 
-HomePane.PAGE_SETUP.Name=Seite Einrichten...
-HomePane.PAGE_SETUP.ShortDescription=Haus Ausdruck einrichten
+HomePane.PAGE_SETUP.Name=Seite einrichten...
+HomePane.PAGE_SETUP.ShortDescription=Haus-Ausdruck einrichten
 HomePane.PAGE_SETUP.MnemonicKey=T
 
-HomePane.PRINT_PREVIEW.Name=Druck Vorschau...
+HomePane.PRINT_PREVIEW.Name=Druckvorschau...
 HomePane.PRINT_PREVIEW.ShortDescription=Vorschau des Ausdrucks
 HomePane.PRINT_PREVIEW.MnemonicKey=V
 
@@ -270,7 +273,7 @@
 HomePane.PRINT.MnemonicKey=D
 
 HomePane.PRINT_TO_PDF.Name=Drucken als PDF...
-HomePane.PRINT_TO_PDF.ShortDescription=Drucken als PDF Datei...
+HomePane.PRINT_TO_PDF.ShortDescription=Drucken als PDF-Datei...
 HomePane.PRINT_TO_PDF.MnemonicKey=P
 
 HomePane.PREFERENCES.Name=Einstellungen...
@@ -325,12 +328,12 @@
 HomePane.IMPORT_FURNITURE.ShortDescription=Mobiliar importieren...
 HomePane.IMPORT_FURNITURE.MnemonicKey=I
 
-HomePane.IMPORT_FURNITURE_LIBRARY.Name=Mobiliar Bibliothek importieren...
-HomePane.IMPORT_FURNITURE_LIBRARY.ShortDescription=Mobiliar Bibliothek importieren...
+HomePane.IMPORT_FURNITURE_LIBRARY.Name=Mobiliarbibliothek importieren...
+HomePane.IMPORT_FURNITURE_LIBRARY.ShortDescription=Importiert eine Mobiliarbibliothek
 HomePane.IMPORT_FURNITURE_LIBRARY.MnemonicKey=M
 
 HomePane.IMPORT_TEXTURES_LIBRARY.Name=Texturbibliothek importieren
-HomePane.IMPORT_TEXTURES_LIBRARY.ShortDescription=Texturbibliothek importieren
+HomePane.IMPORT_TEXTURES_LIBRARY.ShortDescription=Importiert eine Texturbibliothek
 HomePane.IMPORT_TEXTURES_LIBRARY.MnemonicKey=X
 
 HomePane.DELETE_HOME_FURNITURE.Name=L�schen
@@ -372,75 +375,79 @@
 HomePane.SORT_HOME_FURNITURE_MENU.MnemonicKey=S
 
 HomePane.SORT_HOME_FURNITURE_BY_CATALOG_ID.Name=Referenz
-HomePane.SORT_HOME_FURNITURE_BY_CATALOG_ID.ShortDescription=Sortiert Mobiliar nach Referenz
+HomePane.SORT_HOME_FURNITURE_BY_CATALOG_ID.ShortDescription=Sortiert Mobiliar nach seiner Referenz
 HomePane.SORT_HOME_FURNITURE_BY_CATALOG_ID.MnemonicKey=R
 
 HomePane.SORT_HOME_FURNITURE_BY_NAME.Name=Name
-HomePane.SORT_HOME_FURNITURE_BY_NAME.ShortDescription=Sortiert Mobiliar nach Name
+HomePane.SORT_HOME_FURNITURE_BY_NAME.ShortDescription=Sortiert Mobiliar nach seinem Namen
 HomePane.SORT_HOME_FURNITURE_BY_NAME.MnemonicKey=N
 
 HomePane.SORT_HOME_FURNITURE_BY_WIDTH.Name=Breite
-HomePane.SORT_HOME_FURNITURE_BY_WIDTH.ShortDescription=Sortiert Mobiliar nach Breite
+HomePane.SORT_HOME_FURNITURE_BY_WIDTH.ShortDescription=Sortiert Mobiliar nach seiner Breite
 HomePane.SORT_HOME_FURNITURE_BY_WIDTH.MnemonicKey=B
 
 HomePane.SORT_HOME_FURNITURE_BY_DEPTH.Name=Tiefe
-HomePane.SORT_HOME_FURNITURE_BY_DEPTH.ShortDescription=Sortiert Mobiliar nach Tiefe
+HomePane.SORT_HOME_FURNITURE_BY_DEPTH.ShortDescription=Sortiert Mobiliar nach seiner Tiefe
 HomePane.SORT_HOME_FURNITURE_BY_DEPTH.MnemonicKey=T
 
 HomePane.SORT_HOME_FURNITURE_BY_HEIGHT.Name=H�he
-HomePane.SORT_HOME_FURNITURE_BY_HEIGHT.ShortDescription=Sortiert Mobiliar nach H�he
+HomePane.SORT_HOME_FURNITURE_BY_HEIGHT.ShortDescription=Sortiert Mobiliar nach seiner H�he
 HomePane.SORT_HOME_FURNITURE_BY_HEIGHT.MnemonicKey=H
 
 HomePane.SORT_HOME_FURNITURE_BY_X.Name=Horizontale Lage
-HomePane.SORT_HOME_FURNITURE_BY_X.ShortDescription=Sortiert Mobiliar nach ihrer horizontalen Lage
+HomePane.SORT_HOME_FURNITURE_BY_X.ShortDescription=Sortiert Mobiliar nach seiner horizontalen Lage
 HomePane.SORT_HOME_FURNITURE_BY_X.MnemonicKey=Z
 
 HomePane.SORT_HOME_FURNITURE_BY_Y.Name=Vertikale Lage
-HomePane.SORT_HOME_FURNITURE_BY_Y.ShortDescription=Sortiert Mobiliar nach ihrer vertikalen Lage
+HomePane.SORT_HOME_FURNITURE_BY_Y.ShortDescription=Sortiert Mobiliar nach seiner vertikalen Lage
 HomePane.SORT_HOME_FURNITURE_BY_Y.MnemonicKey=V
 
 HomePane.SORT_HOME_FURNITURE_BY_ELEVATION.Name=H�he �ber Boden
-HomePane.SORT_HOME_FURNITURE_BY_ELEVATION.ShortDescription=Sortiert Mobiliar nach ihrer H�he �ber dem Boden
+HomePane.SORT_HOME_FURNITURE_BY_ELEVATION.ShortDescription=Sortiert Mobiliar nach seiner H�he �ber dem Boden
 HomePane.SORT_HOME_FURNITURE_BY_ELEVATION.MnemonicKey=D
 
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.Name=Winkel
-HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Sortiert Mobiliar nach ihrem Winkel
+HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Sortiert Mobiliar nach seinem Winkel
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=K
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=Niveau
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=Sortiert Mobiliar nach seinem Niveau
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=U
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=Farbe
-HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Sortiert Mobiliar nach ihrer Farbe
+HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Sortiert Mobiliar nach seiner Farbe
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=F
 
 HomePane.SORT_HOME_FURNITURE_BY_TEXTURE.Name=Textur
-HomePane.SORT_HOME_FURNITURE_BY_TEXTURE.ShortDescription=Sortiert Mobiliar nach Textur
+HomePane.SORT_HOME_FURNITURE_BY_TEXTURE.ShortDescription=Sortiert Mobiliar nach seiner Textur
 HomePane.SORT_HOME_FURNITURE_BY_TEXTURE.MnemonicKey=X
 
 HomePane.SORT_HOME_FURNITURE_BY_MOVABILITY.Name=Beweglichkeit
-HomePane.SORT_HOME_FURNITURE_BY_MOVABILITY.ShortDescription=Sortiert Mobiliar nach ihrer Beweglichkeit
+HomePane.SORT_HOME_FURNITURE_BY_MOVABILITY.ShortDescription=Sortiert Mobiliar nach seiner Beweglichkeit
 HomePane.SORT_HOME_FURNITURE_BY_MOVABILITY.MnemonicKey=G
 
 HomePane.SORT_HOME_FURNITURE_BY_TYPE.Name=Art
-HomePane.SORT_HOME_FURNITURE_BY_TYPE.ShortDescription=Sortiert Mobiliar nach ihrer Art
+HomePane.SORT_HOME_FURNITURE_BY_TYPE.ShortDescription=Sortiert Mobiliar nach seiner Art
 HomePane.SORT_HOME_FURNITURE_BY_TYPE.MnemonicKey=A
 
 HomePane.SORT_HOME_FURNITURE_BY_VISIBILITY.Name=Sichtbarkeit
-HomePane.SORT_HOME_FURNITURE_BY_VISIBILITY.ShortDescription=Sortiert Mobiliar nach ihrer Sichtbarkeit im Plan
+HomePane.SORT_HOME_FURNITURE_BY_VISIBILITY.ShortDescription=Sortiert Mobiliar nach seiner Sichtbarkeit im Plan
 HomePane.SORT_HOME_FURNITURE_BY_VISIBILITY.MnemonicKey=S
 
 HomePane.SORT_HOME_FURNITURE_BY_PRICE.Name=Preis
-HomePane.SORT_HOME_FURNITURE_BY_PRICE.ShortDescription=Sortiert Mobiliar nach Preis
+HomePane.SORT_HOME_FURNITURE_BY_PRICE.ShortDescription=Sortiert Mobiliar nach seinem Preis
 HomePane.SORT_HOME_FURNITURE_BY_PRICE.MnemonicKey=P
 
 HomePane.SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX_PERCENTAGE.Name=MwSt %
-HomePane.SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX_PERCENTAGE.ShortDescription=Sortiert Mobiliar nach MwSt Prozent
+HomePane.SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX_PERCENTAGE.ShortDescription=Sortiert Mobiliar nach seiner MwSt in Prozent
 HomePane.SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX_PERCENTAGE.MnemonicKey=W
 
 HomePane.SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX.Name=MwSt
-HomePane.SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX.ShortDescription=Sortiert Mobiliar nach MwSt
+HomePane.SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX.ShortDescription=Sortiert Mobiliar nach seiner MwSt
 HomePane.SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX.MnemonicKey=M
 
 HomePane.SORT_HOME_FURNITURE_BY_PRICE_VALUE_ADDED_TAX_INCLUDED.Name=Preis inklusive MwSt
-HomePane.SORT_HOME_FURNITURE_BY_PRICE_VALUE_ADDED_TAX_INCLUDED.ShortDescription=Sortiert M�bel Mobiliar Preis inklusive MwSt
+HomePane.SORT_HOME_FURNITURE_BY_PRICE_VALUE_ADDED_TAX_INCLUDED.ShortDescription=Sortiert Mobiliar nach seinem Preis inklusive MwSt
 HomePane.SORT_HOME_FURNITURE_BY_PRICE_VALUE_ADDED_TAX_INCLUDED.MnemonicKey=U
 
 HomePane.SORT_HOME_FURNITURE_BY_DESCENDING_ORDER.Name=Absteigende Reihenfolge
@@ -486,6 +493,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Zeige Spalte "Winkel"
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=K
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=Niveau
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Zeige Spalte "Niveau"
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=U
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=Farbe
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Zeige Spalte "Farbe"
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=F
@@ -591,7 +602,7 @@
 HomePane.MODIFY_TEXT_STYLE.MnemonicKey=D
 
 HomePane.INCREASE_TEXT_SIZE.Name=Vergr��ern
-HomePane.INCREASE_TEXT_SIZE.ShortDescription=Ausgew�hlter Text vergr��ern
+HomePane.INCREASE_TEXT_SIZE.ShortDescription=Ausgew�hlten Text vergr��ern
 HomePane.INCREASE_TEXT_SIZE.MnemonicKey=V
 
 HomePane.DECREASE_TEXT_SIZE.Name=Verkleinern
@@ -599,11 +610,11 @@
 HomePane.DECREASE_TEXT_SIZE.MnemonicKey=E
 
 HomePane.TOGGLE_BOLD_STYLE.Name=Fett
-HomePane.TOGGLE_BOLD_STYLE.ShortDescription=Ausgew�hlten Text Fett schreiben
+HomePane.TOGGLE_BOLD_STYLE.ShortDescription=Ausgew�hlten Text fettschreiben
 HomePane.TOGGLE_BOLD_STYLE.MnemonicKey=F
 
 HomePane.TOGGLE_ITALIC_STYLE.Name=Kursiv
-HomePane.TOGGLE_ITALIC_STYLE.ShortDescription=Ausgew�hlten Text Kursiv schreiben
+HomePane.TOGGLE_ITALIC_STYLE.ShortDescription=Ausgew�hlten Text kursivschreiben
 HomePane.TOGGLE_ITALIC_STYLE.MnemonicKey=K
 
 
@@ -627,6 +638,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=L�scht das Hintergrundbild
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=L
 
+HomePane.ADD_LEVEL.Name=Niveau hinzuf�gen
+HomePane.ADD_LEVEL.ShortDescription=F�gt ein neues Niveau hinzu
+HomePane.ADD_LEVEL.MnemonicKey=Z
+
+HomePane.MODIFY_LEVEL.Name=Niveau bearbeiten...
+HomePane.MODIFY_LEVEL.ShortDescription=Stellt Optionen zum Bearbeiten des ausgew�hlten Niveaus zur Verf�gung
+HomePane.MODIFY_LEVEL.MnemonicKey=N
+
+HomePane.DELETE_LEVEL.Name=Niveau l�schen
+HomePane.DELETE_LEVEL.ShortDescription=L�scht das ausgew�hlte Niveau
+HomePane.DELETE_LEVEL.MnemonicKey=S
+
 HomePane.ZOOM_OUT.Name=Verkleinern
 HomePane.ZOOM_OUT.ShortDescription=Verkleinern
 HomePane.ZOOM_OUT.MnemonicKey=V
@@ -635,8 +658,8 @@
 HomePane.ZOOM_IN.ShortDescription=Vergr��ern
 HomePane.ZOOM_IN.MnemonicKey=R
 
-HomePane.EXPORT_TO_SVG.Name=Exportieren in das SVG Format...
-HomePane.EXPORT_TO_SVG.ShortDescription=Exportieren in das SVG Format
+HomePane.EXPORT_TO_SVG.Name=Exportieren in das SVG-Format...
+HomePane.EXPORT_TO_SVG.ShortDescription=Exportieren in das SVG-Format
 HomePane.EXPORT_TO_SVG.MnemonicKey=G
 
 
@@ -656,7 +679,7 @@
 HomePane.STORE_POINT_OF_VIEW.MnemonicKey=S
 
 # Go to point of view sub menu is filled dynamically
-HomePane.GO_TO_POINT_OF_VIEW.Name=Zu Kameraposition wechseln
+HomePane.GO_TO_POINT_OF_VIEW.Name=Zur Kameraposition wechseln
 HomePane.GO_TO_POINT_OF_VIEW.MnemonicKey=W
 HomePane.NoStoredPointOfView=Keine gespeicherten Kamerapositionen
 
@@ -669,8 +692,16 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=Anzeigen der 3D-Ansicht im Hauptfenster
 HomePane.ATTACH_3D_VIEW.MnemonicKey=A
 
+HomePane.DISPLAY_ALL_LEVELS.Name=Alle Niveaus anzeigen
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Alle Niveaus in der 3D-Ansicht anzeigen
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=N
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Ausgew�hltes Niveau anzeigen
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Das ausgew�hlte Niveau in der 3D-Ansicht anzeigen
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=H
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=Einstellungen...
-HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Einstellungen 3D Perspektive
+HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Einstellungen f�r die 3D-Perspektive
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=E
 
 HomePane.CREATE_PHOTO.Name=Foto erstellen...
@@ -681,23 +712,40 @@
 HomePane.CREATE_VIDEO.ShortDescription=Erstellen Sie ein 3D-Video
 HomePane.CREATE_VIDEO.MnemonicKey=D
 
-HomePane.EXPORT_TO_OBJ.Name=Exportieren in das OBJ Format...
-HomePane.EXPORT_TO_OBJ.ShortDescription=Exportieren in das OBJ Format
+HomePane.EXPORT_TO_OBJ.Name=Exportieren in das OBJ-Format...
+HomePane.EXPORT_TO_OBJ.ShortDescription=Exportieren in das OBJ-Format
 HomePane.EXPORT_TO_OBJ.MnemonicKey=X
 
 
 HomePane.HELP_MENU.Name=Hilfe
 HomePane.HELP_MENU.MnemonicKey=H
 
-HomePane.HELP.Name=Sweet Home 3D Hilfe
-HomePane.HELP.ShortDescription=Zeigt die Sweet Home 3D Hilfe
+HomePane.HELP.Name=Sweet Home 3D-Hilfe
+HomePane.HELP.ShortDescription=Zeigt die Sweet Home 3D-Hilfe
 HomePane.HELP.MnemonicKey=S
 
 HomePane.ABOUT.Name=About...
 HomePane.ABOUT.ShortDescription=Infos �ber Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=A
 
+
+# Contextual menu
+HomePane.SELECT_OBJECT_MENU.Name=Objekt ausw�hlen
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=Kompass
+HomePane.selectObject.furniture=M�belst�ck
+HomePane.selectObject.wall=Wand %s
+HomePane.selectObject.floor=Boden %s
+HomePane.selectObject.ceiling=Decke %s
+HomePane.selectObject.room=Raum %s
+HomePane.selectObject.dimensionLine=L�ngenangabe %s 
+HomePane.selectObject.label=Text
+
+
+# Open / Save dialogs title
 HomePane.openHomeDialog.title=�ffnen
+HomePane.importLanguageLibraryDialog.title=Sprachbibliothek importieren
 HomePane.importFurnitureLibraryDialog.title=M�belbibliothek importieren
 HomePane.importTexturesLibraryDialog.title=Texturbibliothek importieren
 HomePane.saveHomeDialog.title=Speichern
@@ -705,18 +753,19 @@
 HomePane.exportToSVGDialog.title=Exportieren nach SVG
 HomePane.exportToOBJDialog.title=Exportieren nach OBJ
 
+# Generic error / message dialogs
 HomePane.error.title=Fehler
 HomePane.message.title=Nachricht
 
 # Creation mode tips
 HomePane.CREATE_WALLS.tipTitle=Tip: Erstellen von Mauern / W�nden
 HomePane.CREATE_WALLS.tipMessage=<html><style type="text/css">p { margin: 0px 0px 5px 0px;}</style>\
-    <p>Klicke in den Plan um den Startpunkt einer neuen Wand zu setzen,\
-    <br>dann klicken Sie um den Endpunkt zu setzen (oder Doppelklick).\
-    <br>So lange kein Doppelklick oder ein dr�cken der <i>Escape</i> Taste,\
-    <br>erfolgt, erzeugt jeder weitere Klick eine neue Mauer am Ende der alten.\
+    <p>Klicken Sie in den Plan, um den Startpunkt einer neuen Wand zu setzen,\
+    <br>dann klicken Sie, um den Endpunkt zu setzen (oder Doppelklick).\
+    <br>So lange nicht doppelt geklickt oder die <i>Escape</i>-Taste\
+    <br>gedr�ckt wird, erzeugt jeder weitere Klick eine neue Wand am Ende der vorherigen.\
     <br>Wenn Sie den Raumplan bearbeiten, k�nnen Sie jederzeit zur\
-    <br>Tastatureingabe wechseln, indem Sie die <i>Enter</i> Taste dr�cken.\
+    <br>Tastatureingabe wechseln, indem Sie die <i>Eingabetaste</i> dr�cken.\
     <br>Um eine gebogene Wand zu erzeugen, dr�cken Sie die <i>Strg</i>-Taste\
     <br>(oder die <i>Alt</i>-Taste unter MacOS X), w�hrend Sie den Punkt,\
     <br>an dem die Wand enden soll, anklicken.\
@@ -729,9 +778,9 @@
     <br>wie folgt gel�st werden:\
     <ul><li>Klicken Sie in jede Ecke eines Raumes, anschlie�end beenden\
         <br>Sie die Eingabe durch einen Doppelklick auf den Endpunkt,\
-        <br>oder dr�cken Sie die <i>Escape</i> Taste; wenn Sie den Raumplan\
+        <br>oder dr�cken Sie die <i>Escape</i>-Taste; wenn Sie den Raumplan\
         <br>bearbeiten, k�nnen Sie jederzeit zur Tastatureingabe wechseln,\
-        <br>indem Sie die <i>Enter</i> Taste dr�cken;</li>\
+        <br>indem Sie die <i>Eingabetaste</i> dr�cken;</li>\
         <li>oder aber Sie klicken doppelt in einen <b>fertiggestellten</b> Raum\
         <br>(i.e. umgeben von W�nden).</li></ul>
 
@@ -739,19 +788,19 @@
 HomePane.CREATE_DIMENSION_LINES.tipMessage=<html><style type="text/css">ul { margin: 0px 0px 0px 20px; list-style-type: square}</style>\
 �� �<p>Erstellen Sie eine neue Dimension im Plan durch eine der folgenden M�glichkeiten:\
 �� �<ul><li>Klicken Sie auf den Startpunkt der neuen Dimension, dann klicken Sie auf den Endpunkt,\
-�� � � �<br>dann klicken Sie ein drittes Mal an den Ort, an dem die Dimension platziert werden soll;\
+�� � � �<br>dann klicken Sie an den Ort, an dem die Dimension platziert werden soll;\
 �� � � �<br>Wenn der Plan den Fokus hat, k�nnen Sie jederzeit auf Tastatureingabe umschalten\
-�� � � �<br>indem Sie die Taste <i>Enter</i> bet�tigen.</li>\
+�� � � �<br>indem Sie die <i>Eingabetaste</i> bet�tigen.</li>\
         <li>Doppelklicken Sie auf die Abgrenzung eines M�belst�ckes, einer Seitenwand oder Seite\
 �� � � �<br>eines Raumes, und klicken Sie dann an den Ort, an dem die Dimension erstellt werden\
         <br>soll.</li></ul>
 
 HomePane.CREATE_LABELS.tipTitle=Tip: Texte erstellen
 HomePane.CREATE_LABELS.tipMessage=<html>Klicken Sie im Plan, wo Sie den Text erstellen m�chten,\
-  <br>dann geben Sie den gew�nschten Text in dem Fenster ein\
+  <br>dann geben Sie den gew�nschten Text in dem Fenster ein,\
   <br>das erscheint.
 
-HomePane.doNotDisplayTipCheckBox.text=Diesen Tip nicht mehr anzeigen
+HomePane.doNotDisplayTipCheckBox.text=Diesen Tipp nicht mehr anzeigen
 HomePane.doNotDisplayTipCheckBox.mnemonic=D
 
 
@@ -769,36 +818,36 @@
 HomePane.confirmSave.doNotSave=Nicht Speichern
 HomePane.confirmSave.cancel=Abbrechen
 
-HomePane.confirmSaveNewerHome.message=<html><b>Wollen Sie das Haus wirklich in "%s" ?</b>\
+HomePane.confirmSaveNewerHome.message=<html><b>Wollen Sie das Haus wirklich in "%s" speichern?</b>\
                     <br><font size="-2">Diese Haus wurde mit einer neueren Version von Sweet Home 3D erstellt.\
-                    <br>Die Informationen die Sie mit dieser Version hinzugef�gt haben gehen verloren\
-                    <br>wenn sie mit der jetzt verwendeten Version speichern. Wenn Sie die Informationen\
-                    <br>behalten wollen w�hlen Sie einen anderen Dateinamen.<br>
+                    <br>Die Informationen, die Sie mit dieser Version hinzugef�gt haben, gehen verloren,\
+                    <br>wenn sie mit der jetzt verwendeten Version gespeichert werden. Wenn Sie die Informationen\
+                    <br>behalten wollen, w�hlen Sie einen anderen Dateinamen.<br>
 HomePane.confirmSaveNewerHome.title=Speichern
 HomePane.confirmSaveNewerHome.save=Speichern
 HomePane.confirmSaveNewerHome.doNotSave=Nicht speichern
 
 HomePane.confirmExit.message=<html><b>Wollen Sie wirklich beenden?</b>\
-                    <br><font size="-2">Nicht gespeicherte �nderungen gehen verloren\
+                    <br><font size="-2">Nicht gespeicherte �nderungen gehen verloren,\
                     <br>wenn Sie die Anwendung jetzt schlie�en.
 HomePane.confirmExit.title=Verlassen
 HomePane.confirmExit.quit=Beenden
 HomePane.confirmExit.doNotQuit=Nicht Beenden
 
 HomePane.confirmReplaceFurnitureLibrary.message=<html><b>M�belbibliothek "%s" existiert bereits.\
-    <br>Wollen Sie ihn �berschreiben?</b>
+    <br>Wollen Sie sie �berschreiben?</b>
 HomePane.confirmReplaceFurnitureLibrary.title=M�belbibliothek importieren
 HomePane.confirmReplaceFurnitureLibrary.replace=Ersetzen
 HomePane.confirmReplaceFurnitureLibrary.doNotReplace=Nicht Ersetzen
 
 HomePane.confirmReplaceTexturesLibrary.message=<html><b>Die Texturbibliothek "%s" existiert bereits.\
-�� �<br>Wollen Sie die existierende mit der neuen Bibliothek ersetzen?</b>
+�� �<br>Wollen Sie die existierende durch die neue Bibliothek ersetzen?</b>
 HomePane.confirmReplaceTexturesLibrary.title=Texturbibliothek importieren
 HomePane.confirmReplaceTexturesLibrary.replace=Ersetzen
 HomePane.confirmReplaceTexturesLibrary.doNotReplace=Nicht ersetzen
 
 HomePane.confirmReplacePlugin.message=<html><b>Das plug-in "%s" existiert bereits.\
-    <br>Wollen Sie ihn �berschreiben?</b>
+    <br>Wollen Sie es �berschreiben?</b>
 HomePane.confirmReplacePlugin.title=Plug-in importieren
 HomePane.confirmReplacePlugin.replace=Ersetzen
 HomePane.confirmReplacePlugin.doNotReplace=Nicht Ersetzen
@@ -810,25 +859,25 @@
 HomePane.about.message=<html><font face="sanssherif"><center><font size="+2"><b>Sweet Home 3D</b></font> <sup>&reg;</sup>\
               <br><b>Version %1$s</b>\
               <br><font size="-1">Java Version %2$s</font>\
-              <br><font size="-1">3DS Import zur Verf�gung gestellt von <a href="http://www.microcrowd.com/">Microcrowd</a></font>\
-              <br><font size="-1">PDF Druck zur Verf�gung gestellt von <a href="http://www.lowagie.com/iText/">iText</a></font>\
-              <br><font size="-1">SVG Export zur Verf�gung gestellt von <a href="http://java.freehep.org/">FreeHEP</a></font>\
+              <br><font size="-1">3DS-Import zur Verf�gung gestellt von <a href="http://www.microcrowd.com/">Microcrowd</a></font>\
+              <br><font size="-1">PDF-Druck zur Verf�gung gestellt von <a href="http://www.lowagie.com/iText/">iText</a></font>\
+              <br><font size="-1">SVG-Export zur Verf�gung gestellt von <a href="http://java.freehep.org/">FreeHEP</a></font>\
               <br><font size="-1">Photo Rendering zur Verf�gung gestellt von <a href="http://sunflow.sourceforge.net/">SunFlow</a></font>\
               <p>�bersetzt ins Deutsche von Sebastian Breuer,<br>Thomas Zimmermann, Thomas Tschikste und Florian Haag\
               </p><p>Besuchen Sie\
               <br><a href="http://www.sweethome3d.com/">http://www.sweethome3d.com/</a>\
-              <br>f�r Software Updates und um uns �ber Bugs zu berrichten.\
+              <br>f�r Software Updates und um uns �ber Bugs zu informieren.\
               </p><p><font size="-2">� Copyright 2006-2011 by eTeks \
               &lt;<a href="mailto:info@eteks.com">info@eteks.com</a>>\
-              <br>Verbreitet unter der <a href="http://www.gnu.org/copyleft/gpl.txt">GNU General Public License</a></font>
+              <br>Zur Verf�gung gestellt unter der <a href="http://www.gnu.org/copyleft/gpl.txt">GNU General Public License</a></font>
 HomePane.about.icon=resources/aboutIcon.png
 
 
 # Resources for ImportedFurnitureWizardStepsPanel class
 ImportedFurnitureWizardStepsPanel.modelChoiceLabel.text=<html>W�hlen Sie das 3D-Modell des Mobiliars mit Hilfe von Drag'n'Drop\
    <br>oder klicken Sie <i>Modell w�hlen</i> (unterst�tzte Formate: OBJ, DAE, 3DS, LWS\
-   <br>oder eine ZIP Datei die einem der vorher genannten Dateitypen enth�lt).
-ImportedFurnitureWizardStepsPanel.modelChangeLabel.text=�ndern Sie das 3D Modell des Mobiliars sofern es notwendig ist.
+   <br>oder eine ZIP-Datei, die einen der vorher genannten Dateitypen enth�lt).
+ImportedFurnitureWizardStepsPanel.modelChangeLabel.text=�ndern Sie das 3D-Modell des Mobiliars, sofern es notwendig ist.
 ImportedFurnitureWizardStepsPanel.modelChoiceButton.text=Modell w�hlen
 ImportedFurnitureWizardStepsPanel.modelChoiceButton.mnemonic=M
 ImportedFurnitureWizardStepsPanel.modelChangeButton.text=Modell �ndern
@@ -845,18 +894,21 @@
 ImportedFurnitureWizardStepsPanel.modelChoiceFormatError=<html>Das gew�hlte Format wird nicht unterst�tzt.<br>\
     Bitte w�hlen Sie eine andere Datei.
 
-ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Pr�fen Sie ob das Objekt richtig ausgerichtet ist. Wenn dies nicht der Fall<br>\
-    ist drehen Sie es mit den Pfeilen bist die Vorderseite korrekt angezeigt wird.
+ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Pr�fen Sie, ob das Objekt richtig ausgerichtet ist. Wenn dies nicht der Fall<br>\
+    ist, drehen Sie es mit den Pfeilen, bis die Vorderseite korrekt angezeigt wird.<br>\
+    Halten Sie die <i>Umschalttaste</i> gedr�ckt, w�hrend Sie einen Pfeil anklicken, um<br>\
+    das Modell in kleineren Schritten zu drehen.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=Front Ansicht
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Seiten Ansicht
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Draufsicht
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=Perspektive
-ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Wenn das Modell nicht korrekt angezeigt wird, w�hlen Sie Die folgende<br>\
-   Option um die Ansicht zu invertieren.
-ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Vorder und R�ckseite tauschen
+ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Wenn das Modell nicht korrekt angezeigt wird, w�hlen Sie die folgende<br>\
+   Option, um die Ansicht zu invertieren.
+ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Vorder- und R�ckseite tauschen
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.mnemonic=V
 
-ImportedFurnitureWizardStepsPanel.attributesLabel.text=<html>Wenn die folgenden Optionen nicht korrekt sind korrigieren Sie sie.
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=Standardausrichtung wiederherstellen
+ImportedFurnitureWizardStepsPanel.attributesLabel.text=<html>Wenn die folgenden Optionen nicht korrekt sind, korrigieren Sie sie.
 ImportedFurnitureWizardStepsPanel.nameLabel.text=Name:
 ImportedFurnitureWizardStepsPanel.nameLabel.mnemonic=N
 ImportedFurnitureWizardStepsPanel.addToCatalogCheckBox.text=Zum Katalog hinzuf�gen
@@ -877,21 +929,23 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=G
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=T�r / Fenster
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=S
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Treppenhaus
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=R
 ImportedFurnitureWizardStepsPanel.colorLabel.text=Farbe:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=F
 ImportedFurnitureWizardStepsPanel.colorDialog.title=Mobiliar Farbe
 ImportedFurnitureWizardStepsPanel.clearColorButton.text=Farbe l�schen
 ImportedFurnitureWizardStepsPanel.clearColorButton.mnemonic=L
 
-ImportedFurnitureWizardStepsPanel.iconLabel.text=<html>Das Bild unten zeigt das Icon das sp�ter f�r den Plan und f�r den Katalog<br>\
+ImportedFurnitureWizardStepsPanel.iconLabel.text=<html>Das Bild unten zeigt das Icon, das sp�ter f�r den Plan und f�r den Katalog<br>\
     benutzt wird. Wenn der Winkel der Ansicht nicht stimmt, k�nnen Sie ihn<br>\
     mit der Maus ver�ndern.
 
 
 # Resources for ImportedTextureWizardStepsPanel class
-ImportedTextureWizardStepsPanel.imageChoiceLabel.text=<html>Um eine Textur zu erstellen ziehen Sie ein Bild in den Bereich\
-    <br>unten oder klicken Sie auf den Button <i>Bild ausw�hlen</i>\
-    <br>(unterst�tze Formate: BMP, JPEG, GIF, PNG).
+ImportedTextureWizardStepsPanel.imageChoiceLabel.text=<html>Um eine Textur zu erstellen, ziehen Sie ein Bild in den Bereich\
+    <br>unten oder klicken Sie auf die Schaltfl�che <i>Bild ausw�hlen</i>\
+    <br>(unterst�tzte Formate: BMP, JPEG, GIF, PNG).
 ImportedTextureWizardStepsPanel.imageChangeLabel.text=�ndern Sie das Bild hier.
 ImportedTextureWizardStepsPanel.imageChoiceButton.text=Bild ausw�hlen
 ImportedTextureWizardStepsPanel.imageChoiceButton.mnemonic=B
@@ -906,7 +960,7 @@
 	
 ImportedTextureWizardStepsPanel.attributesLabel.text=<html>Wenn die folgenden Optionen nicht korrekt sind, �ndern Sie sie.\
    <br>Die L�nge und Breite der Textur sollte den\
-   <br>Abmessungen der Wirklichkeit entsprechen.
+   <br>Abmessungen aus der Wirklichkeit entsprechen.
 ImportedTextureWizardStepsPanel.nameLabel.text=Name:
 ImportedTextureWizardStepsPanel.nameLabel.mnemonic=N
 ImportedTextureWizardStepsPanel.addToCatalogCheckBox.text=Zum Katalog hinzuf�gen
@@ -926,11 +980,33 @@
 LabelPanel.labelModification.title=Text editieren
 LabelPanel.labelCreation.title=Text erstellen
 
+
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=Name:
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=Erhebung (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=Bodendicke (%s):
+LevelPanel.floorThicknessLabel.mnemonic=B
+LevelPanel.heightLabel.text=H�he (%s):
+LevelPanel.heightLabel.mnemonic=H
+LevelPanel.levelsSummaryLabel.text=Zusammenfassung der Niveaus (das bearbeitete ist ausgew�hlt):
+LevelPanel.nameColumn=Name
+LevelPanel.elevationColumn=Erhebung
+LevelPanel.floorThicknessColumn=Bodendicke
+LevelPanel.heightColumn=H�he
+
+LevelPanel.level.title=Niveau bearbeiten
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=Niveau hinzuf�gen
+
 	
 # Resources for PageSetupPanel class
-PageSetupPanel.pageFormatButton.text=Papier format
+PageSetupPanel.pageFormatButton.text=Papierformat
 PageSetupPanel.pageFormatButton.mnemonic=F
-PageSetupPanel.furniturePrintedCheckBox.text=Mobiliar Liste drucken
+PageSetupPanel.furniturePrintedCheckBox.text=Mobiliarliste drucken
 PageSetupPanel.furniturePrintedCheckBox.mnemonic=B
 PageSetupPanel.planPrintedCheckBox.text=Plan drucken
 PageSetupPanel.planPrintedCheckBox.mnemonic=P
@@ -950,10 +1026,10 @@
 PageSetupPanel.variablesLabel.text=Variablen:
 
 PageSetupPanel.INSERT_PAGE_NUMBER.ShortDescription=Seitennummer einf�gen
-PageSetupPanel.INSERT_PAGE_COUNT.ShortDescription=Seintenanzahl einf�gen
-PageSetupPanel.INSERT_PLAN_SCALE.ShortDescription=Plan Ma�stab einf�gen
+PageSetupPanel.INSERT_PAGE_COUNT.ShortDescription=Seitenanzahl einf�gen
+PageSetupPanel.INSERT_PLAN_SCALE.ShortDescription=Ma�stab des Plans einf�gen
 PageSetupPanel.INSERT_DATE.ShortDescription=Datum einf�gen
-PageSetupPanel.INSERT_TIME.ShortDescription=Zeit einf�gen
+PageSetupPanel.INSERT_TIME.ShortDescription=Uhrzeit einf�gen
 PageSetupPanel.INSERT_HOME_PRESENTATION_NAME.ShortDescription=Name des Plans einf�gen
 PageSetupPanel.INSERT_HOME_NAME.ShortDescription=Dateiname einf�gen
 
@@ -1030,7 +1106,7 @@
 
 PrintPreviewPanel.pageLabel.text=Seite %1$d/%2$d
 
-PrintPreviewPanel.printPreview.title=Druck Vorschau
+PrintPreviewPanel.printPreview.title=Druckvorschau
 
 
 # Resources for RoomPanel class
@@ -1079,7 +1155,7 @@
 TextureChoiceComponent.deleteTextureButton.text=L�schen
 TextureChoiceComponent.deleteTextureButton.mnemonic=L
 
-TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.message=html><b>Wollen Sie wirklich das ausgew�hlte\
+TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.message=html><b>Wollen Sie wirklich die ausgew�hlte\
     <br>importierte Textur l�schen?</b>\
     <br><font size="-2">Die gel�schte Textur wird nicht mehr in der Liste angezeigt.
 TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.title=Textur l�schen
@@ -1124,7 +1200,7 @@
 UserPreferencesPanel.roomRenderingLabel.text=Rendering des Raums im Plan:
 UserPreferencesPanel.monochromeRadioButton.text=Schwarz-Wei�
 UserPreferencesPanel.monochromeRadioButton.mnemonic=H
-UserPreferencesPanel.floorColorOrTextureRadioButton.text=Bodenfarbe /-textur
+UserPreferencesPanel.floorColorOrTextureRadioButton.text=Bodenfarbe/-textur
 UserPreferencesPanel.floorColorOrTextureRadioButton.mnemonic=X
 UserPreferencesPanel.furnitureIconLabel.text=M�beldarstellung im Plan:
 UserPreferencesPanel.catalogIconRadioButton.text=Mobiliarbilder
@@ -1133,14 +1209,18 @@
 UserPreferencesPanel.topViewRadioButton.mnemonic=V
 UserPreferencesPanel.wallPatternLabel.text=Wandmuster im Plan:
 UserPreferencesPanel.wallPatternLabel.mnemonic=W
-UserPreferencesPanel.newWallThicknessLabel.text=Standardbreite Wand:
+UserPreferencesPanel.newWallThicknessLabel.text=Standardbreite f�r W�nde:
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=B
-UserPreferencesPanel.newWallHeightLabel.text=Standardh�he Wand:
+UserPreferencesPanel.newWallHeightLabel.text=Standardh�he f�r W�nde:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=H
+UserPreferencesPanel.newFloorThicknessLabel.text=Standarddicke f�r B�den:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=F
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Intervall zum automatischen Speichern:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=O
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=Minuten
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=Sprachbibliotheksdatei importieren
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=Anzeige von Tipps zur�cksetzen
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=N
 
@@ -1177,8 +1257,8 @@
 VideoPanel.ceilingLightEnabledCheckBox.mnemonic=H
 
 VideoPanel.tipLabel.text=<html>Bewegen Sie sich durch die 3D-Ansicht und klicken Sie den roten Knopf an\
-�� �<br>jedem Ort den die Kamera im Video passieren soll. Dann klicken Sie auf <i>Erstellen</i>\
-�� �<br>und <i>Speichern</i> um das Video aus Ihrem erstellten Pfad zu generieren.
+�� �<br>jedem Ort, den die Kamera im Video passieren soll, an. Dann klicken Sie auf <i>Erstellen</i>\
+�� �<br>und <i>Speichern</i>, um das Video aus Ihrem erstellten Pfad zu generieren.
 VideoPanel.progressStartLabel.format=%1$d Bilder zu berechnen - Videodauer: %2$s
 VideoPanel.progressLabel.format=%1$d / %2$d - Gesch�tzte Zeit verbleibend: %3$s�
 VideoPanel.hoursMinutes.format=%1$d h %2$02d min
@@ -1245,11 +1325,11 @@
 WallPanel.rightSideShinyRadioButton.text=Gl�nzend
 WallPanel.rightSideShinyRadioButton.mnemonic=L
 WallPanel.heightPanel.title=H�he
-WallPanel.rectangularWallRadioButton.text=Rechteckige Mauer
+WallPanel.rectangularWallRadioButton.text=Rechteckige Wand
 WallPanel.rectangularWallRadioButton.mnemonic=R
 WallPanel.rectangularWallHeightLabel.text=H�he (%s):
 WallPanel.rectangularWallHeightLabel.mnemonic=H
-WallPanel.slopingWallRadioButton.text=Neigende Mauer
+WallPanel.slopingWallRadioButton.text=Geneigte Wand
 WallPanel.slopingWallRadioButton.mnemonic=N
 WallPanel.slopingWallHeightAtStartLabel.text=H�he am Startpunkt:
 WallPanel.slopingWallHeightAtStartLabel.mnemonic=S
@@ -1261,15 +1341,16 @@
 WallPanel.arcExtentLabel.mnemonic=W
 WallPanel.wallOrientationLabel.text=<html><table><tr><td valign="top" align="right"><b>Anfang</b></td>\
     <td rowspan="2"><img src="%s"></td>\
-    <td valign="middle" rowspan="2">Die linke Seite der Mauer ist links<br>\
-        wenn du durch die Mauer<br>vom Start bis zum Endpunkt gehst.</td></tr>\
+    <td valign="middle" rowspan="2">Die linke Seite der Wand ist links,<br>\
+        wenn man die Wand vom Startpunkt aus betrachtet mit Blick<br>\
+        auf den Endpunkt sieht.</td></tr>\
     <tr><td valign="bottom" align="right"><b>Ende</b></td></tr>\
     </tr></table>
 
-WallPanel.wall.title=Mauer �ndern
+WallPanel.wall.title=Wand �ndern
 
-WallPanel.leftSideColorDialog.title=Linke Mauernseite Farbe
-WallPanel.rightSideColorDialog.title=Rechte Mauernseite Farbe
+WallPanel.leftSideColorDialog.title=Farbe der linken Wandseite
+WallPanel.rightSideColorDialog.title=Farbe der rechten Wandseite
 
 
 # Resources for WizardPane class
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_el.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_el.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_el.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_el.properties	2011-12-21 00:48:52.000000000 +0000
@@ -152,6 +152,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=O
 Home3DAttributesPanel.observerHeightLabel.text=\u038e\u03c8\u03bf\u03c2 \u03b5\u03c0\u03b9\u03c3\u03ba\u03ad\u03c0\u03c4\u03b7 (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=Y
+Home3DAttributesPanel.observerCameraElevationLabel.text=\u03a5\u03c8\u03cc\u03bc\u03b5\u03c4\u03c1\u03bf \u03bc\u03b1\u03c4\u03b9\u03ce\u03bd (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=G
 Home3DAttributesPanel.groundColorRadioButton.text=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03b5\u03b4\u03ac\u03c6\u03bf\u03c5\u03c2:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=X
 Home3DAttributesPanel.groundColorDialog.title=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03b5\u03b4\u03ac\u03c6\u03bf\u03c5\u03c2
@@ -418,6 +420,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=\u03a4\u03b1\u03be\u03b9\u03bd\u03cc\u03bc\u03b7\u03c3\u03b7 \u03b5\u03c0\u03af\u03c0\u03bb\u03c9\u03bd \u03ba\u03b1\u03c4\u03ac \u03b3\u03c9\u03bd\u03af\u03b1
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=G
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=\u038C\u03C1\u03BF\u03C6\u03BF\u03C2
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=\u03A4\u03B1\u03BE\u03B9\u03BD\u03CC\u03BC\u03B7\u03C3\u03B5 \u03C4\u03B1 \u03AD\u03C0\u03B9\u03C0\u03BB\u03B1 \u03B1\u03BD\u03AC \u03CC\u03C1\u03BF\u03C6\u03BF
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=R
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=\u03a7\u03c1\u03ce\u03bc\u03b1
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=\u03a4\u03b1\u03be\u03b9\u03bd\u03cc\u03bc\u03b7\u03c3\u03b7 \u03b5\u03c0\u03af\u03c0\u03bb\u03c9\u03bd \u03ba\u03b1\u03c4\u03ac \u03c7\u03c1\u03ce\u03bc\u03b1
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=X
@@ -498,6 +504,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b3\u03c9\u03bd\u03af\u03b1\u03c2
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=G
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=\u038C\u03C1\u03BF\u03C6\u03BF\u03C2
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B5 \u03C3\u03C4\u03AE\u03BB\u03B7 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=R
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=\u03a7\u03c1\u03ce\u03bc\u03b1
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03c7\u03c1\u03ce\u03bc\u03b1\u03c4\u03bf\u03c2
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=X
@@ -639,6 +649,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c4\u03b7\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03c0\u03bf\u03c5 \u03b5\u03bc\u03c6\u03b1\u03bd\u03af\u03b6\u03b5\u03c4\u03b1\u03b9 \u03c9\u03c2 \u03c6\u03cc\u03bd\u03c4\u03bf \u03c3\u03c4\u03bf \u03c3\u03c7\u03ad\u03b4\u03b9\u03bf
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=G
 
+HomePane.ADD_LEVEL.Name=\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5
+HomePane.ADD_LEVEL.ShortDescription=\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03BD\u03AD\u03BF\u03C5 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5 \u03C3\u03C4\u03BF \u03BA\u03C4\u03AF\u03C3\u03BC\u03B1
+HomePane.ADD_LEVEL.MnemonicKey=O
+
+HomePane.MODIFY_LEVEL.Name=\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5...
+HomePane.MODIFY_LEVEL.ShortDescription=\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03BF\u03C5 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5
+HomePane.MODIFY_LEVEL.MnemonicKey=A
+
+HomePane.DELETE_LEVEL.Name=\u0391\u03C6\u03B1\u03AF\u03C1\u03B5\u03C3\u03B7 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5
+HomePane.DELETE_LEVEL.ShortDescription=\u0391\u03C6\u03B1\u03AF\u03C1\u03B5\u03C3\u03B7 \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03BF\u03C5 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5 \u03B1\u03C0\u03CC \u03C4\u03BF \u03BA\u03C4\u03AF\u03C3\u03BC\u03B1
+HomePane.DELETE_LEVEL.MnemonicKey=E
+
 HomePane.ZOOM_IN.Name=\u039c\u03b5\u03b3\u03ad\u03b8\u03c5\u03bd\u03c3\u03b7
 HomePane.ZOOM_IN.ShortDescription=\u039c\u03b5\u03b3\u03ad\u03b8\u03c5\u03bd\u03c3\u03b7
 HomePane.ZOOM_IN.MnemonicKey=U
@@ -681,6 +703,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b5 \u03c4\u03bf 3D \u03c3\u03c7\u03ad\u03b4\u03b9\u03bf \u03c3\u03c4\u03bf \u03ba\u03c5\u03c1\u03af\u03c9\u03c2 \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf
 HomePane.ATTACH_3D_VIEW.MnemonicKey=P
 
+HomePane.DISPLAY_ALL_LEVELS.Name=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B5 \u03CC\u03BB\u03BF\u03C5\u03C2 \u03C4\u03BF\u03C5\u03C2 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5\u03C2
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B5 \u03CC\u03BB\u03BF\u03C5\u03C2 \u03C4\u03BF\u03C5\u03C2 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5\u03C2 \u03C3\u03C4\u03B7\u03BD 3D \u03B1\u03C0\u03B5\u03B9\u03BA\u03CC\u03BD\u03B9\u03C3\u03B7
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=O
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B5 \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03BF \u03CC\u03C1\u03BF\u03C6\u03BF
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B5 \u03C4\u03BF\u03BD \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03BF \u03CC\u03C1\u03BF\u03C6\u03BF \u03C3\u03C4\u03B7\u03BD 3D \u03B1\u03C0\u03B5\u03B9\u03BA\u03CC\u03BD\u03B9\u03C3\u03B7
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=N
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=\u03a4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=\u03a4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae\u03c2 3D
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=T
@@ -709,10 +739,24 @@
 HomePane.ABOUT.ShortDescription=\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7\u03c2 \u03c0\u03bb\u03b7\u03c1\u03bf\u03c6\u03bf\u03c1\u03b9\u03ce\u03bd \u03c3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac \u03bc\u03b5 \u03c4\u03bf Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=S
 
+HomePane.SELECT_OBJECT_MENU.Name=\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE \u03B1\u03BD\u03C4\u03B9\u03BA\u03B5\u03B9\u03BC\u03AD\u03BD\u03BF\u03C5
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=A
+
+HomePane.selectObject.compass=\u03A0\u03C5\u03BE\u03AF\u03B4\u03B1
+HomePane.selectObject.furniture=\u0388\u03C0\u03B9\u03C0\u03BB\u03BF
+HomePane.selectObject.wall=\u03A4\u03BF\u03AF\u03C7\u03BF\u03C2 %s
+HomePane.selectObject.floor=\u0394\u03AC\u03C0\u03B5\u03B4\u03BF %s
+HomePane.selectObject.ceiling=\u039F\u03C1\u03BF\u03C6\u03AE %s
+HomePane.selectObject.room=\u0394\u03C9\u03BC\u03AC\u03C4\u03B9\u03BF %s
+HomePane.selectObject.dimensionLine=\u0393\u03C1\u03B1\u03BC\u03BC\u03AE \u0394\u03B9\u03AC\u03C3\u03C4\u03B1\u03C3\u03B7\u03C2 %s 
+HomePane.selectObject.label=\u039A\u03B5\u03AF\u03BC\u03B5\u03BD\u03BF
+
+
 # Open / Save dialogs title
 HomePane.openHomeDialog.title=\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1
 HomePane.importFurnitureLibraryDialog.title=\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b2\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7\u03c2 \u03b5\u03c0\u03af\u03c0\u03bb\u03c9\u03bd
 HomePane.importTexturesLibraryDialog.title=\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b2\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7\u03c2 \u03c5\u03c6\u03ce\u03bd
+HomePane.importLanguageLibraryDialog.title=\u0395\u03B9\u03C3\u03B1\u03B3\u03C9\u03B3\u03AE \u03B2\u03B9\u03B2\u03BB\u03B9\u03BF\u03B8\u03AE\u03BA\u03B7\u03C2 \u03B3\u03BB\u03CE\u03C3\u03C3\u03B1\u03C2
 HomePane.saveHomeDialog.title=\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7
 HomePane.printToPDFDialog.title=\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7 \u03c3\u03b5 PDF
 HomePane.exportToSVGDialog.title=\u0395\u03be\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03b5 SVG
@@ -863,11 +907,15 @@
     <br>\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03ac\u03bb\u03bb\u03bf \u03bc\u03bf\u03bd\u03c4\u03ad\u03bb\u03bf.
 
 ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>\u0395\u03bb\u03ad\u03b3\u03be\u03c4\u03b5 \u03cc\u03c4\u03b9 \u03c4\u03bf \u03bc\u03bf\u03bd\u03c4\u03ad\u03bb\u03bf \u03ad\u03c7\u03b5\u03b9 \u03c3\u03c9\u03c3\u03c4\u03cc \u03c0\u03c1\u03bf\u03c3\u03b1\u03bd\u03b1\u03c4\u03bf\u03bb\u03b9\u03c3\u03bc\u03cc. \u0391\u03bd \u03cc\u03c7\u03b9, \u03c0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03ad\u03c8\u03b5\u03c4\u03ad \u03c4\u03bf \u03bc\u03b5 \u03c4\u03b1 \u03c0\u03b9\u03bf\
-    <br>\u03ba\u03ac\u03c4\u03c9 \u03b2\u03ad\u03bb\u03b7 \u03bc\u03ad\u03c7\u03c1\u03b9 \u03b7 \u03c0\u03c1\u03cc\u03c3\u03bf\u03c8\u03b7 \u03bd\u03b1 \u03b1\u03bd\u03c4\u03b9\u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af \u03c3\u03c4\u03bf \u03bc\u03c0\u03c1\u03bf\u03c3\u03c4\u03b9\u03bd\u03cc \u03bc\u03ad\u03c1\u03bf\u03c2 \u03c4\u03bf\u03c5 \u03b5\u03c0\u03af\u03c0\u03bb\u03bf\u03c5.
+    <br>\u03ba\u03ac\u03c4\u03c9 \u03b2\u03ad\u03bb\u03b7 \u03bc\u03ad\u03c7\u03c1\u03b9 \u03b7 \u03c0\u03c1\u03cc\u03c3\u03bf\u03c8\u03b7 \u03bd\u03b1 \u03b1\u03bd\u03c4\u03b9\u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af \u03c3\u03c4\u03bf \u03bc\u03c0\u03c1\u03bf\u03c3\u03c4\u03b9\u03bd\u03cc \u03bc\u03ad\u03c1\u03bf\u03c2 \u03c4\u03bf\u03c5 \u03b5\u03c0\u03af\u03c0\u03bb\u03bf\u03c5. \u03A0\u03B9\u03AD\u03C3\u03C4\u03B5 \u03C4\u03BF\
+    <br>\u03C0\u03BB\u03AE\u03BA\u03C4\u03C1\u03BF <i>Shift</i> \u03BA\u03B1\u03B8\u03CE\u03C2 \u03BA\u03AC\u03BD\u03B5\u03C4\u03B5 \u03BA\u03BB\u03B9\u03BA \u03C3\u03B5 \u03BA\u03AC\u03C0\u03BF\u03B9\u03BF \u03B2\u03AD\u03BB\u03BF\u03C2 \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03C0\u03B5\u03C1\u03B9\u03C3\u03C4\u03C1\u03AD\u03C8\u03B5\u03C4\u03B5 \u03C4\u03BF \u03B1\u03BD\u03C4\u03B9\u03BA\u03B5\u03AF\u03BC\u03B5\u03BD\u03BF \u03BC\u03B5\
+    <br>\u03BC\u03B9\u03BA\u03C1\u03CC\u03C4\u03B5\u03C1\u03B1 \u03B2\u03AE\u03BC\u03B1\u03C4\u03B1.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=\u03a0\u03c1\u03cc\u03c3\u03bf\u03c8\u03b7
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=\u0394\u03b5\u03be\u03b9\u03ac \u03cc\u03c8\u03b7
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=\u039a\u03ac\u03c4\u03bf\u03c8\u03b7
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=\u03a0\u03c1\u03bf\u03bf\u03c0\u03c4\u03b9\u03ba\u03cc
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=\u0395\u03C0\u03B1\u03BD\u03B1\u03C6\u03BF\u03C1\u03AC \u03C4\u03BF\u03C5 \u03BA\u03B1\u03BD\u03BF\u03BD\u03B9\u03BA\u03BF\u03CD \u03C0\u03C1\u03BF\u03C3\u03B1\u03BD\u03B1\u03C4\u03BF\u03BB\u03B9\u03C3\u03BC\u03BF\u03CD.
+
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>\u0391\u03bd \u03c4\u03bf \u03bc\u03bf\u03bd\u03c4\u03ad\u03bb\u03bf \u03b4\u03b5\u03bd \u03c6\u03b1\u03af\u03bd\u03b5\u03c4\u03b1\u03b9 \u03bd\u03b1 \u03b1\u03c0\u03bf\u03b4\u03af\u03b4\u03b5\u03c4\u03b1\u03b9 \u03c3\u03c9\u03c3\u03c4\u03ac, \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03bf \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9 \u03ba\u03bf\u03c5\u03c4\u03af\
     <br>\u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae\u03c2 \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03b1\u03bd\u03c4\u03b9\u03c3\u03c4\u03c1\u03ad\u03c8\u03b5\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03b5\u03bc\u03c6\u03b1\u03bd\u03b9\u03b6\u03cc\u03bc\u03b5\u03bd\u03b5\u03c2 \u03cc\u03c8\u03b5\u03b9\u03c2 \u03c4\u03bf\u03c5.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=\u0391\u03bd\u03c4\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03c0\u03af\u03c3\u03c9 \u03cc\u03c8\u03b5\u03c9\u03bd \u03ba\u03b1\u03b9 \u03c0\u03c1\u03bf\u03c3\u03cc\u03c8\u03b5\u03c9\u03bd
@@ -895,6 +943,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=N
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=\u03a0\u03cc\u03c1\u03c4\u03b1 \u03ae \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=U
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=\u03A3\u03BA\u03AC\u03BB\u03B1
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=\u03a7\u03c1\u03ce\u03bc\u03b1:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=X
 ImportedFurnitureWizardStepsPanel.colorDialog.title=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03b5\u03c0\u03af\u03c0\u03bb\u03c9\u03bd
@@ -945,6 +995,28 @@
 LabelPanel.labelCreation.title=\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=\u038C\u03BD\u03BF\u03BC\u03B1:
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=\u0391\u03BD\u03CD\u03C8\u03C9\u03C3\u03B7 (%s):
+LevelPanel.elevationLabel.mnemonic=A
+LevelPanel.floorThicknessLabel.text=\u03A0\u03AC\u03C7\u03BF\u03C2 \u03B4\u03B1\u03C0\u03AD\u03B4\u03BF\u03C5 (%s):
+LevelPanel.floorThicknessLabel.mnemonic=D
+LevelPanel.heightLabel.text=\u038E\u03C8\u03BF\u03C2 (%s):
+LevelPanel.heightLabel.mnemonic=O
+LevelPanel.levelsSummaryLabel.text=\u03A3\u03CD\u03BD\u03BF\u03C8\u03B7 \u039F\u03C1\u03CC\u03C6\u03BF\u03C5 (\u03BF \u03C0\u03C1\u03BF\u03C2 \u03B5\u03C0\u03B5\u03BE\u03B1\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03BF\u03C2):
+LevelPanel.nameColumn=\u038C\u03BD\u03BF\u03BC\u03B1
+LevelPanel.elevationColumn=\u0391\u03BD\u03CD\u03C8\u03C9\u03C3\u03B7
+LevelPanel.floorThicknessColumn=\u03A0\u03AC\u03C7\u03BF\u03C2 \u03B4\u03B1\u03C0\u03AD\u03B4\u03BF\u03C5
+LevelPanel.heightColumn=Height
+
+LevelPanel.level.title=\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=\u039c\u03bf\u03c1\u03c6\u03ae \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2
 PageSetupPanel.pageFormatButton.mnemonic=M
@@ -1153,10 +1225,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=P
 UserPreferencesPanel.newWallHeightLabel.text=\u038e\u03c8\u03bf\u03c2 \u03bd\u03ad\u03c9\u03bd \u03c4\u03bf\u03af\u03c7\u03c9\u03bd:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=Y
+UserPreferencesPanel.newFloorThicknessLabel.text=\u03A0\u03AC\u03C7\u03BF\u03C2 \u03BD\u03AD\u03BF\u03C5 \u03B4\u03B1\u03C0\u03AD\u03B4\u03BF\u03C5:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=D
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03b4\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd \u03ba\u03ac\u03b8\u03b5:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=U
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=\u03bb\u03b5\u03c0\u03c4\u03ac
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=\u0395\u03B9\u03C3\u03B1\u03B3\u03C9\u03B3\u03AE \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF\u03C5 \u03B2\u03B9\u03B2\u03BB\u03B9\u03BF\u03B8\u03AE\u03BA\u03B7\u03C2 \u03B3\u03BB\u03CE\u03C3\u03C3\u03B1\u03C2
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7\u03c2 \u03c3\u03c5\u03bc\u03b2\u03bf\u03c5\u03bb\u03ce\u03bd
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=R
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_es.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_es.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_es.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_es.properties	2011-12-21 00:48:52.000000000 +0000
@@ -146,6 +146,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=V
 Home3DAttributesPanel.observerHeightLabel.text=Altura Visitante (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=L
+Home3DAttributesPanel.observerCameraElevationLabel.text=Elevaci�n de la mirada (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=E
 Home3DAttributesPanel.groundColorRadioButton.text=Color del Suelo:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=S
 Home3DAttributesPanel.groundColorDialog.title=Color Del Suelo
@@ -410,6 +412,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Ordenar Mobiliario por �ngulo
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=G
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=Nivel
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=Ordenar Mobiliario por Nivel
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=L
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=Color
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Ordenar Mobiliario por Color
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=C
@@ -489,6 +495,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Mostrar Columna �ngulo
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=G
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=Nivel
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Motrar Columna Nivel
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=L
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=Color
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Mostrar Columna Color
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=C
@@ -582,11 +592,11 @@
 HomePane.SPLIT_WALL.MnemonicKey=A
 
 HomePane.MODIFY_ROOM.Name=Modificar Habitaciones...
-HomePane.MODIFY_ROOM.ShortDescription=Modificar habitaciones seleccionadas
+HomePane.MODIFY_ROOM.ShortDescription=Modificar Habitaciones Seleccionadas
 HomePane.MODIFY_ROOM.MnemonicKey=N
 
 HomePane.MODIFY_LABEL.Name=Modificar Texto...
-HomePane.MODIFY_LABEL.ShortDescription=Modificar texto seleccionado
+HomePane.MODIFY_LABEL.ShortDescription=Modificar Texto Seleccionado
 HomePane.MODIFY_LABEL.MnemonicKey=X
 
 # Text style sub menu
@@ -629,6 +639,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=Borra la Imagen mostrada en el Fondo del Plano
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=B
 
+HomePane.ADD_LEVEL.Name=A�adir Nivel
+HomePane.ADD_LEVEL.ShortDescription=A�adir Nuevo Nivel a la Casa
+HomePane.ADD_LEVEL.MnemonicKey=N
+
+HomePane.MODIFY_LEVEL.Name=Modificar Nivel...
+HomePane.MODIFY_LEVEL.ShortDescription=Modificar Nivel Seleccionado
+HomePane.MODIFY_LEVEL.MnemonicKey=F
+
+HomePane.DELETE_LEVEL.Name=Eliminar Nivel
+HomePane.DELETE_LEVEL.ShortDescription=Elimina Nivel Seleccionado de la Casa
+HomePane.DELETE_LEVEL.MnemonicKey=E
+
 HomePane.ZOOM_OUT.Name=Alejar
 HomePane.ZOOM_OUT.ShortDescription=Alejar
 HomePane.ZOOM_OUT.MnemonicKey=A
@@ -646,40 +668,48 @@
 HomePane.VIEW_3D_MENU.MnemonicKey=V
 
 HomePane.VIEW_FROM_TOP.Name=Vista Aerea
-HomePane.VIEW_FROM_TOP.ShortDescription=Ver desde el punto de vista superior
+HomePane.VIEW_FROM_TOP.ShortDescription=Ver Desde el Punto de Vista Superior
 HomePane.VIEW_FROM_TOP.MnemonicKey=A
 
 HomePane.VIEW_FROM_OBSERVER.Name=Visita Virtual
-HomePane.VIEW_FROM_OBSERVER.ShortDescription=Ver desde el punto de vista de un observador
+HomePane.VIEW_FROM_OBSERVER.ShortDescription=Ver Desde el Punto de Vista de un Observador
 HomePane.VIEW_FROM_OBSERVER.MnemonicKey=V
 
-HomePane.STORE_POINT_OF_VIEW.Name=Almacenar punto de vista...
-HomePane.STORE_POINT_OF_VIEW.ShortDescription=Almacenar el punto vista actual
+HomePane.STORE_POINT_OF_VIEW.Name=Almacenar Punto de Vista...
+HomePane.STORE_POINT_OF_VIEW.ShortDescription=Almacenar el Punto Vista Actual
 HomePane.STORE_POINT_OF_VIEW.MnemonicKey=C
 
 # Go to point of view sub menu is filled dynamically
-HomePane.GO_TO_POINT_OF_VIEW.Name=Ir a punto de vista
+HomePane.GO_TO_POINT_OF_VIEW.Name=Ir a Punto de Vista
 HomePane.GO_TO_POINT_OF_VIEW.MnemonicKey=I
-HomePane.NoStoredPointOfView=Punto de vista no almacenado
+HomePane.NoStoredPointOfView=Punto de Vista no Almacenado
+
+HomePane.DISPLAY_ALL_LEVELS.Name=Mostrar Todos los Niveles
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Mostrar Todos los Niveles en la Vista 3D
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=T
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Mostrar Nivel Seleccionado
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Mostrar Nivel Seleccionado en la Vista 3D
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=N
 
 HomePane.DETACH_3D_VIEW.Name=Muestra en Ventana Separada
-HomePane.DETACH_3D_VIEW.ShortDescription=Muestra vista 3D en ventana separada
+HomePane.DETACH_3D_VIEW.ShortDescription=Muestra vista 3D en Ventana Separada
 HomePane.DETACH_3D_VIEW.MnemonicKey=U
 
 HomePane.ATTACH_3D_VIEW.Name=Muestra en Ventana Principal
-HomePane.ATTACH_3D_VIEW.ShortDescription=Muestra vista 3D en ventana principal
+HomePane.ATTACH_3D_VIEW.ShortDescription=Muestra vista 3D en Ventana Principal
 HomePane.ATTACH_3D_VIEW.MnemonicKey=U
 
 HomePane.MODIFY_3D_ATTRIBUTES.Name=Modificar...
-HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Modificar vista 3D
+HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Modificar Vista 3D
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=M
 
 HomePane.CREATE_PHOTO.Name=Crear Foto...
-HomePane.CREATE_PHOTO.ShortDescription=Crear foto desde vista 3D
+HomePane.CREATE_PHOTO.ShortDescription=Crear Foto desde Vista 3D
 HomePane.CREATE_PHOTO.MnemonicKey=F
 
-HomePane.CREATE_VIDEO.Name=Crear v�deo...
-HomePane.CREATE_VIDEO.ShortDescription=Crear un v�deo 3D
+HomePane.CREATE_VIDEO.Name=Crear V�deo...
+HomePane.CREATE_VIDEO.ShortDescription=Crear un V�deo 3D
 HomePane.CREATE_VIDEO.MnemonicKey=O
 
 HomePane.EXPORT_TO_OBJ.Name=Exportar a Formato OBJ...
@@ -698,9 +728,22 @@
 HomePane.ABOUT.ShortDescription=Muestra Informaci�n Acerca de Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=A
 
+HomePane.SELECT_OBJECT_MENU.Name=Seleccionar objeto
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=Br�jula
+HomePane.selectObject.furniture=Mueble
+HomePane.selectObject.wall=Pared %s
+HomePane.selectObject.floor=Suelo %s
+HomePane.selectObject.ceiling=Techo %s
+HomePane.selectObject.room=Habitaci�n %s
+HomePane.selectObject.dimensionLine=Dimensi�n %s
+HomePane.selectObject.label=Texto
+
 HomePane.openHomeDialog.title=Abrir
 HomePane.importFurnitureLibraryDialog.title=Importar biblioteca de mobiliario
 HomePane.importTexturesLibraryDialog.title=Importar biblioteca de texturas
+HomePane.importLanguageLibraryDialog.title=Importar biblioteca de idiomas
 HomePane.saveHomeDialog.title=Guardar
 HomePane.printToPDFDialog.title=Exportar a PDF
 HomePane.exportToSVGDialog.title=Export a SVG
@@ -838,18 +881,22 @@
 
 ImportedFurnitureWizardStepsPanel.modelChoiceDialog.title=Elegir Modelo
 ImportedFurnitureWizardStepsPanel.modelChoiceError=No se pudo leer el documento\n"%s"
-ImportedFurnitureWizardStepsPanel.modelChoiceFormatError=<html>El formato del modelo elegido no es v�lido.<br>\
-    Elige otro modelo.
+ImportedFurnitureWizardStepsPanel.modelChoiceFormatError=<html>El formato del modelo elegido no es v�lido.\
+    <br>Elige otro modelo.
 
-ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Comprueba que el modelo est� orientado correctamente. Si no es as�,<br>\
-    dale la vuelta con las flechas hasta que la vista frontal coincida con la<br>\
-    parte frontal de la pieza.
+ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Comprueba que el modelo est� orientado correctamente. Si no es as�,\
+    <br>dale la vuelta con las flechas hasta que la vista frontal coincida con la\
+    <br>parte frontal de la pieza. Pulsa la tecla<i>Mays</i>  mientras haces clic en la\
+    <br>flecha para rotar el modelo con mayor precisi�n.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=Vista Frontal
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Vista Derecha
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Vista Superior
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=Perspectiva
-ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Si el modelo renderizado parece incorrecto, marca la siguiente casilla<br>\
-    para invertir sus caras mostradas
+
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=Reiniciar a la orientacion por defecto
+
+ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Si el modelo renderizado parece incorrecto, marca la siguiente casilla\
+    <br>para invertir sus caras mostradas
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Invierte caras frontal y trasera
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.mnemonic=I
 
@@ -874,6 +921,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=M
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=Puerta o Ventana
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=P
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Escalera
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=Color :
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=C
 ImportedFurnitureWizardStepsPanel.colorDialog.title=Color Mobiliario
@@ -923,6 +972,28 @@
 LabelPanel.labelCreation.title=A�adir Texto
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=Nombre:
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=Elevaci�n (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=Espesor del suelo (%s):
+LevelPanel.floorThicknessLabel.mnemonic=S
+LevelPanel.heightLabel.text=Altura (%s):
+LevelPanel.heightLabel.mnemonic=A
+LevelPanel.levelsSummaryLabel.text=Resumen de niveles (seleccionado el editado):
+LevelPanel.nameColumn=Nombre
+LevelPanel.elevationColumn=Elevaci�n
+LevelPanel.floorThicknessColumn=Espesor del suelo
+LevelPanel.heightColumn=Altura
+
+LevelPanel.level.title=Modificar nivel
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=A�adir nivel
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=Formato P�gina
 PageSetupPanel.pageFormatButton.mnemonic=F
@@ -1131,10 +1202,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=D
 UserPreferencesPanel.newWallHeightLabel.text=Nueva altura de las paredes:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=A
+UserPreferencesPanel.newFloorThicknessLabel.text=Nuevo espesor de los suelos:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=U
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Guardar trabajo automaticamente cada:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=G
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=minutos
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=Importar biblioteca de idiomas
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=Mostrar todos los consejos
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=M
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_fr.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_fr.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_fr.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_fr.properties	2011-12-21 00:48:52.000000000 +0000
@@ -33,8 +33,9 @@
     Choisissez une autre image.
 	
 BackgroundImageWizardStepsPanel.scaleLabel.text=<html>D�finissez l'�chelle de l'image, en d�pla�ant les extr�mit�s de la ligne<br>\
-    dessin�e dans l'image ci-dessous et en saisissant sa longueur. Vous pouvez<br>\
-    agrandir la taille de cet assistant pour visualiser l'image en plus grand.
+    dessin�e dans l'image ci-dessous et en saisissant sa longueur dans la\
+    <br>vraie vie, � l'unit� en cours. Vous pouvez agrandir la taille de cet assistant\
+    <br>pour visualiser l'image en plus grand.
 BackgroundImageWizardStepsPanel.scaleDistanceLabel.text=Longueur de la ligne dessin�e (%s) :
 BackgroundImageWizardStepsPanel.scaleDistanceLabel.mnemonic=L
 
@@ -109,6 +110,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=El�vation
 FurnitureTable.angleColumn=Angle
+FurnitureTable.levelColumn=Niveau
 FurnitureTable.colorColumn=Couleur
 FurnitureTable.textureColumn=Texture
 FurnitureTable.movableColumn=D�m�nageable
@@ -144,6 +146,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=V
 Home3DAttributesPanel.observerHeightLabel.text=Hauteur du visiteur (%s) :
 Home3DAttributesPanel.observerHeightLabel.mnemonic=H
+Home3DAttributesPanel.observerCameraElevationLabel.text=Hauteur des yeux (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=H
 Home3DAttributesPanel.groundColorRadioButton.text=Couleur du sol :
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=S
 Home3DAttributesPanel.groundColorDialog.title=Couleur du sol
@@ -407,6 +411,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Trier les meubles par angle
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=G
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=Niveau
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=Trier les meubles par niveau
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=V
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=Couleur
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Trier les meubles par couleur
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=C
@@ -486,6 +494,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Afficher colonne Angle
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=G
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=Niveau
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Afficher colonne Niveau
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=V
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=Couleur
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Afficher colonne Couleur
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=C
@@ -627,6 +639,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=Supprimer l'image affich�e sous le plan
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=S
 
+HomePane.ADD_LEVEL.Name=Ajouter un niveau
+HomePane.ADD_LEVEL.ShortDescription=Ajouter un nouveau niveau dans le logement
+HomePane.ADD_LEVEL.MnemonicKey=V
+
+HomePane.MODIFY_LEVEL.Name=Modifier le niveau...
+HomePane.MODIFY_LEVEL.ShortDescription=Modifier le niveau s�lectionn�
+HomePane.MODIFY_LEVEL.MnemonicKey=F
+
+HomePane.DELETE_LEVEL.Name=Supprimer le niveau
+HomePane.DELETE_LEVEL.ShortDescription=Supprimer le niveau s�lectionn�
+HomePane.DELETE_LEVEL.MnemonicKey=S
+
 HomePane.ZOOM_OUT.Name=Zoom arri�re
 HomePane.ZOOM_OUT.ShortDescription=Zoom arri�re
 HomePane.ZOOM_OUT.MnemonicKey=A
@@ -658,6 +682,14 @@
 HomePane.GO_TO_POINT_OF_VIEW.Name=Aller au point de vue
 HomePane.GO_TO_POINT_OF_VIEW.MnemonicKey=A
 
+HomePane.DISPLAY_ALL_LEVELS.Name=Afficher tous les niveaux
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Afficher tous les niveaux dans la vue 3D
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=L
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Afficher le niveau s�lectionn�
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Afficher le niveau s�lectionn� dans la vue 3D
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=C
+
 HomePane.DETACH_3D_VIEW.Name=Afficher dans une fen�tre s�par�e
 HomePane.DETACH_3D_VIEW.ShortDescription=Afficher la vue 3D dans une fen�tre s�par�e
 HomePane.DETACH_3D_VIEW.MnemonicKey=F
@@ -694,7 +726,22 @@
 HomePane.ABOUT.ShortDescription=Afficher les informations sur Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=A
 
+
+HomePane.SELECT_OBJECT_MENU.Name=Selectionner l'objet
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=Boussole
+HomePane.selectObject.furniture=Meuble
+HomePane.selectObject.wall=Mur %s
+HomePane.selectObject.floor=Plancher %s
+HomePane.selectObject.ceiling=Plafond %s
+HomePane.selectObject.room=Pi�ce %s
+HomePane.selectObject.dimensionLine=Cote %s 
+HomePane.selectObject.label=Texte
+
+
 HomePane.openHomeDialog.title=Ouvrir
+HomePane.importLanguageLibraryDialog.title=Importer biblioth�que de langue
 HomePane.importFurnitureLibraryDialog.title=Importer biblioth�que de meubles
 HomePane.importTexturesLibraryDialog.title=Importer biblioth�que de textures
 HomePane.saveHomeDialog.title=Enregistrer
@@ -845,18 +892,21 @@
 ImportedFurnitureWizardStepsPanel.modelChoiceFormatError=<html>Le format du mod�le choisi n'est pas support�.<br>\
     Choisissez un autre mod�le.
 
-ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>V�rifiez si le mod�le est correctement orient�. S'il ne l'est pas, faites<br>\
-    le pivoter avec les fl�ches ci-dessous pour que la vue de face<br>\
-    corresponde � la face avant du meuble.
+ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>V�rifiez si le mod�le est correctement orient�. S'il ne l'est pas, faites le\
+    <br>pivoter avec les fl�ches ci-dessous pour que la vue de face corresponde � \
+    <br>la face avant du meuble. Maintenez la touche <i>majuscule</i> enfonc�e pendant\
+    <br>le clic sur une fl�che pour pivoter le mod�le � un pas plus petit.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=Vue de face
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Vue de droite
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Vue du haut
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=Perspective
-ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Si le rendu du mod�le semble incorrect, cochez la bo�te � cocher<br>\
+ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Si le rendu du mod�le semble incorrect, s�lectionnez la bo�te � cocher<br>\
    suivante pour inverser ses faces affich�es.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Inverser faces avant et arri�re
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.mnemonic=I
 
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=R�tablir l'orientation par d�faut
+
 ImportedFurnitureWizardStepsPanel.attributesLabel.text=<html>Si les informations suivantes sont incorrectes, mettez les � jour.
 ImportedFurnitureWizardStepsPanel.nameLabel.text=Nom :
 ImportedFurnitureWizardStepsPanel.nameLabel.mnemonic=N
@@ -878,6 +928,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=D
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=Porte ou fen�tre
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=O
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Escalier
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=Couleur :
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=U
 ImportedFurnitureWizardStepsPanel.colorDialog.title=Couleur du meuble
@@ -928,6 +980,28 @@
 LabelPanel.labelCreation.title=Ajouter texte
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=Nom :
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=El�vation (%s) :
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=Epaisseur du plancher (%s):
+LevelPanel.floorThicknessLabel.mnemonic=T
+LevelPanel.heightLabel.text=Hauteur (%s):
+LevelPanel.heightLabel.mnemonic=H
+LevelPanel.levelsSummaryLabel.text=R�sum� des niveaux (le niveau �dit� est s�lectionn�):
+LevelPanel.nameColumn=Nom
+LevelPanel.elevationColumn=El�vation
+LevelPanel.floorThicknessColumn=Epaisseur du plancher
+LevelPanel.heightColumn=Hauteur
+
+LevelPanel.level.title=Modifier niveau
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=Ajouter un niveau
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=Format d'impression
 PageSetupPanel.pageFormatButton.mnemonic=I
@@ -975,7 +1049,7 @@
 PhotoPanel.quality0DescriptionLabel.text=M�me rendu que dans la vue 3D
 PhotoPanel.quality1DescriptionLabel.text=M�me rendu que dans la vue 3D avec\
     <br>des ombres sous les meubles plac�s au\
-    <br>niveau du sol
+    <br>niveau du plancher
 PhotoPanel.quality2DescriptionLabel.text=Illumination globale rapide avec calcul des\
     <br>ombres � partir des lumi�res plac�es dans le plan\
     <br>et optionnellement au milieu de chaque plafond
@@ -1033,9 +1107,9 @@
 # Resources for RoomPanel class
 RoomPanel.nameLabel.text=Nom :
 RoomPanel.nameLabel.mnemonic=N
-RoomPanel.floorVisibleCheckBox.text=Afficher le sol
+RoomPanel.floorVisibleCheckBox.text=Afficher le plancher
 RoomPanel.floorVisibleCheckBox.mnemonic=S
-RoomPanel.floorPanel.title=Sol
+RoomPanel.floorPanel.title=Plancher
 RoomPanel.floorColorRadioButton.text=Couleur :
 RoomPanel.floorColorRadioButton.mnemonic=C
 RoomPanel.floorTextureRadioButton.text=Texture :
@@ -1061,7 +1135,7 @@
 RoomPanel.room.title=Modifier pi�ces
 
 RoomPanel.nameAndAreaPanel.title=Nom et superficie
-RoomPanel.floorColorDialog.title=Couleur du sol
+RoomPanel.floorColorDialog.title=Couleur du plancher
 RoomPanel.ceilingColorDialog.title=Couleur du plafond
 
 
@@ -1126,7 +1200,7 @@
 UserPreferencesPanel.roomRenderingLabel.text=Rendu des pi�ces dans le plan :
 UserPreferencesPanel.monochromeRadioButton.text=Monochrome
 UserPreferencesPanel.monochromeRadioButton.mnemonic=N
-UserPreferencesPanel.floorColorOrTextureRadioButton.text=Couleur ou texture du sol
+UserPreferencesPanel.floorColorOrTextureRadioButton.text=Couleur ou texture du plancher
 UserPreferencesPanel.floorColorOrTextureRadioButton.mnemonic=X
 UserPreferencesPanel.wallPatternLabel.text=Motif des murs dans le plan :
 UserPreferencesPanel.wallPatternLabel.mnemonic=O
@@ -1134,6 +1208,8 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=E
 UserPreferencesPanel.newWallHeightLabel.text=Hauteur des nouveaux murs :
 UserPreferencesPanel.newWallHeightLabel.mnemonic=H
+UserPreferencesPanel.newFloorThicknessLabel.text=Epaisseur des nouveaux planchers:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=I
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Enregistrer les donn�es de r�cup�ration toutes les :
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=G
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=minutes
@@ -1156,7 +1232,7 @@
 VideoPanel.quality0DescriptionLabel.text=M�me rendu que dans la vue 3D
 VideoPanel.quality1DescriptionLabel.text=M�me rendu que dans la vue 3D avec\
     <br>des ombres sous les meubles plac�s au\
-    <br>niveau du sol
+    <br>niveau du plancher
 VideoPanel.quality2DescriptionLabel.text=Illumination globale rapide avec calcul des\
     <br>ombres � partir des lumi�res plac�es dans le plan\
     <br>et optionnellement au milieu de chaque plafond\
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_hu.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_hu.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_hu.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_hu.properties	2011-12-21 00:48:52.000000000 +0000
@@ -1,6 +1,6 @@
 # package_hu.properties 11 Dec 2008
 #
-# Translated to Hungarian by Viktor Miklosi
+# Translated to Hungarian by Viktor Miklosi and Emmanuel Puybaret
 #
 # Sweet Home 3D, Copyright (c) 2007-2008 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
@@ -109,6 +109,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=Emel\u00e9s
 FurnitureTable.angleColumn=Sz\u00f6g
+FurnitureTable.levelColumn=Szint
 FurnitureTable.colorColumn=Sz\u00edn
 FurnitureTable.textureColumn=Text\u00fara
 FurnitureTable.movableColumn=Mozgathat\u00f3
@@ -144,6 +145,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=L
 Home3DAttributesPanel.observerHeightLabel.text=L\u00e1togat\u00f3 magass\u00e1ga (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=M
+Home3DAttributesPanel.observerCameraElevationLabel.text=Szemmagass\u00e1g (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=M
 Home3DAttributesPanel.groundColorRadioButton.text=Talaj sz\u00edne:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=T
 Home3DAttributesPanel.groundColorDialog.title=Talaj sz\u00edne
@@ -408,6 +411,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=B\u00fatorok rendez\u00e9se sz\u00f6g szerint
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=Z
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=Szint
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=B\u00fatorok rendez\u00e9se szint szerint
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=T
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=Sz\u00edn
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=B\u00fatorok rendez\u00e9se sz\u00edn szerint
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=N
@@ -487,6 +494,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Elforgat\u00e1si Sz\u00f6g oszlop megjelen\u00edt\u00e9se
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=Z
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=Szint
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Szint oszlop megjelen\u00edt\u00e9se
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=T
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=Sz\u00edn
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Sz\u00edn oszlop megjelen\u00edt\u00e9se
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=N
@@ -628,6 +639,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=Az alaprajz alatt megjelen\u00edtett h\u00e1tt\u00e9rk\u00e9p t\u00f6rl\u00e9se
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=T
 
+HomePane.ADD_LEVEL.Name=Szint hozz\u00e1ad\u00e1sa
+HomePane.ADD_LEVEL.ShortDescription=Szint hozz\u00e1ad\u00e1sa
+HomePane.ADD_LEVEL.MnemonicKey=T
+
+HomePane.MODIFY_LEVEL.Name=Szint m\u00f3dos\u00edt\u00e1sa...
+HomePane.MODIFY_LEVEL.ShortDescription=Szint m\u00f3dos\u00edt\u00e1sa
+HomePane.MODIFY_LEVEL.MnemonicKey=I
+
+HomePane.DELETE_LEVEL.Name=Szint t\u00f6rl\u00e9se
+HomePane.DELETE_LEVEL.ShortDescription=Szint t\u00f6rl\u00e9se
+HomePane.DELETE_LEVEL.MnemonicKey=Z
+
 HomePane.ZOOM_OUT.Name=Kicsiny\u00edt\u00e9s
 HomePane.ZOOM_OUT.ShortDescription=Kicsiny\u00edt\u00e9s
 HomePane.ZOOM_OUT.MnemonicKey=I
@@ -661,7 +684,7 @@
 HomePane.GO_TO_POINT_OF_VIEW.MnemonicKey=T
 HomePane.NoStoredPointOfView=Nincs elt\u00e1rolt megfigyel\u0151pont
 
-HomePane.DETACH_3D_VIEW.Name=Megjenen\u00edt\u00e9s k\u00fcl\u00f6n ablakban
+HomePane.DETACH_3D_VIEW.Name=Megjelen\u00edt\u00e9s k\u00fcl\u00f6n ablakban
 HomePane.DETACH_3D_VIEW.ShortDescription=3D n\u00e9zet megjelen\u00edt\u00e9se k\u00fcl\u00f6n ablakban
 HomePane.DETACH_3D_VIEW.MnemonicKey=M
 
@@ -669,6 +692,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=3D n\u00e9zet megjelen\u00edt\u00e9se a f\u0151ablakban
 HomePane.ATTACH_3D_VIEW.MnemonicKey=M
 
+HomePane.DISPLAY_ALL_LEVELS.Name=Minden szintek megjelen\u00edt\u00e9s
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Minden szintek megjelen\u00edt\u00e9s 
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=S
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Kijel\u00f6lt szintek megjelen\u00edt\u00e9s
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Kijel\u00f6lt szintek megjelen\u00edt\u00e9s
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=Z
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=M\u00f3dos\u00edt\u00e1s...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=3D n\u00e9zet m\u00f3dos\u00edt\u00e1sa
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=M
@@ -697,9 +728,22 @@
 HomePane.ABOUT.ShortDescription=Inform\u00e1ci\u00f3k megjelen\u00edt\u00e9se a Sweet Home 3D-r\u0151l
 HomePane.ABOUT.MnemonicKey=N
 
+HomePane.SELECT_OBJECT_MENU.Name=Objektum kijel\u00f6l\u00e9se
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=T\u00e1jol\u00f3
+HomePane.selectObject.furniture=B\u00fator
+HomePane.selectObject.wall=Fal %s
+HomePane.selectObject.floor=Padl\u00f3 %s
+HomePane.selectObject.ceiling=Mennyezet %s
+HomePane.selectObject.room=Szoba %s
+HomePane.selectObject.dimensionLine=M\u00e9retvonala
+HomePane.selectObject.label=Sz\u00f6veg
+
 HomePane.openHomeDialog.title=Megnyit\u00e1s
 HomePane.importFurnitureLibraryDialog.title=B\u00fatork\u00f6nyvt\u00e1r import\u00e1l\u00e1sa
-HomePane.importTexturesLibraryDialog.title=Text\u00farak\u00f6nyv\u00e1r import\u00e1l\u00e1sa
+HomePane.importTexturesLibraryDialog.title=Text\u00farak\u00f6nyvt\u00e1r import\u00e1l\u00e1sa
+HomePane.importLanguageLibraryDialog.title=Nyelvk\u00f6nyvt\u00e1r import\u00e1l\u00e1sa
 HomePane.saveHomeDialog.title=Ment\u00e9s
 HomePane.printToPDFDialog.title=Export\u00e1l\u00e1s PDF-be
 HomePane.exportToSVGDialog.title=Export\u00e1l\u00e1s SVG form\u00e1tumba
@@ -851,6 +895,8 @@
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Jobb oldal
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Fel\u00fcln\u00e9zet
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=Perspekt\u00edva
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=
+
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Ha a modell lek\u00e9pez\u00e9se helytelennek t\u0171nik, jel\u00f6lje be az al\u00e1bbi<br>\
     n\u00e9gyzetet, hogy felcser\u00e9lje a megjelen\u00edtett oldalakat.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=El\u0151-\u00e9s h\u00e1toldal invert\u00e1l\u00e1sa
@@ -878,6 +924,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=O
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=Ajt\u00f3 vagy ablak
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=J
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Csigal\u00e9pcs\u0151
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=Sz\u00edn:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=Z
 ImportedFurnitureWizardStepsPanel.colorDialog.title=B\u00fator sz\u00edne
@@ -929,6 +977,27 @@
 LabelPanel.labelCreation.title=Sz\u00f6veg l\u00e9trehoz\u00e1sa
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=N\u00e9v:
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=Emel\u00e9s (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=Padl\u00f3 vastags\u00e1ga:
+LevelPanel.floorThicknessLabel.mnemonic=P
+LevelPanel.heightLabel.text=Magass\u00e1g (%s):
+LevelPanel.heightLabel.mnemonic=M
+LevelPanel.levelsSummaryLabel.text=Szintlista
+LevelPanel.nameColumn=N\u00e9v
+LevelPanel.elevationColumn=Emel\u00e9s
+LevelPanel.floorThicknessColumn=Padl\u00f3 vastags\u00e1ga
+LevelPanel.heightColumn=Magass\u00e1g
+
+LevelPanel.level.title=Szint m\u00f3dos\u00edt\u00e1sa
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=Szint
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=Oldal form\u00e1tum
 PageSetupPanel.pageFormatButton.mnemonic=O
@@ -1079,6 +1148,29 @@
 RoomPanel.ceilingColorDialog.title=Mennyezetsz\u00edn
 
 
+# Resources for TextureChoiceComponent class
+TextureChoiceComponent.availableTexturesLabel.text=V\u00e1laszthat\u00f3 text\u00far\u00e1k:
+TextureChoiceComponent.availableTexturesLabel.mnemonic=V
+TextureChoiceComponent.chosenTextureLabel.text=Kiv\u00e1lasztott text\u00fara:
+TextureChoiceComponent.importTextureButton.text=Import\u00e1l\u00e1s
+TextureChoiceComponent.importTextureButton.mnemonic=I
+TextureChoiceComponent.modifyTextureButton.text=M\u00f3dos\u00edt\u00e1s
+TextureChoiceComponent.modifyTextureButton.mnemonic=M
+TextureChoiceComponent.deleteTextureButton.text=T\u00f6rl\u00e9s
+TextureChoiceComponent.deleteTextureButton.mnemonic=T
+
+TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.message=<html><b>Val\u00f3ban t\u00f6r\u00f6lni k\u00edv\u00e1nja a kijel\u00f6l<br>\
+   import\u00e1lt text\u00far\u00e1t?</b>\
+   <br><font size="-2">A t\u00f6r\u00f6lt text\u00fara t\u00f6bb\u00e9 nem jelenik meg a list\u00e1ban.
+TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.title=Text\u00fara t\u00f6rl\u00e9se
+TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.delete=T\u00f6rl\u00e9s
+TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.cancel=M\u00e9gsem
+
+# Resources for ThreadedTaskPanel class
+ThreadedTaskPanel.threadedTask.title=Fut\u00f3 feladat
+ThreadedTaskPanel.cancelButton.text=M\u00e9gsem
+
+
 # Resources for UserPreferencesPanel class
 UserPreferencesPanel.languageLabel.text=Nyelv:
 UserPreferencesPanel.languageLabel.mnemonic=N
@@ -1124,39 +1216,19 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=F
 UserPreferencesPanel.newWallHeightLabel.text=Alap\u00e9rtelmezett falmagass\u00e1g:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=A
+UserPreferencesPanel.newFloorThicknessLabel.text=\u00daj padl\u00f3k vastags\u00e1ga:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=P
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Automatikus ment\u00e9s minden:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=U
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=percben
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=Nyelvk\u00f6nyvt\u00e1r import\u00e1l\u00e1sa
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=Tippek mutat\u00e1s\u00e1nak alap\u00e9rtelmez\u00e9s szerint
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=M
 
 UserPreferencesPanel.preferences.title=Be\u00e1ll\u00edt\u00e1sok
 
 
-# Resources for TextureChoiceComponent class
-TextureChoiceComponent.availableTexturesLabel.text=V\u00e1laszthat\u00f3 text\u00far\u00e1k:
-TextureChoiceComponent.availableTexturesLabel.mnemonic=V
-TextureChoiceComponent.chosenTextureLabel.text=Kiv\u00e1lasztott text\u00fara:
-TextureChoiceComponent.importTextureButton.text=Import\u00e1l\u00e1s
-TextureChoiceComponent.importTextureButton.mnemonic=I
-TextureChoiceComponent.modifyTextureButton.text=M\u00f3dos\u00edt\u00e1s
-TextureChoiceComponent.modifyTextureButton.mnemonic=M
-TextureChoiceComponent.deleteTextureButton.text=T\u00f6rl\u00e9s
-TextureChoiceComponent.deleteTextureButton.mnemonic=T
-
-TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.message=<html><b>Val\u00f3ban t\u00f6r\u00f6lni k\u00edv\u00e1nja a kijel\u00f6l<br>\
-   import\u00e1lt text\u00far\u00e1t?</b>\
-   <br><font size="-2">A t\u00f6r\u00f6lt text\u00fara t\u00f6bb\u00e9 nem jelenik meg a list\u00e1ban.
-TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.title=Text\u00fara t\u00f6rl\u00e9se
-TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.delete=T\u00f6rl\u00e9s
-TextureChoiceComponent.confirmDeleteSelectedCatalogTexture.cancel=M\u00e9gsem
-
-# Resources for ThreadedTaskPanel class
-ThreadedTaskPanel.threadedTask.title=Fut\u00f3 feladat
-ThreadedTaskPanel.cancelButton.text=M\u00e9gsem
-
-
 # Resources for VideoPanel class
 VideoPanel.videoFormatLabel.text=Vide\u00f3 form\u00e1tum:
 VideoPanel.videoFormatLabel.mnemonic=F
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_it.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_it.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_it.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_it.properties	2011-12-21 00:48:52.000000000 +0000
@@ -142,6 +142,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=V
 Home3DAttributesPanel.observerHeightLabel.text=Altezza visitatore (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=A
+Home3DAttributesPanel.observerCameraElevationLabel.text=Altezza occhi (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=A
 Home3DAttributesPanel.groundColorRadioButton.text=Colore suolo:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=S
 Home3DAttributesPanel.groundColorDialog.title=Colore suolo
@@ -405,6 +407,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Ordina arredamento per angolo
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=G
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=Livello
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=Ordina arredamento per livello
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=V
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=Colore
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Ordina arredamento per colore
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=C
@@ -423,7 +429,7 @@
 
 HomePane.SORT_HOME_FURNITURE_BY_VISIBILITY.Name=Visibilit�
 HomePane.SORT_HOME_FURNITURE_BY_VISIBILITY.ShortDescription=Ordina arredamento per visibilit� nel piano
-HomePane.SORT_HOME_FURNITURE_BY_VISIBILITY.MnemonicKey=V
+HomePane.SORT_HOME_FURNITURE_BY_VISIBILITY.MnemonicKey=B
 
 HomePane.SORT_HOME_FURNITURE_BY_DESCENDING_ORDER.Name=Ordine discendente
 HomePane.SORT_HOME_FURNITURE_BY_DESCENDING_ORDER.ShortDescription=Ordina arredamento in ordine discendente
@@ -484,6 +490,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Visualizza colonna Angolo
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=G
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=Livello
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Visualizza colonna livello
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=V
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=Colore
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Visualizza colonna colore
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=C
@@ -502,7 +512,7 @@
 
 HomePane.DISPLAY_HOME_FURNITURE_VISIBLE.Name=Visibile
 HomePane.DISPLAY_HOME_FURNITURE_VISIBLE.ShortDescription=Visualizza colonna visibile
-HomePane.DISPLAY_HOME_FURNITURE_VISIBLE.MnemonicKey=V
+HomePane.DISPLAY_HOME_FURNITURE_VISIBLE.MnemonicKey=B
 
 HomePane.DISPLAY_HOME_FURNITURE_PRICE.Name=Prezzo
 HomePane.DISPLAY_HOME_FURNITURE_PRICE.ShortDescription=Mostra colonna prezzo
@@ -625,6 +635,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=Cancella l'immagine visualizzata nello sfondo del piano
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=G
 
+HomePane.ADD_LEVEL.Name=Aggiungi livello
+HomePane.ADD_LEVEL.ShortDescription=Aggiungi un livello nella casa
+HomePane.ADD_LEVEL.MnemonicKey=L
+
+HomePane.MODIFY_LEVEL.Name=Modifica livello...
+HomePane.MODIFY_LEVEL.ShortDescription=Modifica il livello selezionato
+HomePane.MODIFY_LEVEL.MnemonicKey=F
+
+HomePane.DELETE_LEVEL.Name=Cancella livello
+HomePane.DELETE_LEVEL.ShortDescription=Cancella il livello selezionato dalla casa
+HomePane.DELETE_LEVEL.MnemonicKey=V
+
 HomePane.ZOOM_IN.Name=Zoom in
 HomePane.ZOOM_IN.ShortDescription=Zoom in
 HomePane.ZOOM_IN.MnemonicKey=Z
@@ -665,8 +687,16 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=Visualizza la vista 3D finestra principale
 HomePane.ATTACH_3D_VIEW.MnemonicKey=S
 
+HomePane.DISPLAY_ALL_LEVELS.Name=Visualizza tutti i livelli
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Visualizza tutti i livelli nella vista 3D
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=L
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Visualizza il livello selezionato
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Visualizza il livello selezionato nella vista 3D
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=Z
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=Modifica...
-HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Modifica vista 3d
+HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Modifica vista 3D
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=M
 
 HomePane.CREATE_PHOTO.Name=Crea foto...
@@ -693,9 +723,24 @@
 HomePane.ABOUT.ShortDescription=Visualizza informazioni su Home 3D
 HomePane.ABOUT.MnemonicKey=I
 
+# Contextual menu
+HomePane.SELECT_OBJECT_MENU.Name=Seleziona l'oggetto
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=Rosa dei venti
+HomePane.selectObject.furniture=Arredamento
+HomePane.selectObject.wall=Muro %s
+HomePane.selectObject.floor=Pavimento %s
+HomePane.selectObject.ceiling=Soffitto %s
+HomePane.selectObject.room=Stanza %s
+HomePane.selectObject.dimensionLine=Dimensione %s 
+HomePane.selectObject.label=Testo
+
+
 HomePane.openHomeDialog.title=Apri
 HomePane.importFurnitureLibraryDialog.title=Importa libreria arredamento
 HomePane.importTexturesLibraryDialog.title=Importa la libreria delle texture
+HomePane.importLanguageLibraryDialog.title=Importa libreria linguaggio
 HomePane.saveHomeDialog.title=Salva
 HomePane.printToPDFDialog.title=Stampa su PDF
 HomePane.exportToSVGDialog.title=Esporta in SVG
@@ -835,9 +880,10 @@
 ImportedFurnitureWizardStepsPanel.modelChoiceError=Non posso leggere il file\n"%s"
 ImportedFurnitureWizardStepsPanel.modelChoiceFormatError=<html>Il formato del modello scelto non � supportato.<br>\Per favore scegli un altro modello.
 
-ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Controlla che il modello sia correttamente orientato. Se non fosse<br>\
-    cos� ruotalo con le frecce finch� la vista frontale corrisponde<br>\
-    con la parte frontale del pezzo.
+ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Controlla che il modello sia correttamente orientato. Se non fosse\
+    <br>cos� ruotalo con le frecce finch� la vista frontale corrisponde\
+    <br>con la parte frontale del pezzo. Tieni premuto il tasto <i>shift</i> mentre\
+    <br>clicchi su di una freccia per ruotare il modello a piccoli passi.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=Vista frontale
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Vista laterale destra
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=vista dall'altro
@@ -847,6 +893,8 @@
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Inverti il retro con la faccia frontale
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.mnemonic=I
 
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=Reset all'orientamento di default
+
 ImportedFurnitureWizardStepsPanel.attributesLabel.text=Se la seguente informazione non � corretta, per favore aggiornala.
 ImportedFurnitureWizardStepsPanel.nameLabel.text=Nome:
 ImportedFurnitureWizardStepsPanel.nameLabel.mnemonic=N
@@ -868,6 +916,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=M
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=Porta o finestra
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=F
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Scala
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=Color:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=O
 ImportedFurnitureWizardStepsPanel.colorDialog.title=Colore arredamento
@@ -918,6 +968,28 @@
 LabelPanel.labelCreation.title=Aggiungi testo
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=Nome:
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=Elevazione (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=Spessore piano (%s):
+LevelPanel.floorThicknessLabel.mnemonic=S
+LevelPanel.heightLabel.text=Altezza (%s):
+LevelPanel.heightLabel.mnemonic=A
+LevelPanel.levelsSummaryLabel.text=Riapilogo livelli (Quello modificato � selezionato):
+LevelPanel.nameColumn=Nome
+LevelPanel.elevationColumn=Elevazione
+LevelPanel.floorThicknessColumn=Spessore piano
+LevelPanel.heightColumn=Altezza
+
+LevelPanel.level.title=Modifica livello
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=Aggiungi livello
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=Formato pagina
 PageSetupPanel.pageFormatButton.mnemonic=F
@@ -1127,10 +1199,13 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=S
 UserPreferencesPanel.newWallHeightLabel.text=Altezza nuovi muri:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=A
+UserPreferencesPanel.newFloorThicknessLabel.text=Nuovi spessori del piano:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=L
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Salva i dati della casa per il recupero ogni:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=G
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=minuti
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=Importa il file di libreria  linguaggio
 
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=Ripristina suggerimenti
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.ShortDescription=Ripristina la visualizzazione del suggerimenti
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_ja.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_ja.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_ja.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_ja.properties	2011-12-21 00:48:52.000000000 +0000
@@ -1,6 +1,6 @@
 # package_ja.properties 10 Sep 2009
 #
-# Translated to Japanese by Takahiro Sato and Ouiko
+# Translated to Japanese by Takahiro Sato, Ouiko, Vy and Miyoko
 #
 # Sweet Home 3D, Copyright (c) 2007-2009 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
@@ -147,6 +147,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=F
 Home3DAttributesPanel.observerHeightLabel.text=\u8a2a\u554f\u8005\u306e\u9ad8\u3055(H) (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=H
+Home3DAttributesPanel.observerCameraElevationLabel.text=\u76ee\u306e\u9ad8\u3055(H) (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=H
 Home3DAttributesPanel.groundColorRadioButton.text=\u5730\u9762\u306e\u8272(G):
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=G
 Home3DAttributesPanel.groundColorDialog.title=\u5730\u9762\u306e\u8272
@@ -413,6 +415,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=\u89d2\u5ea6\u5225\u306b\u5bb6\u5177\u3092\u5206\u985e
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=G
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=\u968E(L)
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=\u968E\u5225\u306b\u5bb6\u5177\u3092\u5206\u985e
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=L
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=\u8272(C)
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=\u8272\u5225\u306b\u5bb6\u5177\u3092\u5206\u985e
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=C
@@ -493,6 +499,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=\u89d2\u5ea6\u3092\u5206\u985e\u5217\u306b\u8868\u793a
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=G
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=\u968E(L)
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=\u968E\u3092\u5206\u985e\u5217\u306b\u8868\u793a
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=L
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=\u8272(C)
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=\u8272\u3092\u5206\u985e\u5217\u306b\u8868\u793a
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=C
@@ -634,6 +644,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=\u30d7\u30e9\u30f3\u306e\u80cc\u666f\u306b\u8868\u793a\u3057\u305f\u753b\u50cf\u3092\u524a\u9664
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=D
 
+HomePane.ADD_LEVEL.Name=\u968E\u6570\u3092\u8DB3\u3059(V)
+HomePane.ADD_LEVEL.ShortDescription=\u968E\u6570\u3092\u8DB3\u3059
+HomePane.ADD_LEVEL.MnemonicKey=V
+
+HomePane.MODIFY_LEVEL.Name=\u968E\u6570\u3092\u5909\u66F4\u3059\u308B(I)...
+HomePane.MODIFY_LEVEL.ShortDescription=\u968E\u6570\u3092\u5909\u66F4\u3059\u308B
+HomePane.MODIFY_LEVEL.MnemonicKey=I
+
+HomePane.DELETE_LEVEL.Name=\u968E\u6570\u3092\u524A\u9664\u3059\u308B(D) 
+HomePane.DELETE_LEVEL.ShortDescription=\u968E\u6570\u3092\u524A\u9664\u3059\u308B
+HomePane.DELETE_LEVEL.MnemonicKey=D
+
 HomePane.ZOOM_IN.Name=\u62e1\u5927(Z)
 HomePane.ZOOM_IN.ShortDescription=\u62e1\u5927
 HomePane.ZOOM_IN.MnemonicKey=Z
@@ -676,6 +698,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=\u30e1\u30a4\u30f3\u30a6\u30a3\u30f3\u30c9\u30a6\u30673D\u30d3\u30e5\u30fc\u8868\u793a
 HomePane.ATTACH_3D_VIEW.MnemonicKey=D
 
+HomePane.DISPLAY_ALL_LEVELS.Name=\u5168\u968E\u3092\u8868\u793A\u3059\u308B(L)
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=\u5168\u968E\u3092\u8868\u793A\u3059\u308B
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=L
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=\u9078\u629E\u3057\u305F\u968E\u3092\u8868\u793A\u3059\u308B(C)
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=\u9078\u629E\u3057\u305F\u968E\u3092\u8868\u793A\u3059\u308B
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=C
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=\u4fee\u6b63(M)...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=3D\u30d3\u30e5\u30fc\u3092\u4fee\u6b63
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=M
@@ -704,6 +734,18 @@
 HomePane.ABOUT.ShortDescription=Sweet Home 3D \u8a73\u7d30\u60c5\u5831\u3092\u8868\u793a
 HomePane.ABOUT.MnemonicKey=A
 
+HomePane.SELECT_OBJECT_MENU.Name=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u9078\u629E(O)
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=\u30b3\u30f3\u30d1\u30b9
+HomePane.selectObject.furniture=\u5bb6\u5177
+HomePane.selectObject.wall=\u58C1 %s
+HomePane.selectObject.floor=\u5e8a %s
+HomePane.selectObject.ceiling=\u5929\u4e95 %s
+HomePane.selectObject.room=\u90e8\u5c4b %s
+HomePane.selectObject.dimensionLine=\u5bf8\u6cd5 %s 
+HomePane.selectObject.label=\u6587\u5b57
+
 # Open / Save dialogs title
 HomePane.openHomeDialog.title=\u958b\u304f
 HomePane.importFurnitureLibraryDialog.title=\u5bb6\u5177\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u30a4\u30f3\u30dd\u30fc\u30c8
@@ -850,6 +892,8 @@
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=\u53f3\u5074\u9762
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=\u5e73\u9762
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=\u9060\u8fd1
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=
+
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>\u30e2\u30c7\u30eb\u306e\u8868\u73fe\u304c\u4e0d\u9069\u5207\u306b\u898b\u3048\u305f\u5834\u5408\u306f\u3001\
     <br>\u4ee5\u4e0b\u306e\u30c1\u30a7\u30c3\u30af\u30fb\u30dc\u30c3\u30af\u30b9\u3092\u78ba\u8a8d\u3057\u3066\u305d\u306e\u9762\u3092\u53cd\u8ee2\u8868\u793a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=\u80cc\u9762\u304a\u3088\u3073\u6b63\u9762\u3092\u53cd\u8ee2(I)
@@ -877,6 +921,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=M
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=\u30c9\u30a2\u307e\u305f\u306f\u7a93(R)
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=R
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=\u968e\u6bb5(S)
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=\u8272(O):
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=O
 ImportedFurnitureWizardStepsPanel.colorDialog.title=\u5bb6\u5177\u306e\u8272
@@ -927,6 +973,28 @@
 LabelPanel.labelCreation.title=\u6587\u5b57\u3092\u8ffd\u52a0
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=\u540d\u524d(N):
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=\u5730\u9762\u304b\u3089\u306e\u9ad8\u3055(E) (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=\u5E8A\u306E\u539A\u3055(T) (%s):
+LevelPanel.floorThicknessLabel.mnemonic=T
+LevelPanel.heightLabel.text=\u9ad8\u3055(H) (%s):
+LevelPanel.heightLabel.mnemonic=H
+LevelPanel.levelsSummaryLabel.text=\u968E\u306E\u30EA\u30B9\u30C8:
+LevelPanel.nameColumn=\u540d\u524d
+LevelPanel.elevationColumn=\u5730\u9762\u304b\u3089\u306e\u9ad8\u3055
+LevelPanel.floorThicknessColumn=\u5E8A\u306E\u539A\u3055
+LevelPanel.heightColumn=\u9ad8\u3055
+
+LevelPanel.level.title=\u968E\u6570\u3092\u5909\u66F4\u3059\u308B
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=\u968E\u6570\u3092\u8DB3\u3059
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=\u30da\u30fc\u30b8\u5f62\u5f0f(A)
 PageSetupPanel.pageFormatButton.mnemonic=A
@@ -1138,10 +1206,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=K
 UserPreferencesPanel.newWallHeightLabel.text=\u65b0\u3057\u3044\u58c1\u306e\u9ad8\u3055(H):
 UserPreferencesPanel.newWallHeightLabel.mnemonic=H
-UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=\u6b21\u306e\u9593\u9694\u3067\u81ea\u52d5\u56de\u5fa9\u7528\u30c7\u30fc\u30bf\u3092\u4fdd\u5b58\u3059\u308b(F):
+UserPreferencesPanel.newFloorThicknessLabel.text=\u65B0\u3057\u3044\u5E8A\u306E\u539A\u3055(F):
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=F
+UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=\u6b21\u306e\u9593\u9694\u3067\u81ea\u52d5\u56de\u5fa9\u7528\u30c7\u30fc\u30bf\u3092\u4fdd\u5b58\u3059\u308b(Y):
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=F
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=\u5206\u3054\u3068
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=\u30d2\u30f3\u30c8\u306e\u8868\u793a\u3092\u30ea\u30bb\u30c3\u30c8(D)
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=D
 
@@ -1256,7 +1328,7 @@
 WallPanel.slopingWallHeightAtEndLabel.mnemonic=D
 WallPanel.thicknessLabel.text=\u539a\u3055(T) (%s):
 WallPanel.thicknessLabel.mnemonic=T
-WallPanel.arcExtentLabel.text=\u5186\u5f27\u306e\u89d2\u5ea6(E) (�) :
+WallPanel.arcExtentLabel.text=\u5186\u5f27\u306e\u89d2\u5ea6(E) (�):
 WallPanel.arcExtentLabel.mnemonic=E
 WallPanel.wallOrientationLabel.text=<html><table><tr><td valign="top" align="right"><b>\u59cb\u70b9</b></td>\
     <td rowspan="2"><img src="%s"></td>\
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_pl.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_pl.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_pl.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_pl.properties	2011-12-21 00:48:52.000000000 +0000
@@ -1,6 +1,6 @@
 # package_pl.properties 11 Dec 2008
 #
-# Translated to Polish by Pawel Antkowiak and Pawel "Bizkit" Popanda
+# Translated to Polish by Pawel Antkowiak, Pawel "Bizkit" Popanda and Emmanuel Puybaret
 #
 # Sweet Home 3D, Copyright (c) 2007-2008 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
@@ -109,6 +109,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=Podwy\u017cszenie
 FurnitureTable.angleColumn=Obr\u00f3t
+FurnitureTable.levelColumn=Poziom
 FurnitureTable.colorColumn=Kolor
 FurnitureTable.textureColumn=Tekstura
 FurnitureTable.movableColumn=Przesuwalny
@@ -363,7 +364,7 @@
 HomePane.SORT_HOME_FURNITURE_BY_DEPTH.ShortDescription=Porz\u0105dkuj meble po g\u0142\u0119boko\u015bci
 HomePane.SORT_HOME_FURNITURE_BY_DEPTH.MnemonicKey=G
 
-HomePane.SORT_HOME_FURNITURE_BY_HEIGHT.Name=Wysoko\u015b\u0107
+HomePane.SORT_HOME_FURNITURE_BY_HEIGHT.Name=Wysoko\u015b\u0107 
 HomePane.SORT_HOME_FURNITURE_BY_HEIGHT.ShortDescription=Porz\u0105dkuj meble po wysoko\u015bci
 HomePane.SORT_HOME_FURNITURE_BY_HEIGHT.MnemonicKey=W
 
@@ -383,6 +384,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Porz\u0105dkuj meble po orientacji
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=O
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=Poziom
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=Porz\u0105dkuj meble po poziomowi
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=P
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=Kolor
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Porz\u0105dkuj meble po kolorze
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=K
@@ -462,6 +467,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Wy\u015bwietl kolumn\u0119 orientacji
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=O
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=Poziom
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Wy\u015bwietl kolumn\u0119 poziom
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=L
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=Kolor
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Wy\u015bwietl kolumn\u0119 kolor\u00f3w
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=K
@@ -603,6 +612,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=Usu\u0144 obrazek wy\u015bwietlany w tle planu
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=U
 
+HomePane.ADD_LEVEL.Name=Dodaj poziom
+HomePane.ADD_LEVEL.ShortDescription=Dodaj poziom
+HomePane.ADD_LEVEL.MnemonicKey=D
+
+HomePane.MODIFY_LEVEL.Name=Modyfikuj poziom...
+HomePane.MODIFY_LEVEL.ShortDescription=Modyfikuj zaznaczony poziom
+HomePane.MODIFY_LEVEL.MnemonicKey=F
+
+HomePane.DELETE_LEVEL.Name=Usu\u0144 poziom
+HomePane.DELETE_LEVEL.ShortDescription=Modyfikuj zaznaczony poziom
+HomePane.DELETE_LEVEL.MnemonicKey=S
+
 HomePane.ZOOM_OUT.Name=Pomniejszenie
 HomePane.ZOOM_OUT.ShortDescription=Pomniejszenie
 HomePane.ZOOM_OUT.MnemonicKey=P
@@ -644,6 +665,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=Wy\u015bwietlaj w oddzielnym oknie
 HomePane.ATTACH_3D_VIEW.MnemonicKey=T
 
+HomePane.DISPLAY_ALL_LEVELS.Name=Wy\u015bwietlaj wszystkie poziomy
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Wy\u015bwietlaj wszystkie poziomy
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=S
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Wy\u015bwietlaj zaznaczony poziom
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Wy\u015bwietlaj zaznaczony poziom
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=A
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=Modyfikuj...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Modyfikuj widok 3D
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=M
@@ -672,9 +701,22 @@
 HomePane.ABOUT.ShortDescription=Poka\u017c informacje na temat Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=O
 
+HomePane.SELECT_OBJECT_MENU.Name=Zaznacz obiekt
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=Kompas
+HomePane.selectObject.furniture=Meble
+HomePane.selectObject.wall=\u015aciana %s
+HomePane.selectObject.floor=Pod\u0142oga %s
+HomePane.selectObject.ceiling=Sufit %s
+HomePane.selectObject.room=Pok�j %s
+HomePane.selectObject.dimensionLine=Wymiar %s 
+HomePane.selectObject.label=Tekst
+
 HomePane.openHomeDialog.title=Otw\u00f3rz
 HomePane.importFurnitureLibraryDialog.title=Importuj bibliotek\u0119 mebli
 HomePane.importTexturesLibraryDialog.title=Importuj bibliotek\u0119 teksturi
+HomePane.importLanguageLibraryDialog.title=Importuj bibliotek\u0119 j\u0119zyki
 HomePane.saveHomeDialog.title=Zapisz
 HomePane.printToPDFDialog.title=Drukuj do pliku PDF
 HomePane.exportToSVGDialog.title=Eksportuj do SVG
@@ -797,6 +839,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=K
 Home3DAttributesPanel.observerHeightLabel.text=Wysoko\u015b\u0107 obserwatora (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=W
+Home3DAttributesPanel.observerCameraElevationLabel.text=Wysoko\u015b\u0107 kamery (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=W
 Home3DAttributesPanel.groundColorRadioButton.text=Kolor t\u0142a:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=T
 Home3DAttributesPanel.groundColorDialog.title=Kolor ziemi:
@@ -846,6 +890,8 @@
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Widok prawy
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Widok z g\u00f3ry
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=Persektywa
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=
+
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Je\u015bli wizualizacja modelu wygl\u0105da na niepoprawn\u0105, spr\u00f3buj odwr\u00f3ci\u0107<br>\
     wy\u015bwietlane powierzchnie u\u017cywaj\u0105c poni\u017cszego prze\u0142\u0105cznika.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Odwr\u00f3\u0107 wewn\u0119trzne i zewn\u0119trzne powierzchnie
@@ -872,6 +918,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=R
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=Drzwi albo okno
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=O
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Schody
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=Kolor:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=K
 ImportedFurnitureWizardStepsPanel.colorDialog.title=Kolor modelu
@@ -922,6 +970,28 @@
 LabelPanel.labelCreation.title=Dodaj tekst
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=Nazwa:
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=Podwy\u017cszenie (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=Grubo\u015b\u0107 pod\u0142ogi (%s):
+LevelPanel.floorThicknessLabel.mnemonic=G
+LevelPanel.heightLabel.text=Wysoko\u015b\u0107 (%s):
+LevelPanel.heightLabel.mnemonic=W
+LevelPanel.levelsSummaryLabel.text=Wszystkie poziomy:
+LevelPanel.nameColumn=Nazwa
+LevelPanel.elevationColumn=Podwy\u017cszenie
+LevelPanel.floorThicknessColumn=Grubo\u015b\u0107 pod\u0142ogi
+LevelPanel.heightColumn=Wysoko\u015b\u0107
+
+LevelPanel.level.title=Dodaj poziom
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=Dodaj poziom
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=Format strony
 PageSetupPanel.pageFormatButton.mnemonic=F
@@ -1133,6 +1203,8 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=G
 UserPreferencesPanel.newWallHeightLabel.text=Wysoko\u015b\u0107 nowych \u015bcian:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=W
+UserPreferencesPanel.newFloorThicknessLabel.text=Grubo\u015b\u0107 nowych pod\u0142�g:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=F
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Zapisuj dom co:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=U
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=minut
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package.properties	2011-12-21 00:48:52.000000000 +0000
@@ -16,7 +16,6 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
-
 # Resources for BackgroundImageWizardStepsPanel class
 BackgroundImageWizardStepsPanel.imageChoiceLabel.text=<html>To choose an image, drag and drop an image in the frame shown below or\
     <br>click on the button <i>Choose image</i> (supported formats: BMP, JPEG, GIF, PNG).
@@ -32,14 +31,15 @@
 BackgroundImageWizardStepsPanel.imageChoiceFormatError=<html>The format of the chosen image isn't supported.\
     <br>Please choose an other image.
 	
-BackgroundImageWizardStepsPanel.scaleLabel.text=<html>Define the scale of the image, by moving the end points of the drawn line in\
-    <br>the image below, and choosing its length. You may enlarge the size of this wizard\
-    <br>to view the image at a larger size.
+BackgroundImageWizardStepsPanel.scaleLabel.text=<html>Define the scale of the image, by moving the end points of the drawn line \
+    <br>in the image below, and entering the length of this line in the real life,\
+    <br>at the current unit. You may enlarge the size of this wizard to view the \
+    <br>image at a larger size.
 BackgroundImageWizardStepsPanel.scaleDistanceLabel.text=Length of drawn line (%s):
 BackgroundImageWizardStepsPanel.scaleDistanceLabel.mnemonic=L
 
-BackgroundImageWizardStepsPanel.originLabel.text=<html>Define the origin of the image in plan, by clicking at its location in the image below\
-    <br>or by changing the values of X and Y.
+BackgroundImageWizardStepsPanel.originLabel.text=<html>Define the origin of the image in plan, by clicking at its location in the image\
+    <br>below or by changing the values of X and Y.
 BackgroundImageWizardStepsPanel.xOriginLabel.text=X (%s):
 BackgroundImageWizardStepsPanel.xOriginLabel.mnemonic=X
 BackgroundImageWizardStepsPanel.yOriginLabel.text=Y (%s):
@@ -128,6 +128,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=Elevation
 FurnitureTable.angleColumn=Angle
+FurnitureTable.levelColumn=Level
 FurnitureTable.colorColumn=Color
 FurnitureTable.textureColumn=Texture
 FurnitureTable.movableColumn=Movable
@@ -186,6 +187,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=F
 Home3DAttributesPanel.observerHeightLabel.text=Visitor height (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=H
+Home3DAttributesPanel.observerCameraElevationLabel.text=Eyes elevation (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=E
 Home3DAttributesPanel.groundColorRadioButton.text=Ground color:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=G
 Home3DAttributesPanel.groundColorDialog.title=Ground color
@@ -570,6 +573,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Sort furniture by angle
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=G
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=Level
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=Sort furniture by level
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=L
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=Color
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Sort furniture by color
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=C
@@ -650,6 +657,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Display angle column
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=G
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=Level
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Display level column
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=L
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=Color
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Display color column
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=C
@@ -870,6 +881,25 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=Delete the image displayed in plan background
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=D
 
+HomePane.ADD_LEVEL.Name=Add level
+HomePane.ADD_LEVEL.ShortDescription=Add a new level in home
+HomePane.ADD_LEVEL.MnemonicKey=V
+# Note to translators: do not copy the 3 following keys in localized file
+HomePane.ADD_LEVEL.SmallIcon=resources/icons/tango/plan-add-level.png
+HomePane.ADD_LEVEL.AcceleratorKey=control shift N
+HomePane.ADD_LEVEL.AcceleratorKey.Mac\ OS\ X=meta shift N
+
+HomePane.MODIFY_LEVEL.Name=Modify level...
+HomePane.MODIFY_LEVEL.ShortDescription=Modify selected level
+HomePane.MODIFY_LEVEL.MnemonicKey=I
+# Note to translators: do not copy the 2 following keys in localized file
+HomePane.MODIFY_LEVEL.AcceleratorKey=control shift B
+HomePane.MODIFY_LEVEL.AcceleratorKey.Mac\ OS\ X=meta shift B
+
+HomePane.DELETE_LEVEL.Name=Delete level
+HomePane.DELETE_LEVEL.ShortDescription=Delete selected level from home
+HomePane.DELETE_LEVEL.MnemonicKey=D
+
 HomePane.ZOOM_IN.Name=Zoom in
 HomePane.ZOOM_IN.ShortDescription=Zoom in
 HomePane.ZOOM_IN.MnemonicKey=Z
@@ -918,6 +948,9 @@
 HomePane.STORE_POINT_OF_VIEW.Name=Store point of view...
 HomePane.STORE_POINT_OF_VIEW.ShortDescription=Store the current point of view
 HomePane.STORE_POINT_OF_VIEW.MnemonicKey=S
+# Note to translators: do not copy the 2 following keys in localized file
+HomePane.STORE_POINT_OF_VIEW.AcceleratorKey=control alt R
+HomePane.STORE_POINT_OF_VIEW.AcceleratorKey.Mac\ OS\ X=meta alt R
 
 # Go to point of view sub menu is filled dynamically
 HomePane.GO_TO_POINT_OF_VIEW.Name=Go to point of view
@@ -936,12 +969,28 @@
 # Note to translators: do not copy the following key in localized file
 HomePane.ATTACH_3D_VIEW.SmallIcon=resources/icons/tango/view3d-attach.png
 
+HomePane.DISPLAY_ALL_LEVELS.Name=Display all levels
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Display all levels in the 3D view
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=L
+# Note to translators: do not copy the 2 following keys in localized file
+HomePane.DISPLAY_ALL_LEVELS.AcceleratorKey=control alt A
+HomePane.DISPLAY_ALL_LEVELS.AcceleratorKey.Mac\ OS\ X=meta alt A
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Display selected level
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Display selected level in the 3D view
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=C
+# Note to translators: do not copy the 2 following keys in localized file
+HomePane.DISPLAY_SELECTED_LEVEL.AcceleratorKey=control shift A
+HomePane.DISPLAY_SELECTED_LEVEL.AcceleratorKey.Mac\ OS\ X=meta shift A
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=Modify...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Modify 3D view
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=M
-# Note to translators: do not copy the 2 following keys in localized file
+# Note to translators: do not copy the 4 following keys in localized file
 HomePane.MODIFY_3D_ATTRIBUTES.SmallIcon=resources/icons/tango/view3d-modify.png
 HomePane.MODIFY_3D_ATTRIBUTES.SmallIcon.jfc=resources/icons/jfc/modify.gif
+HomePane.MODIFY_3D_ATTRIBUTES.AcceleratorKey=control shift M
+HomePane.MODIFY_3D_ATTRIBUTES.AcceleratorKey.Mac\ OS\ X=meta shift M
 
 HomePane.CREATE_PHOTO.Name=Create photo...
 HomePane.CREATE_PHOTO.ShortDescription=Create a photo from 3D view
@@ -979,8 +1028,23 @@
 HomePane.ABOUT.SmallIcon=resources/icons/tango/dialog-information.png
 HomePane.ABOUT.SmallIcon.jfc=resources/icons/jfc/about.gif
 
+# Contextual menu
+HomePane.SELECT_OBJECT_MENU.Name=Select object
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=Compass
+HomePane.selectObject.furniture=Furniture
+HomePane.selectObject.wall=Wall %s
+HomePane.selectObject.floor=Floor %s
+HomePane.selectObject.ceiling=Ceiling %s
+HomePane.selectObject.room=Room %s
+HomePane.selectObject.dimensionLine=Dimension %s 
+HomePane.selectObject.label=Text
+
+
 # Open / Save dialogs title
 HomePane.openHomeDialog.title=Open
+HomePane.importLanguageLibraryDialog.title=Import language library
 HomePane.importFurnitureLibraryDialog.title=Import furniture library
 HomePane.importTexturesLibraryDialog.title=Import textures library
 HomePane.saveHomeDialog.title=Save
@@ -1141,7 +1205,8 @@
     <br>Please choose an other model.
 
 ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Check the model is correctly oriented. If it isn't, make it turn with the arrows\
-    <br>below until the front view matches to the front part of the piece.
+    <br>below until the front view matches to the front part of the piece. Hold the <i>Shift</i>\
+    <br>key down while clicking on an arrow to rotate the model at smaller steps.  
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=Front view
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Right view
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Top view
@@ -1150,8 +1215,11 @@
     <br>to invert its displayed faces.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Invert back and front faces
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.mnemonic=I
+ImportedFurnitureWizardStepsPanel.angleTooltipFeedback=%d\u00b0
 
-# Note to translators: do not copy the 8 following keys in localized file
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=Reset to default orientation
+# Note to translators: do not copy the 9 following keys in localized file
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.SmallIcon=resources/icons/tango/identity.png
 ImportedFurnitureWizardStepsPanel.TURN_LEFT.SmallIcon=resources/icons/tango/go-previous.png
 ImportedFurnitureWizardStepsPanel.TURN_LEFT.SmallIcon.jfc=resources/icons/jfc/turnLeft.gif
 ImportedFurnitureWizardStepsPanel.TURN_RIGHT.SmallIcon=resources/icons/tango/go-next.png
@@ -1182,6 +1250,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=M
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=Door or window
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=R
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Staircase
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=Color:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=O
 ImportedFurnitureWizardStepsPanel.colorDialog.title=Furniture color
@@ -1235,6 +1305,30 @@
 LabelPanel.labelCreation.title=Add text
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=Name:
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=Elevation (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=Floor thickness (%s):
+LevelPanel.floorThicknessLabel.mnemonic=T
+LevelPanel.heightLabel.text=Height (%s):
+LevelPanel.heightLabel.mnemonic=H
+LevelPanel.levelsSummaryLabel.text=Levels summary (the edited level is selected):
+LevelPanel.nameColumn=Name
+LevelPanel.elevationColumn=Elevation
+LevelPanel.floorThicknessColumn=Floor thickness
+LevelPanel.heightColumn=Height
+
+LevelPanel.level.title=Modify level
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=Add level
+# Note to translators: do not copy the following key in localized file
+MultipleLevelsPlanPanel.ADD_LEVEL.SmallIcon=resources/icons/tango/plan-add-level.png
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=Page format
 PageSetupPanel.pageFormatButton.mnemonic=A
@@ -1481,10 +1575,16 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=K
 UserPreferencesPanel.newWallHeightLabel.text=New walls height:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=H
+UserPreferencesPanel.newFloorThicknessLabel.text=New floors thickness:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=F
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Save home data for recovery every:
-UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=F
+UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=Y
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=minutes
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=Import language library file
+# Note to translators: do not copy the following key in localized file
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.SmallIcon=resources/icons/tango/language-import.png
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=Reset the display of tips
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=D
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_pt.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_pt.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_pt.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_pt.properties	2011-12-21 00:48:52.000000000 +0000
@@ -108,6 +108,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=Eleva��o
 FurnitureTable.angleColumn=�ngulo
+FurnitureTable.levelColumn=N�vel
 FurnitureTable.colorColumn=Cor
 FurnitureTable.textureColumn=Textura
 FurnitureTable.movableColumn=M�vel
@@ -143,6 +144,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=C
 Home3DAttributesPanel.observerHeightLabel.text=Altura do visitante (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=A
+Home3DAttributesPanel.observerCameraElevationLabel.text=Eleva��o dos olhos (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=O
 Home3DAttributesPanel.groundColorRadioButton.text=Cor do ch�o:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=C
 Home3DAttributesPanel.groundColorDialog.title=Cor do ch�o
@@ -406,6 +409,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Ordena mob�lias por �ngulos
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=G
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=N�vel
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=Ordena mob�lias por n�vel
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=N
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=Cor
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Ordena mob�lias por cores
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=C
@@ -485,6 +492,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Mostra coluna de �ngulo
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=G
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=N�vel
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Mostra coluna de n�vel
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=N
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=Cor
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Mostra coluna de cores
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=C
@@ -626,6 +637,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=Remove a imagem mostrada no plano de fundo
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=V
 
+HomePane.ADD_LEVEL.Name=Adicionar n�vel
+HomePane.ADD_LEVEL.ShortDescription=Adicionar um novo n�vel na Casa
+HomePane.ADD_LEVEL.MnemonicKey=N
+
+HomePane.MODIFY_LEVEL.Name=Modificar n�vel...
+HomePane.MODIFY_LEVEL.ShortDescription=Modificar n�vel selecionado
+HomePane.MODIFY_LEVEL.MnemonicKey=E
+
+HomePane.DELETE_LEVEL.Name=Deletar n�vel
+HomePane.DELETE_LEVEL.ShortDescription=Deletar n�vel selecionado da casa
+HomePane.DELETE_LEVEL.MnemonicKey=D
+
 HomePane.ZOOM_OUT.Name=Distanciar
 HomePane.ZOOM_OUT.ShortDescription=Distanciar
 HomePane.ZOOM_OUT.MnemonicKey=I
@@ -657,7 +680,7 @@
 # Go to point of view sub menu is filled dynamically
 HomePane.GO_TO_POINT_OF_VIEW.Name=Ir para o ponto de vista
 HomePane.GO_TO_POINT_OF_VIEW.MnemonicKey=I
-HomePane.NoStoredPointOfView=Ponto de Vista n�o Armazenado
+HomePane.NoStoredPointOfView=Ponto de vista n�o armazenado
 
 HomePane.DETACH_3D_VIEW.Name=Mostrar em janelas separadas
 HomePane.DETACH_3D_VIEW.ShortDescription=Mostrar vis�o 3D em janela separada
@@ -667,6 +690,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=Mostrar vis�o 3D na janela principal
 HomePane.ATTACH_3D_VIEW.MnemonicKey=T
 
+HomePane.DISPLAY_ALL_LEVELS.Name=Exibir todos n�veis
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Exibir todos n�veis em 3D
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=N
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Exibir n�vel selecionado
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Exibir n�vel selecionado em 3D
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=E
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=Modificar...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=Modificar vis�o 3D
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=M
@@ -695,9 +726,23 @@
 HomePane.ABOUT.ShortDescription=Mostra informa��es sobre Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=A
 
+
+HomePane.SELECT_OBJECT_MENU.Name=Selecionar Objeto
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=B�ssola
+HomePane.selectObject.furniture=M�vel 
+HomePane.selectObject.wall=Parede %s
+HomePane.selectObject.floor=Piso %s
+HomePane.selectObject.ceiling=Teto %s
+HomePane.selectObject.room=Quarto %s
+HomePane.selectObject.dimensionLine=Dimens�o %s
+HomePane.selectObject.label=Texto
+
 HomePane.openHomeDialog.title=Abrir
 HomePane.importFurnitureLibraryDialog.title=Importa biblioteca de mob�lias
 HomePane.importTexturesLibraryDialog.title=Importa biblioteca de texturas
+HomePane.importLanguageLibraryDialog.title=Importar biblioteca de idiomas
 HomePane.saveHomeDialog.title=Salvar
 HomePane.printToPDFDialog.title=Imprimir em PDF
 HomePane.exportToSVGDialog.title=Exportar para SVG
@@ -839,15 +884,17 @@
 ImportedFurnitureWizardStepsPanel.modelChoiceFormatError=<html>O formato do modelo escolhido n�o � suportado.<br>\
     Por favor, escolha outro modelo.
 
-ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Verifique se o modelo est� orientado corretamente. Se n�o estiver, gire-o<br>\
-    com as setas abaixo at� a vis�o de frente ficar correta de acordo<br>\
-    com o desejado.
+ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Verifique se o modelo est� orientado corretamente. Se n�o estiver, gire-o com as setas\
+    <br>abaixo at� a vis�o de frente ficar correta de acordo com o desejado. Pressione a tecla\
+    <br><i>Shift</i> enquanto clica na seta para rotacionar o modelo para passos menores.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=Vis�o de frente
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Vis�o da direita
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Vis�o de cima
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=Perspectiva
-ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Se o desenho do modelo parecer incorreto, marque a op��o abaixo<br>\
-    para inverter as faces mostradas.
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=Resetar para a Orienta��o Padr�o
+
+ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Se o desenho do modelo parecer incorreto, marque a op��o abaixo para inverter\
+    <br>as faces mostradas.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Inverter frente e verso
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.mnemonic=I
 
@@ -872,6 +919,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=V
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=Porta ou janela
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=O
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Escada
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=Cor:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=C
 ImportedFurnitureWizardStepsPanel.colorDialog.title=Cor da mob�lia
@@ -921,6 +970,28 @@
 LabelPanel.labelCreation.title=Adicionar texto
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=Nome:
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=Eleva��o (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=Espessura do andar (%s):
+LevelPanel.floorThicknessLabel.mnemonic=S
+LevelPanel.heightLabel.text=Altura(%s):
+LevelPanel.heightLabel.mnemonic=A
+LevelPanel.levelsSummaryLabel.text=Sum�rio de n�veis (o edit�vel est� selecionado):
+LevelPanel.nameColumn=Nome
+LevelPanel.elevationColumn=Eleva��o
+LevelPanel.floorThicknessColumn=Espessura do Andar
+LevelPanel.heightColumn=Altura
+
+LevelPanel.level.title=Modificar n�vel
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=Adicionar n�vel
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=Formato da p�gina
 PageSetupPanel.pageFormatButton.mnemonic=F
@@ -1130,10 +1201,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=E
 UserPreferencesPanel.newWallHeightLabel.text=Altura de novas paredes:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=N
+UserPreferencesPanel.newFloorThicknessLabel.text=Espessura de novos andares:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=V
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Salvar dados da casa para recupera��o:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=O
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=minutos
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=Importar Arquivo de Idiomas
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=Limpa as configura��es de dicas
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=F
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_ru.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_ru.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_ru.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_ru.properties	2011-12-21 00:48:52.000000000 +0000
@@ -108,6 +108,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=\u041f\u0440\u0438\u043f\u043e\u0434\u043d\u044f\u0442\u043e\u0441\u0442\u044c
 FurnitureTable.angleColumn=\u0423\u0433\u043e\u043b
+FurnitureTable.levelColumn=\u0423\u0440\u043e\u0432\u0435\u043d\u044c
 FurnitureTable.colorColumn=\u0426\u0432\u0435\u0442
 FurnitureTable.textureColumn=\u0422\u0435\u043a\u0441\u0442\u0443\u0440\u0430
 FurnitureTable.movableColumn=\u041f\u0435\u0440\u0435\u043c\u0435\u0449\u0430\u0435\u043c\u043e\u0441\u0442\u044c
@@ -143,6 +144,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=G
 Home3DAttributesPanel.observerHeightLabel.text=\u0420\u043e\u0441\u0442 \u043f\u043e\u0441\u0435\u0442\u0438\u0442\u0435\u043b\u044f (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=H
+Home3DAttributesPanel.observerCameraElevationLabel.text=\u0412\u044b\u0441\u043e\u0442\u0430 \u0433\u043b\u0430\u0437 (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=U
 Home3DAttributesPanel.groundColorRadioButton.text=\u0426\u0432\u0435\u0442 \u0437\u0435\u043c\u043b\u0438:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=W
 Home3DAttributesPanel.groundColorDialog.title=\u0426\u0432\u0435\u0442 \u0437\u0435\u043c\u043b\u0438
@@ -406,6 +409,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0443\u0440\u043d\u0438\u0442\u0443\u0440\u0443 \u043f\u043e \u0443\u0433\u043b\u0443
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=E
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=\u0423\u0440\u043E\u0432\u0435\u043D\u044C
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=\u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0443\u0440\u043E\u0432\u043D\u0438
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=T
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=\u0426\u0432\u0435\u0442
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0443\u0440\u043d\u0438\u0442\u0443\u0440\u0443 \u043f\u043e \u0446\u0432\u0435\u0442\u0443
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=W
@@ -485,6 +492,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043a\u043e\u043b\u043e\u043d\u043a\u0443 "\u0423\u0433\u043e\u043b"
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=E
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=\u0423\u0440\u043E\u0432\u0435\u043D\u044C
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u043A\u043E\u043B\u043E\u043D\u043A\u0438 \u0443\u0440\u043E\u0432\u043D\u044F
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=T
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=\u0426\u0432\u0435\u0442
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043a\u043e\u043b\u043e\u043d\u043a\u0443 "\u0426\u0432\u0435\u0442"
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=W
@@ -625,6 +636,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0443 \u0437\u0430\u0434\u043d\u0435\u0433\u043e \u0444\u043e\u043d\u0430
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=A
 
+HomePane.ADD_LEVEL.Name=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0443\u0440\u043e\u0432\u0435\u043d\u044c
+HomePane.ADD_LEVEL.ShortDescription=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u0443\u0440\u043e\u0432\u0435\u043d\u044c \u043d\u0430 \u043f\u043b\u0430\u043d
+HomePane.ADD_LEVEL.MnemonicKey=E
+
+HomePane.MODIFY_LEVEL.Name=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0443\u0440\u043e\u0432\u0435\u043d\u044c...
+HomePane.MODIFY_LEVEL.ShortDescription=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0439 \u0443\u0440\u043e\u0432\u0435\u043d\u044c
+HomePane.MODIFY_LEVEL.MnemonicKey=B
+
+HomePane.DELETE_LEVEL.Name=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0443\u0440\u043e\u0432\u0435\u043d\u044c
+HomePane.DELETE_LEVEL.ShortDescription=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0439 \u0443\u0440\u043e\u0432\u0435\u043d\u044c \u0438\u0437 \u043f\u043b\u0430\u043d\u0430
+HomePane.DELETE_LEVEL.MnemonicKey=L
+
 HomePane.ZOOM_OUT.Name=\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c
 HomePane.ZOOM_OUT.ShortDescription=\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c
 HomePane.ZOOM_OUT.MnemonicKey=V
@@ -666,6 +689,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c 3D \u0432\u0438\u0434\u0432 \u0433\u043b\u0430\u0432\u043d\u043e\u043c \u043e\u043a\u043d\u0435
 HomePane.ATTACH_3D_VIEW.MnemonicKey=G
 
+HomePane.DISPLAY_ALL_LEVELS.Name=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u0441\u0435 \u0443\u0440\u043E\u0432\u043D\u0438
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u0441\u0435 \u0443\u0440\u043E\u0432\u043D\u0438 \u0432 \u0432\u0438\u0434\u0435 3D
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=E
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0443\u0440\u043E\u0432\u0435\u043D\u044C
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0443\u0440\u043E\u0432\u0435\u043D\u044C \u0432 \u0432\u0438\u0434\u0435 3D
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=S
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0438\u0434 3D
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=B
@@ -694,9 +725,24 @@
 HomePane.ABOUT.ShortDescription=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=J
 
+
+HomePane.SELECT_OBJECT_MENU.Name=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0431\u044a\u0435\u043a\u0442
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=J
+
+HomePane.selectObject.compass=\u041a\u043e\u043c\u043f\u0430\u0441
+HomePane.selectObject.furniture=\u041c\u0435\u0431\u0435\u043b\u044c
+HomePane.selectObject.wall=\u0421\u0442\u0435\u043d\u0430 %s
+HomePane.selectObject.floor=\u042d\u0442\u0430\u0436 %s
+HomePane.selectObject.ceiling=\u041f\u0435\u0440\u0435\u043a\u0440\u044b\u0442\u0438\u0435 %s
+HomePane.selectObject.room=\u041a\u043e\u043c\u043d\u0430\u0442\u0430 %s
+HomePane.selectObject.dimensionLine=\u0420\u0430\u0437\u043c\u0435\u0440\u043d\u0430\u044f \u043b\u0438\u043d\u0438\u044f %s
+HomePane.selectObject.label=\u0422\u0435\u043a\u0441\u0442
+
+
 HomePane.openHomeDialog.title=\u041e\u0442\u043a\u0440\u044b\u0442\u044c
 HomePane.importFurnitureLibraryDialog.title=\u0418\u043c\u043f\u043e\u0440\u0442 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438 \u0444\u0443\u0440\u043d\u0438\u0442\u0443\u0440\u044b
 HomePane.importTexturesLibraryDialog.title= \u0418\u043c\u043f\u043e\u0440\u0442 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438 \u0442\u0435\u043a\u0441\u0442\u0443\u0440
+HomePane.importLanguageLibraryDialog.title=\u0418\u043C\u043F\u043E\u0440\u0442 \u044F\u0437\u044B\u043A\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438
 HomePane.saveHomeDialog.title=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
 HomePane.printToPDFDialog.title=\u041d\u0430\u043f\u0435\u0447\u0430\u0442\u0430\u0442\u044c \u0432 PDF
 HomePane.exportToSVGDialog.title=\u042d\u043a\u0441\u043f\u043e\u0440\u0442 \u0432 SVG
@@ -843,11 +889,14 @@
 
 ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0443\u044e \u043e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044e \u043c\u043e\u0434\u0435\u043b\u0438. \u041c\u043e\u0436\u0435\u0442\u0435 \u0432\u0440\u0430\u0449\u0430\u0442\u044c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u044f\
     <br>\u0441\u0442\u0440\u0435\u043b\u043a\u0438. \u0414\u043e\u0431\u0435\u0439\u0442\u0435\u0441\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0433\u043e \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f, \u0447\u0442\u043e\u0431\u044b \u043f\u0435\u0440\u0435\u0434\u043d\u044f\u044f\
-    <br>\u0447\u0430\u0441\u0442\u044c \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u043e\u0432\u0430\u043b\u0430 \u043f\u0435\u0440\u0435\u0434\u043d\u0435\u0439 \u0447\u0430\u0441\u0442\u0438, \u0432\u0435\u0440\u0445\u043d\u044f\u044f - \u0432\u0435\u0440\u0445\u043d\u0435\u0439 \u0438 \u0442.\u0434.
+    <br>\u0447\u0430\u0441\u0442\u044c \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u043e\u0432\u0430\u043b\u0430 \u043f\u0435\u0440\u0435\u0434\u043d\u0435\u0439 \u0447\u0430\u0441\u0442\u0438, \u0432\u0435\u0440\u0445\u043d\u044f\u044f - \u0432\u0435\u0440\u0445\u043d\u0435\u0439 \u0438 \u0442.\u0434. \u041D\u0430\u0436\u043C\u0438\u0442\u0435 <i>Shift</i>\
+    <br>\u0438 \u043F\u043E\u0442\u043E\u043C \u043A\u043B\u0438\u043A\u043D\u0438\u0442\u0435 \u043D\u0430 \u0441\u0442\u0440\u0435\u043B\u043A\u0438 \u0447\u0442\u043E\u0431\u044B \u043A\u0440\u0443\u0442\u0438\u0442\u044C \u043C\u043E\u0434\u0435\u043B\u044C \u043D\u0435\u0431\u043E\u043B\u044C\u0448\u0438\u043C\u0438 \u0448\u0430\u0433\u0430\u043C\u0438.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=\u0412\u0438\u0434 \u0441\u043f\u0435\u0440\u0435\u0434\u0438
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=\u0412\u0438\u0434 \u0441\u043f\u0440\u0430\u0432\u0430
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=\u0412\u0438\u0434 \u0441\u0432\u0435\u0440\u0445\u0443
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=\u041f\u0435\u0440\u0441\u043f\u0435\u043a\u0442\u0438\u0432\u0430
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=\u0421\u0431\u0440\u043E\u0441 \u043E\u0440\u0438\u0435\u043D\u0442\u0430\u0446\u0438\u0438 \u043D\u0430 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E
+
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>\u0415\u0441\u043b\u0438 \u043c\u043e\u0434\u0435\u043b\u044c \u0432\u0438\u0434\u043d\u043e \u043d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e - \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u043e\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0433\u0430\u043b\u043e\u0447\u043a\u0443 \u043d\u0438\u0436\u0435,\
     <br>\u044d\u0442\u0438\u043c \u0432\u044b \u0438\u043d\u0432\u0435\u0440\u0442\u0438\u0440\u0443\u0435\u0442\u0435 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u043b\u0438\u0446\u0435\u0432\u043e\u0439 \u0447\u0430\u0441\u0442\u0438.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=\u0417\u0430\u0434\u043d\u044e\u044e \u0438 \u043f\u0435\u0440\u0435\u0434\u043d\u044e\u044e \u0447\u0430\u0441\u0442\u044c \u043f\u043e\u043c\u0435\u043d\u044f\u0442\u044c \u043c\u0435\u0441\u0442\u0430\u043c\u0438
@@ -874,6 +923,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=T
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=\u0414\u0432\u0435\u0440\u044c \u0438\u043b\u0438 \u043e\u043a\u043d\u043e
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=J
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=\u041b\u0435\u0441\u0442\u043d\u0438\u0446\u0430
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=\u0426\u0432\u0435\u0442:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=W
 ImportedFurnitureWizardStepsPanel.colorDialog.title=\u0426\u0432\u0435\u0442 \u0444\u0443\u0440\u043d\u0438\u0442\u0443\u0440\u044b
@@ -923,6 +974,28 @@
 LabelPanel.labelCreation.title=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u0435\u043a\u0441\u0442
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=\u0418\u043C\u044F
+LevelPanel.nameLabel.mnemonic=B
+LevelPanel.elevationLabel.text=\u041F\u0440\u0438\u043F\u043E\u0434\u043D\u044F\u0442\u043E\u0441\u0442\u044C (%s):
+LevelPanel.elevationLabel.mnemonic=G
+LevelPanel.floorThicknessLabel.text=\u0422\u043E\u043B\u0449\u0438\u043D\u0430 \u043F\u0435\u0440\u0435\u043A\u0440\u044B\u0442\u0438\u044F (%s):
+LevelPanel.floorThicknessLabel.mnemonic=N
+LevelPanel.heightLabel.text=\u0412\u044B\u0441\u043E\u0442\u0430 (%s):
+LevelPanel.heightLabel.mnemonic=D
+LevelPanel.levelsSummaryLabel.text=\u0421\u0432\u043E\u0434\u043D\u0430\u044F \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F (\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0443\u0435\u0442\u0441\u044F \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u0430\u044F \u0441\u0442\u0440\u043E\u043A\u0430):
+LevelPanel.nameColumn=\u0418\u043C\u044F
+LevelPanel.elevationColumn=\u041F\u0440\u0438\u043F\u043E\u0434\u043D\u044F\u0442\u043E\u0441\u0442\u044C
+LevelPanel.floorThicknessColumn=\u0422\u043E\u043B\u0449\u0438\u043D\u0430 \u043F\u0435\u0440\u0435\u043A\u0440\u044B\u0442\u0438\u044F
+LevelPanel.heightColumn=\u0412\u044B\u0441\u043E\u0442\u0430
+
+LevelPanel.level.title=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=\u0424\u043e\u0440\u043c\u0430\u0442 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
 PageSetupPanel.pageFormatButton.mnemonic=A
@@ -1131,10 +1204,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=N
 UserPreferencesPanel.newWallHeightLabel.text=\u0412\u044b\u0441\u043e\u0442\u0430 \u043d\u043e\u0432\u044b\u0445 \u0441\u0442\u0435\u043d:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=D
+UserPreferencesPanel.newFloorThicknessLabel.text=\u0422\u043E\u043B\u0449\u0438\u043D\u0430 \u043F\u0435\u0440\u0435\u043A\u0440\u044B\u0442\u0438\u044F \u043D\u043E\u0432\u043E\u0433\u043E \u044D\u0442\u0430\u0436\u0430:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=G
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=\u0421\u043e\u0445\u0440\u0430\u043d\u044f\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u043a\u0430\u0436\u0434\u044b\u0435:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=M
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=\u043c\u0438\u043d\u0443\u0442
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=\u0418\u043C\u043F\u043E\u0440\u0442 \u0444\u0430\u0439\u043B\u0430 \u044F\u0437\u044B\u043A\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043f\u043e\u0434\u0441\u043a\u0430\u0437\u043e\u043a
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=H
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_sv.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_sv.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_sv.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_sv.properties	2011-12-21 00:48:52.000000000 +0000
@@ -109,6 +109,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=Upplyftning
 FurnitureTable.angleColumn=Vinkel
+FurnitureTable.levelColumn=Niv�
 FurnitureTable.colorColumn=F�rg
 FurnitureTable.textureColumn=Textur
 FurnitureTable.movableColumn=Flyttbar
@@ -144,6 +145,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=F
 Home3DAttributesPanel.observerHeightLabel.text=Bes�karens l�ngd (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=L
+Home3DAttributesPanel.observerCameraElevationLabel.text=�gonh�jd (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=O
 Home3DAttributesPanel.groundColorRadioButton.text=F�rg p� marken:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=M
 Home3DAttributesPanel.groundColorDialog.title=F�rg p� marken
@@ -407,6 +410,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=Sortera m�bler efter vinkel
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=V
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=Niv�
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=Sortera m�bler efter niv�
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=N
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=F�rg
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=Sortera m�bler efter f�rg
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=F
@@ -487,6 +494,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Visa Vinkel-kolumn
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=V
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=Niv�
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Visa niv�kolumn
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=N
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=F�rg
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Visa F�rg-kolumn
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=F
@@ -628,6 +639,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=Ta bort bakgrundsbilden fr�n planl�sningen
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=T
 
+HomePane.ADD_LEVEL.Name=L�gg till niv�
+HomePane.ADD_LEVEL.ShortDescription=L�gg till en ny niv� i hemmet
+HomePane.ADD_LEVEL.MnemonicKey=N
+
+HomePane.MODIFY_LEVEL.Name=Redigera niv�...
+HomePane.MODIFY_LEVEL.ShortDescription=Redigera vald niv�
+HomePane.MODIFY_LEVEL.MnemonicKey=R
+
+HomePane.DELETE_LEVEL.Name=Ta bort niv�
+HomePane.DELETE_LEVEL.ShortDescription=Ta bort vald niv� fr�n hemmet
+HomePane.DELETE_LEVEL.MnemonicKey=T
+
 HomePane.ZOOM_OUT.Name=Zooma ut
 HomePane.ZOOM_OUT.ShortDescription=Zooma ut
 HomePane.ZOOM_OUT.MnemonicKey=U
@@ -663,11 +686,19 @@
 
 HomePane.DETACH_3D_VIEW.Name=Visa i separat f�nster
 HomePane.DETACH_3D_VIEW.ShortDescription=Visar 3D-vyn i ett separat f�nster
-HomePane.DETACH_3D_VIEW.MnemonicKey=V
+HomePane.DETACH_3D_VIEW.MnemonicKey=R
 
 HomePane.ATTACH_3D_VIEW.Name=Visa i huvudf�nstret
 HomePane.ATTACH_3D_VIEW.ShortDescription=Visar 3D-vyn i huvudf�nstret
-HomePane.ATTACH_3D_VIEW.MnemonicKey=V
+HomePane.ATTACH_3D_VIEW.MnemonicKey=R
+
+HomePane.DISPLAY_ALL_LEVELS.Name=Visa alla niv�er
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Visa alla niv�er i 3D-vyn
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=A
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Visa vald niv�
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Visa vald niv� i 3D-vyn
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=D
 
 HomePane.MODIFY_3D_ATTRIBUTES.Name=�ndra...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=�ndra p� 3D-vyn
@@ -679,7 +710,7 @@
 
 HomePane.CREATE_VIDEO.Name=Skapa video...
 HomePane.CREATE_VIDEO.ShortDescription=Skapa en 3D-video
-HomePane.CREATE_VIDEO.MnemonicKey=D
+HomePane.CREATE_VIDEO.MnemonicKey=V
 
 HomePane.EXPORT_TO_OBJ.Name=Exportera till OBJ-format...
 HomePane.EXPORT_TO_OBJ.ShortDescription=Exportera till OBJ-format
@@ -697,9 +728,22 @@
 HomePane.ABOUT.ShortDescription=Visa information om Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=O
 
+HomePane.SELECT_OBJECT_MENU.Name=V�lj objekt
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+HomePane.selectObject.compass=Kompass
+HomePane.selectObject.furniture=M�bel
+HomePane.selectObject.wall=V�gg %s
+HomePane.selectObject.floor=Golv %s
+HomePane.selectObject.ceiling=Innertak %s
+HomePane.selectObject.room=Rum %s
+HomePane.selectObject.dimensionLine=M�tts�ttningslinje %s
+HomePane.selectObject.label=Text
+
+
 HomePane.openHomeDialog.title=�ppna
 HomePane.importFurnitureLibraryDialog.title=Importera m�belbibliotek
 HomePane.importTexturesLibraryDialog.title=Importera texturbibliotek
+HomePane.importLanguageLibraryDialog.title=Importera spr�kbibliotek
 HomePane.saveHomeDialog.title=Spara
 HomePane.printToPDFDialog.title=Skriv ut till PDF
 HomePane.exportToSVGDialog.title=Exportera till SVG
@@ -843,12 +887,16 @@
 ImportedFurnitureWizardStepsPanel.modelChoiceFormatError=<html>Formatet p� den valda modellen st�ds ej.\
     <br>V�nligen v�lj en annan modell.
 
-ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Kontrollera att modellen �r korrekt inriktad. Om den inte �r det, snurra p� den\
-    <br>med pilarna nedan till dess att vyn framifr�n matchar m�belns framsida.
+ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Kontrollera att modellen �r r�tt orienterad. Om den inte �r det, f� den att\
+    <br>rotera med pilarna nedan tills frontvyn matchar framsidan av m�beln.\
+    <br>H�ll ner <i>Shift</i>-tangenten medan du klickar p� en pil f�r att rotera\
+    <br>modellen i mindre steg.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=Vy framifr�n
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Vy fr�n h�ger
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Vy uppifr�n
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=Perspektiv
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=�terst�ll till ursprungsorientering
+
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>Om modellen renderas felaktig kryssar du i f�ljande ruta f�r att invertera\
     <br>dess sidor.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=Invertera bak- och framsidor.
@@ -873,8 +921,10 @@
 ImportedFurnitureWizardStepsPanel.elevationLabel.mnemonic=U
 ImportedFurnitureWizardStepsPanel.movableCheckBox.text=Flyttbar
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=F
-ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=D�rr eller f�nster
-ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=S
+ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=Trappa
+ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=T
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=Staircase
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=F�rg:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=R
 ImportedFurnitureWizardStepsPanel.colorDialog.title=M�belf�rg
@@ -924,6 +974,27 @@
 LabelPanel.labelCreation.title=L�gg till text
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=Namn:
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=Upph�jning (%s):
+LevelPanel.elevationLabel.mnemonic=U
+LevelPanel.floorThicknessLabel.text=Golvtjocklek (%s):
+LevelPanel.floorThicknessLabel.mnemonic=G
+LevelPanel.heightLabel.text=H�jd (%s):
+LevelPanel.heightLabel.mnemonic=H
+LevelPanel.levelsSummaryLabel.text=Niv�sammanst�llning (den redigerade �r vald):
+LevelPanel.nameColumn=Namn
+LevelPanel.elevationColumn=Upph�jning
+LevelPanel.floorThicknessColumn=Golvtjocklek
+LevelPanel.heightColumn=H�jd
+LevelPanel.level.title=Redigera niv�
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=L�gg till niv�
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=Sidformat
 PageSetupPanel.pageFormatButton.mnemonic=F
@@ -1132,10 +1203,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=E
 UserPreferencesPanel.newWallHeightLabel.text=H�jden p� nya v�ggar:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=H
+UserPreferencesPanel.newFloorThicknessLabel.text=Tjocklek p� nya golv:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=G
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=Spara hemmets data f�r �terst�llning var:
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=D
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=minut
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=Importera spr�kbiblioteksfil
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=Visa alla tips igen
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=V
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_vi.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_vi.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_vi.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_vi.properties	2011-12-21 00:48:52.000000000 +0000
@@ -148,6 +148,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=K
 Home3DAttributesPanel.observerHeightLabel.text=\u0110\u1ed9 cao c\u1ee7a kh\u00e1ch (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=H
+Home3DAttributesPanel.observerCameraElevationLabel.text=\u0110\u1ed9 cao c\u1ee7a m\u1eaft (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=A
 Home3DAttributesPanel.groundColorRadioButton.text=M\u00e0u \u0111\u1ea5t:
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=M
 Home3DAttributesPanel.groundColorDialog.title=M\u00e0u \u0111\u1ea5t
@@ -414,6 +416,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=X\u1eafp x\u1ebfp theo g\u00f3c
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=G
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=C\u1EA5p \u0111\u1ED9
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=X\u1eafp x\u1ebfp theo c\u1EA5p \u0111\u1ED9
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=P
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=M\u00e0u s\u1eafc
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=X\u1eafp x\u1ebfp theo m\u00e0u s\u1eafc
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=M
@@ -494,6 +500,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=Hi\u1ec3n th\u1ecb tr\u01b0\u1eddng g\u00f3c
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=G
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=C\u1EA5p \u0111\u1ED9
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=Hi\u1ec3n th\u1ecb tr\u01b0\u1eddng c\u1EA5p \u0111\u1ED9
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=P
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=M\u00e0u s\u1eafc
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=Hi\u1ec3n th\u1ecb tr\u01b0\u1eddng m\u00e0u s\u1eafc
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=M
@@ -635,6 +645,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=X\u00f3a \u1ea3nh n\u1ec1n
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=A
 
+HomePane.ADD_LEVEL.Name=Th�m c\u1EA5p \u0111\u1ED9
+HomePane.ADD_LEVEL.ShortDescription=Th�m c\u1EA5p \u0111\u1ED9 m\u1EDBi
+HomePane.ADD_LEVEL.MnemonicKey=C
+
+HomePane.MODIFY_LEVEL.Name=S\u1EEDa c\u1EA5p \u0111\u1ED9...
+HomePane.MODIFY_LEVEL.ShortDescription=S\u1EEDa c\u1EA5p \u0111\u1ED9 \u0111� ch\u1ECDn
+HomePane.MODIFY_LEVEL.MnemonicKey=S
+
+HomePane.DELETE_LEVEL.Name=X�a c\u1EA5p \u0111\u1ED9
+HomePane.DELETE_LEVEL.ShortDescription=X�a c\u1EA5p \u0111\u1ED9 \u0111� ch\u1ECDn
+HomePane.DELETE_LEVEL.MnemonicKey=X
+
 HomePane.ZOOM_IN.Name=Ph\u00f3ng to
 HomePane.ZOOM_IN.ShortDescription=Ph\u00f3ng to
 HomePane.ZOOM_IN.MnemonicKey=O
@@ -676,6 +698,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=Hi\u1ec3n th\u1ecb trong c\u1eeda s\u1ed5 ch\u00ednh
 HomePane.ATTACH_3D_VIEW.MnemonicKey=D
 
+HomePane.DISPLAY_ALL_LEVELS.Name=Hi\u1EC7n t\u1EA5t c\u1EA3 c�c c\u1EA5p \u0111\u1ED9
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=Hi\u1EC7n t\u1EA5t c\u1EA3 c�c c\u1EA5p \u0111\u1ED9 d\u1EA1ng 3D
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=N
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=Hi\u1EC7n c\u1EA5p \u0111\u1ED9 \u0111� ch\u1ECDn
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=Hi\u1EC7n c\u1EA5p \u0111\u1ED9 \u0111� ch\u1ECDn d\u1EA1ng 3D
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=C
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=S\u1eeda...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=S\u1eeda c\u00e1ch xem 3D
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=S
@@ -704,10 +734,23 @@
 HomePane.ABOUT.ShortDescription=Gi\u1edbi thi\u1ec7u v\u1ec1 Sweet Home 3D
 HomePane.ABOUT.MnemonicKey=G
 
+HomePane.SELECT_OBJECT_MENU.Name=Ch\u1ECDn \u0111\u1ED1i t\u01B0\u1EE3ng
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=V�ng
+HomePane.selectObject.furniture=C�i k\u1EC7
+HomePane.selectObject.wall=T\u01B0\u1EDDng %s
+HomePane.selectObject.floor=S�n %s
+HomePane.selectObject.ceiling=Tr\u1EA7n %s
+HomePane.selectObject.room=Ph�ng %s
+HomePane.selectObject.dimensionLine=\u0110\u01B0\u1EDDng k\u1EBB %s 
+HomePane.selectObject.label=Ch\u1EEF
+
 # Open / Save dialogs title
 HomePane.openHomeDialog.title=M\u1edf
 HomePane.importFurnitureLibraryDialog.title=L\u1ea5y th\u00eam th\u01b0 vi\u1ec7n
 HomePane.importTexturesLibraryDialog.title=L\u1ea5y th\u00eam th\u01b0 vi\u1ec7n n\u1ec1n
+HomePane.importLanguageLibraryDialog.title=Th�m ng�n ng\u1EEF m\u1EDBi
 HomePane.saveHomeDialog.title=L\u01b0u
 HomePane.printToPDFDialog.title=T\u1ea1o file PDF
 HomePane.exportToSVGDialog.title=Xu\u1ea5t ra file SVG
@@ -719,7 +762,7 @@
 HomePane.message.title=Th\u00f4ng b\u00e1o
 
 # Creation mode tips
-HomePane.CREATE_WALLS.tipTitle=C\u00e1ch t\u1ea1o T\u01b0\u1eddng
+HomePane.CREATE_WALLS.tipTitle=C\u00e1ch t\u1ea1o t\u01b0\u1eddng
 HomePane.CREATE_WALLS.tipMessage=<html><style type="text/css">p { margin: 0px 0px 5px 0px;}</style>\
     <p>Click chu\u1ed9t v\u00e0o \u0111i\u1ec3m b\u1eaft \u0111\u1ea7u mu\u1ed1n t\u1ea1o T\u01b0\u1eddng tr\u00ean h\u00ecnh, sau \u0111\u00f3 \
     <br>click ho\u1eb7c click \u0111\u00fap v\u00e0o \u0111i\u1ec3m mu\u1ed1n k\u1ebft th\u00fac t\u01b0\u1eddng. \
@@ -851,11 +894,14 @@
     <br>B\u1ea1n h\u00e3y ch\u1ecdn m\u1eabu kh\u00e1c.
 
 ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>Ki\u1ec3m tra m\u1eabu cho \u0111\u00fang g\u00f3c quan s\u00e1t. N\u1ebfu th\u1ea5y ch\u01b0a \u0111\u00fang b\u1ea1n h\u00e3y thay\
-    <br>\u0111\u1ed5i b\u1eb1ng c\u00e1ch ch\u1ecdn c\u00e1c n\u00fat l\u00ean xu\u1ed1ng tr\u00e1i ph\u1ea3i b\u00ean c\u1ea1nh cho \u0111\u00fang.
+    <br>\u0111\u1ed5i b\u1eb1ng c\u00e1ch ch\u1ecdn c\u00e1c n\u00fat l\u00ean xu\u1ed1ng tr\u00e1i ph\u1ea3i b\u00ean c\u1ea1nh cho \u0111\u00fang.\
+    <br>\u1EA4n ph�m <i>Shift</i> trong khi click chu\u1ED9t v�o m\u0169i t�n \u0111\u1EC3 xoay m\u1EABu.
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=Nh\u00ecn t\u1eeb ph\u00eda tr\u01b0\u1edbc
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=Nh\u00ecn t\u1eeb b\u00ean ph\u1ea3i
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=Nh\u00ecn t\u1eeb tr\u00ean xu\u1ed1ng
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=Ph\u1ed1i c\u1ea3nh
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=Kh�i ph\u1EE5c h\u01B0\u1EDBng m\u1EB7c \u0111\u1ECBnh
+
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=N\u1ebfu m\u1eabu hi\u1ec3n th\u1ecb ch\u01b0a chu\u1ea9n, b\u1ea1n h\u00e3y check v\u00e0o \u0111\u00e2y \u0111\u1ec3 \u0111\u1ea3o ng\u01b0\u1ee3c b\u1ec1 m\u1eb7t.
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=\u0110\u1ea3o ng\u01b0\u1ee3c b\u1ec1 m\u1eb7t
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.mnemonic=I
@@ -881,6 +927,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=K
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=L\u00e0 c\u1eeda ho\u1eb7c c\u1eeda s\u1ed5
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=L
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=C\u1ea7u thang
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=H
 ImportedFurnitureWizardStepsPanel.colorLabel.text=M\u00e0u:
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=M
 ImportedFurnitureWizardStepsPanel.colorDialog.title=M\u00e0u v\u1eadt d\u1ee5ng
@@ -931,6 +979,28 @@
 LabelPanel.labelCreation.title=Th\u00eam ch\u1eef
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=T�n:
+LevelPanel.nameLabel.mnemonic=T
+LevelPanel.elevationLabel.text=\u0110\u1ECD cao (%s):
+LevelPanel.elevationLabel.mnemonic=A
+LevelPanel.floorThicknessLabel.text=\u0110\u1ED9 d�y s�n(%s):
+LevelPanel.floorThicknessLabel.mnemonic=D
+LevelPanel.heightLabel.text=Cao(%s):
+LevelPanel.heightLabel.mnemonic=C
+LevelPanel.levelsSummaryLabel.text=T\u1ED5ng h\u1EE3p th�ng tin c\u1EA5p \u0111\u1ED9 (\u0111� ch\u1ECDn):
+LevelPanel.nameColumn=T�n
+LevelPanel.elevationColumn=\u0110\u1ED9 cao
+LevelPanel.floorThicknessColumn=\u0110\u1ED9 d�y s�n
+LevelPanel.heightColumn=Cao
+
+LevelPanel.level.title=S\u1EEDa c\u1EA5p \u0111\u1ED9
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=Th�m c\u1EA5p \u0111\u1ED9
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=\u0110\u1ecbnh d\u1ea1ng trang
 PageSetupPanel.pageFormatButton.mnemonic=D
@@ -1144,10 +1214,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=Y
 UserPreferencesPanel.newWallHeightLabel.text=\u0110\u1ed9 cao c\u1ee7a t\u01b0\u1eddng:
 UserPreferencesPanel.newWallHeightLabel.mnemonic=A
+UserPreferencesPanel.newFloorThicknessLabel.text=\u0110\u1ED9 d�y s�n m\u1EDBi:
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=S
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=L\u01b0u d\u1eef li\u1ec7u c\u1ee7a b\u1ea1n theo:
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=ph\u00fat
 UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=L
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=Th�m ng�n ng\u1EEF m\u1EDBi
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=Kh\u00f4i ph\u1ee5c hi\u1ec3n th\u1ecb h\u01b0\u1edbng d\u1eabn
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=P
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_zh_CN.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_zh_CN.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/package_zh_CN.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/package_zh_CN.properties	2011-12-21 00:48:52.000000000 +0000
@@ -109,6 +109,7 @@
 FurnitureTable.yColumn=Y
 FurnitureTable.elevationColumn=\u60ac\u7a7a\u9ad8\u5ea6
 FurnitureTable.angleColumn=\u89d2\u5ea6
+FurnitureTable.levelColumn=\u697C\u5C42
 FurnitureTable.colorColumn=\u989c\u8272
 FurnitureTable.textureColumn=\u7eb9\u7406
 FurnitureTable.movableColumn=\u53ef\u79fb\u52a8
@@ -145,6 +146,8 @@
 Home3DAttributesPanel.observerFieldOfViewLabel.mnemonic=F
 Home3DAttributesPanel.observerHeightLabel.text=\u53c2\u89c2\u8005\u8eab\u9ad8 (%s):
 Home3DAttributesPanel.observerHeightLabel.mnemonic=H
+Home3DAttributesPanel.observerCameraElevationLabel.text=\u89c6\u7ebf\u9ad8\u5ea6(E) (%s):
+Home3DAttributesPanel.observerCameraElevationLabel.mnemonic=E
 Home3DAttributesPanel.groundColorRadioButton.text=\u5730\u9762\u989c\u8272(G):
 Home3DAttributesPanel.groundColorRadioButton.mnemonic=G
 Home3DAttributesPanel.groundColorDialog.title=\u5730\u9762\u989c\u8272
@@ -412,6 +415,10 @@
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.ShortDescription=\u6309\u7167\u89d2\u5ea6\u6392\u5217\u7269\u4ef6\u56fe\u6807
 HomePane.SORT_HOME_FURNITURE_BY_ANGLE.MnemonicKey=G
 
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.Name=\u697C\u5C42(L)
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.ShortDescription=\u6309\u7167\u697C\u5C42\u6392\u5217\u7269\u4EF6\u56FE\u6807
+HomePane.SORT_HOME_FURNITURE_BY_LEVEL.MnemonicKey=L
+
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.Name=\u989c\u8272(C)
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.ShortDescription=\u6309\u7167\u989c\u8272\u6392\u5217\u7269\u4ef6\u56fe\u6807
 HomePane.SORT_HOME_FURNITURE_BY_COLOR.MnemonicKey=C
@@ -492,6 +499,10 @@
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.ShortDescription=\u663e\u793a\u89d2\u5ea6\u5217
 HomePane.DISPLAY_HOME_FURNITURE_ANGLE.MnemonicKey=G
 
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.Name=\u697C\u5C42(L)
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.ShortDescription=\u663E\u793A\u697C\u5C42\u5217
+HomePane.DISPLAY_HOME_FURNITURE_LEVEL.MnemonicKey=L
+
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.Name=\u989c\u8272(C)
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.ShortDescription=\u663e\u793a\u989c\u8272\u5217
 HomePane.DISPLAY_HOME_FURNITURE_COLOR.MnemonicKey=C
@@ -633,6 +644,18 @@
 HomePane.DELETE_BACKGROUND_IMAGE.ShortDescription=\u5220\u9664\u663e\u793a\u4e3a\u5e73\u9762\u56fe\u80cc\u666f\u7684\u56fe\u50cf
 HomePane.DELETE_BACKGROUND_IMAGE.MnemonicKey=D
 
+HomePane.ADD_LEVEL.Name=\u6DFB\u52A0\u697C\u5C42(V)
+HomePane.ADD_LEVEL.ShortDescription=\u5728\u5BB6\u5177\u6A21\u578B\u4E2D\u6DFB\u52A0\u65B0\u7684\u697C\u5C42
+HomePane.ADD_LEVEL.MnemonicKey=V
+
+HomePane.MODIFY_LEVEL.Name=\u81EA\u5B9A\u4E49\u697C\u5C42(I)...
+HomePane.MODIFY_LEVEL.ShortDescription=\u81EA\u5B9A\u4E49\u9009\u5B9A\u7684\u697C\u5C42
+HomePane.MODIFY_LEVEL.MnemonicKey=I
+
+HomePane.DELETE_LEVEL.Name=\u5220\u9664\u697C\u5C42(D)
+HomePane.DELETE_LEVEL.ShortDescription=\u4ECE\u5BB6\u5C45\u6A21\u578B\u4E2D\u5220\u9664\u9009\u5B9A\u7684\u697C\u5C42
+HomePane.DELETE_LEVEL.MnemonicKey=D
+
 HomePane.ZOOM_IN.Name=\u653e\u5927(Z)
 HomePane.ZOOM_IN.ShortDescription=\u653e\u5927
 HomePane.ZOOM_IN.MnemonicKey=Z
@@ -674,6 +697,14 @@
 HomePane.ATTACH_3D_VIEW.ShortDescription=\u5728\u4e3b\u7a97\u53e3\u4e2d\u663e\u793a 3D \u89c6\u56fe\u7684\u5185\u5bb9
 HomePane.ATTACH_3D_VIEW.MnemonicKey=D
 
+HomePane.DISPLAY_ALL_LEVELS.Name=\u663E\u793A\u6240\u6709\u697C\u5C42(L)
+HomePane.DISPLAY_ALL_LEVELS.ShortDescription=\u5728 3D \u89C6\u56FE\u4E2D\u663E\u793A\u6240\u6709\u697C\u5C42
+HomePane.DISPLAY_ALL_LEVELS.MnemonicKey=L
+
+HomePane.DISPLAY_SELECTED_LEVEL.Name=\u663E\u793A\u9009\u5B9A\u697C\u5C42(C)
+HomePane.DISPLAY_SELECTED_LEVEL.ShortDescription=\u5728 3D \u89C6\u56FE\u4E2D\u663E\u793A\u9009\u5B9A\u7684\u697C\u5C42
+HomePane.DISPLAY_SELECTED_LEVEL.MnemonicKey=C
+
 HomePane.MODIFY_3D_ATTRIBUTES.Name=\u81ea\u5b9a\u4e49(M)...
 HomePane.MODIFY_3D_ATTRIBUTES.ShortDescription=\u81ea\u5b9a\u4e49 3D \u89c6\u56fe\u7684\u5916\u89c2
 HomePane.MODIFY_3D_ATTRIBUTES.MnemonicKey=M
@@ -703,10 +734,23 @@
 HomePane.ABOUT.ShortDescription=\u663e\u793a\u5173\u4e8e Sweet Home 3D \u7684\u4fe1\u606f
 HomePane.ABOUT.MnemonicKey=A
 
+HomePane.SELECT_OBJECT_MENU.Name=\u9009\u62E9\u5BF9\u8C61(O)
+HomePane.SELECT_OBJECT_MENU.MnemonicKey=O
+
+HomePane.selectObject.compass=\u7F57\u76D8
+HomePane.selectObject.furniture=\u7269\u4EF6
+HomePane.selectObject.wall=\u5899\u4F53\uFF1A%s
+HomePane.selectObject.floor=\u5730\u9762\uFF1A%s
+HomePane.selectObject.ceiling=\u5929\u82B1\u677F\uFF1A%s
+HomePane.selectObject.room=\u623F\u95F4\uFF1A%s
+HomePane.selectObject.dimensionLine=\u6807\u6CE8\u7EBF\uFF1A%s
+HomePane.selectObject.label=\u6587\u672C
+
 # Open / Save dialogs title
 HomePane.openHomeDialog.title=\u6253\u5f00
 HomePane.importFurnitureLibraryDialog.title=\u5bfc\u5165\u7269\u4ef6\u5e93
 HomePane.importTexturesLibraryDialog.title=\u5bfc\u5165\u7eb9\u7406\u5e93
+HomePane.importLanguageLibraryDialog.title=\u5BFC\u5165\u8BED\u8A00\u5E93
 HomePane.saveHomeDialog.title=\u4fdd\u5b58
 HomePane.printToPDFDialog.title=\u6253\u5370\u5230 PDF
 HomePane.exportToSVGDialog.title=\u5bfc\u51fa\u4e3a SVG \u683c\u5f0f
@@ -831,11 +875,14 @@
 ImportedFurnitureWizardStepsPanel.modelChoiceError=\u65e0\u6cd5\u8bfb\u53d6\u6587\u4ef6\n\u201c%s\u201d
 ImportedFurnitureWizardStepsPanel.modelChoiceFormatError=<html>\u6240\u9009\u6a21\u578b\u7684\u683c\u5f0f\u4e0d\u88ab\u652f\u6301\u3002<br>\u8bf7\u9009\u62e9\u5176\u5b83\u6a21\u578b\u3002
 
-ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>\u8bf7\u68c0\u67e5\u6a21\u578b\u662f\u5426\u88ab\u6b63\u786e\u5b9a\u5411\u3002\u5982\u679c\u4e0d\u6b63\u786e\uff0c\u8bf7\u4f7f\u7528\u7bad\u5934\u6309\u94ae\u8fdb\u884c\u66f4\u6539\uff0c\u76f4\u81f3\u4e3b\u89c6\u56fe<br>\u4e0e\u6a21\u578b\u7684\u6b63\u9762\u76f8\u7b26\u3002
+ImportedFurnitureWizardStepsPanel.orientationLabel.text=<html>\u8bf7\u68c0\u67e5\u6a21\u578b\u662f\u5426\u88ab\u6b63\u786e\u5b9a\u5411\u3002\u5982\u679c\u4e0d\u6b63\u786e\uff0c\u8bf7\u4f7f\u7528\u7bad\u5934\u6309\u94ae\u8fdb\u884c\u66f4\u6539\uff0c\u76f4\u81f3\u4e3b\u89c6\u56fe<br>\u4e0e\u6a21\u578b\u7684\u6b63\u9762\u76f8\u7b26\u3002\
+	\u6309\u4F4F <i>Shift</i> \u952E\u5355\u51FB\u7BAD\u5934\u53EF\u4EE5\u66F4\u7CBE\u7EC6\u5730\u65CB\u8F6C\u6A21\u578B\u3002
 ImportedFurnitureWizardStepsPanel.frontViewLabel.text=\u4e3b\u89c6\u56fe
 ImportedFurnitureWizardStepsPanel.sideViewLabel.text=\u53f3\u89c6\u56fe
 ImportedFurnitureWizardStepsPanel.topViewLabel.text=\u4fef\u89c6\u56fe
 ImportedFurnitureWizardStepsPanel.perspectiveViewLabel.text=\u900f\u89c6\u56fe
+ImportedFurnitureWizardStepsPanel.DEFAULT_ORIENTATION.ShortDescription=\u91CD\u7F6E\u4E3A\u9ED8\u8BA4\u5B9A\u5411
+
 ImportedFurnitureWizardStepsPanel.backFaceShownLabel.text=<html>\u5982\u679c\u6a21\u578b\u8c8c\u4f3c\u6ca1\u6709\u88ab\u6b63\u786e\u6e32\u67d3\uff0c\u8bf7\u9009\u4e2d\u4e0b\u9762\u7684\u590d\u9009\u6846\u53cd\u8f6c\u6a21\u578b\u7684\u6b63\u53cd\u9762\u3002
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.text=\u7ffb\u8f6c\u6cd5\u7ebf(I)
 ImportedFurnitureWizardStepsPanel.backFaceShownCheckBox.mnemonic=I
@@ -861,6 +908,8 @@
 ImportedFurnitureWizardStepsPanel.movableCheckBox.mnemonic=M
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.text=\u95e8\u6216\u7a97(R)
 ImportedFurnitureWizardStepsPanel.doorOrWindowCheckBox.mnemonic=R
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.text=\u697c\u68af(S)
+ImportedFurnitureWizardStepsPanel.staircaseCheckBox.mnemonic=S
 ImportedFurnitureWizardStepsPanel.colorLabel.text=\u989c\u8272(O):
 ImportedFurnitureWizardStepsPanel.colorLabel.mnemonic=O
 ImportedFurnitureWizardStepsPanel.colorDialog.title=\u7269\u4ef6\u989c\u8272
@@ -904,6 +953,28 @@
 LabelPanel.labelCreation.title=\u6dfb\u52a0\u6587\u672c
 
 
+# Resources for LevelPanel class
+LevelPanel.nameLabel.text=\u540D\u79F0(N):
+LevelPanel.nameLabel.mnemonic=N
+LevelPanel.elevationLabel.text=\u60AC\u7A7A\u9AD8\u5EA6(E) (%s):
+LevelPanel.elevationLabel.mnemonic=E
+LevelPanel.floorThicknessLabel.text=\u697C\u677F\u539A\u5EA6(T) (%s):
+LevelPanel.floorThicknessLabel.mnemonic=T
+LevelPanel.heightLabel.text=\u9AD8\u5EA6(H) (%s):
+LevelPanel.heightLabel.mnemonic=H
+LevelPanel.levelsSummaryLabel.text=\u697C\u5C42\u4E00\u89C8\u8868 (\u9009\u5B9A\u7684\u884C\u4E3A\u5F53\u524D\u6B63\u5728\u7F16\u8F91\u7684\u697C\u5C42):
+LevelPanel.nameColumn=\u540D\u79F0
+LevelPanel.elevationColumn=\u60AC\u7A7A\u9AD8\u5EA6
+LevelPanel.floorThicknessColumn=\u697C\u677F\u539A\u5EA6
+LevelPanel.heightColumn=\u9AD8\u5EA6
+
+LevelPanel.level.title=\u81EA\u5B9A\u4E49\u697C\u5C42
+
+
+# Resources for MultipleLevelsPlanPanel class
+MultipleLevelsPlanPanel.ADD_LEVEL.ShortDescription=\u6DFB\u52A0\u697C\u5C42
+
+
 # Resources for PageSetupPanel class
 PageSetupPanel.pageFormatButton.text=\u9875\u9762\u683c\u5f0f(A)
 PageSetupPanel.pageFormatButton.mnemonic=A
@@ -1113,10 +1184,14 @@
 UserPreferencesPanel.newWallThicknessLabel.mnemonic=K
 UserPreferencesPanel.newWallHeightLabel.text=\u65b0\u5efa\u5899\u4f53\u9ad8\u5ea6(H):
 UserPreferencesPanel.newWallHeightLabel.mnemonic=H
-UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=\u81ea\u52a8\u4fdd\u5b58\u5bb6\u5c45\u6a21\u578b\u7684\u95f4\u9694\u65f6\u95f4(F):
-UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=F
+UserPreferencesPanel.newFloorThicknessLabel.text=\u65B0\u5EFA\u5899\u4F53\u539A\u5EA6(F)
+UserPreferencesPanel.newFloorThicknessLabel.mnemonic=F
+UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.text=\u81ea\u52a8\u4fdd\u5b58\u5bb6\u5c45\u6a21\u578b\u7684\u95f4\u9694\u65f6\u95f4(Y):
+UserPreferencesPanel.autoSaveDelayForRecoveryCheckBox.mnemonic=Y
 UserPreferencesPanel.autoSaveDelayForRecoveryUnitLabel.text=\u5206\u949f
 
+UserPreferencesPanel.IMPORT_LANGUAGE_LIBRARY.tooltip=\u5BFC\u5165\u8BED\u8A00\u5E93\u6587\u4EF6
+
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.Name=\u8fd8\u539f\u64cd\u4f5c\u63d0\u793a\u7684\u663e\u793a(R)
 UserPreferencesPanel.RESET_DISPLAYED_ACTION_TIPS.MnemonicKey=R
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/PageSetupPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/PageSetupPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/PageSetupPanel.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/PageSetupPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -35,6 +35,7 @@
 import java.awt.print.PrinterJob;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.security.AccessControlException;
 
 import javax.swing.ActionMap;
 import javax.swing.ButtonGroup;
@@ -281,9 +282,17 @@
    */
   private void updateComponents(HomePrint homePrint) {
     this.pageFormat = HomePrintableComponent.getPageFormat(homePrint);
+    boolean no3D;
+    try {
+      no3D = Boolean.getBoolean("com.eteks.sweethome3d.no3D");
+    } catch (AccessControlException ex) {
+      // If com.eteks.sweethome3d.no3D property can't be read, 
+      // security manager won't allow to access to Java 3D DLLs required to print 3D images too
+      no3D = true;
+    }
     // Check if off screen image is supported 
     boolean offscreenCanvas3DSupported;
-    if ("true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D"))) {
+    if (no3D) {
       offscreenCanvas3DSupported = false;
     } else { 
       offscreenCanvas3DSupported = Component3DManager.getInstance().isOffScreenImageSupported();
@@ -324,7 +333,7 @@
       this.footerFormatTextField.setText("");
     }
     this.view3DPrintedCheckBox.setEnabled(offscreenCanvas3DSupported);
-    this.view3DPrintedCheckBox.setVisible(!"true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D")));
+    this.view3DPrintedCheckBox.setVisible(!no3D);
   }
 
   /**
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/PhotoPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/PhotoPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/PhotoPanel.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/PhotoPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -28,6 +28,8 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.Window;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
@@ -875,6 +877,7 @@
       dialog.setModal(false);
      
       Component homeRoot = SwingUtilities.getRoot((Component)parentView);
+      Point dialogLocation = null;
       if (homeRoot != null) {
         // Restore location if it exists
         Integer x = (Integer)this.home.getVisualProperty(PHOTO_DIALOG_X_VISUAL_PROPERTY);
@@ -899,16 +902,19 @@
         if (x != null && y != null 
             && x + dialogWidth <= screenRightBorder
             && y + dialogHeight <= screenBottomBorder) {
-          dialog.setLocation(x, y);
+          dialogLocation = new Point(x, y);
         } else if (screenRightBorder - windowRightBorder > dialogWidth / 2
                    || dialogHeight == screenHeight) {
           // If there some space left at the right of the window,
           // move the dialog to the right of window
-          dialog.setLocation(Math.min(windowRightBorder + 5, screenRightBorder - dialogWidth), 
+          dialogLocation = new Point(Math.min(windowRightBorder + 5, screenRightBorder - dialogWidth), 
               Math.max(Math.min(homeRoot.getY(), screenSize.height - dialogHeight - screenInsets.bottom), screenInsets.top));
-        } else {
-          dialog.setLocationByPlatform(true);
         }
+      }
+      if (dialogLocation != null
+          && SwingTools.isRectangleVisibleAtScreen(new Rectangle(dialogLocation, dialog.getSize()))) {
+        dialog.setLocationByPlatform(false);
+        dialog.setLocation(dialogLocation);
       } else {
         dialog.setLocationByPlatform(true);
       }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/PlanComponent.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/PlanComponent.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/PlanComponent.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/PlanComponent.java	2011-12-21 00:48:52.000000000 +0000
@@ -81,6 +81,7 @@
 import java.io.OutputStream;
 import java.lang.ref.WeakReference;
 import java.net.URL;
+import java.security.AccessControlException;
 import java.text.Format;
 import java.text.NumberFormat;
 import java.text.ParseException;
@@ -91,6 +92,7 @@
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -165,6 +167,7 @@
 import com.eteks.sweethome3d.model.Compass;
 import com.eteks.sweethome3d.model.Content;
 import com.eteks.sweethome3d.model.DimensionLine;
+import com.eteks.sweethome3d.model.Elevatable;
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomeDoorOrWindow;
 import com.eteks.sweethome3d.model.HomeFurnitureGroup;
@@ -173,6 +176,7 @@
 import com.eteks.sweethome3d.model.HomeTexture;
 import com.eteks.sweethome3d.model.Label;
 import com.eteks.sweethome3d.model.LengthUnit;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.ObserverCamera;
 import com.eteks.sweethome3d.model.Room;
 import com.eteks.sweethome3d.model.Sash;
@@ -180,6 +184,7 @@
 import com.eteks.sweethome3d.model.SelectionEvent;
 import com.eteks.sweethome3d.model.SelectionListener;
 import com.eteks.sweethome3d.model.TextStyle;
+import com.eteks.sweethome3d.model.TextureImage;
 import com.eteks.sweethome3d.model.UserPreferences;
 import com.eteks.sweethome3d.model.Wall;
 import com.eteks.sweethome3d.tools.OperatingSystem;
@@ -242,21 +247,25 @@
   private boolean               resizeIndicatorVisible;
   
   private Map<PlanController.EditableProperty, JFormattedTextField> toolTipEditableTextFields;
-  private KeyListener                 toolTipKeyListener;
+  private KeyListener                       toolTipKeyListener;
   
-  private List<HomePieceOfFurniture>  sortedHomeFurniture;
-  private List<Room>                  sortedHomeRooms;
-  private Map<TextStyle, Font>        fonts;
-  private Map<TextStyle, FontMetrics> fontsMetrics;
-  
-  private Rectangle2D                 planBoundsCache;  
-  private boolean                     planBoundsCacheValid = false;  
-  private BufferedImage               backgroundImageCache;
-  private BufferedImage               wallsPatternImageCache;
-  private Color                       wallsPatternBackgroundCache;
-  private Color                       wallsPatternForegroundCache;
-  private Area                        wallsAreaCache;
-  private Map<Content, BufferedImage> floorTextureImagesCache;
+  private List<HomePieceOfFurniture>        sortedLevelFurniture;
+  private List<Room>                        sortedLevelRooms;
+  private Map<TextStyle, Font>              fonts;
+  private Map<TextStyle, FontMetrics>       fontsMetrics;
+  
+  private Rectangle2D                       planBoundsCache;  
+  private boolean                           planBoundsCacheValid = false;  
+  private BufferedImage                     backgroundImageCache;
+  private Map<TextureImage, BufferedImage>  patternImagesCache;
+  private List<Wall>                        otherLevelWallsCache;
+  private Area                              otherLevelWallAreaCache;
+  private List<Room>                        otherLevelRoomsCache;
+  private Area                              otherLevelRoomAreaCache;
+  private Color                             wallsPatternBackgroundCache;
+  private Color                             wallsPatternForegroundCache;
+  private Map<Collection<Wall>, Area>       wallAreasCache;
+  private Map<Content, BufferedImage>       floorTextureImagesCache;
   private Map<HomePieceOfFurniture, PieceOfFurnitureTopViewIcon> furnitureTopViewIconsCache;
 
   private static final Shape       POINT_INDICATOR;
@@ -520,7 +529,8 @@
   /**
    * Creates a new plan that displays <code>home</code>.
    */
-  public PlanComponent(Home home, UserPreferences preferences,
+  public PlanComponent(Home home, 
+                       UserPreferences preferences,
                        PlanController controller) {
     this.home = home;
     this.preferences = preferences;
@@ -550,6 +560,7 @@
     this.panningCursor = createCustomCursor("resources/cursors/panning16x16.png",
         "resources/cursors/panning32x32.png", "Panning cursor", Cursor.HAND_CURSOR);
     this.duplicationCursor = DragSource.DefaultCopyDrop;
+    this.patternImagesCache = new HashMap<TextureImage, BufferedImage>();
     // Install default colors
     super.setForeground(UIManager.getColor("textText"));
     super.setBackground(UIManager.getColor("window"));
@@ -576,10 +587,12 @@
               furnitureTopViewIconsCache.remove(piece);
             }
             repaint();
-          } else if (HomePieceOfFurniture.Property.ELEVATION.name().equals(ev.getPropertyName())) {
-            sortedHomeFurniture = null;
+          } else if (HomePieceOfFurniture.Property.ELEVATION.name().equals(ev.getPropertyName())
+                     || HomePieceOfFurniture.Property.LEVEL.name().equals(ev.getPropertyName())
+                     || HomePieceOfFurniture.Property.HEIGHT.name().equals(ev.getPropertyName())) {
+            sortedLevelFurniture = null;
             repaint();
-          } else if (!HomePieceOfFurniture.Property.HEIGHT.name().equals(ev.getPropertyName())) {
+          } else {
             revalidate();
           }
         }
@@ -594,7 +607,7 @@
           } else if (ev.getType() == CollectionEvent.Type.DELETE) {
             ev.getItem().removePropertyChangeListener(furnitureChangeListener);
           }
-          sortedHomeFurniture = null;
+          sortedLevelFurniture = null;
           revalidate();
         }
       });
@@ -610,9 +623,17 @@
               || Wall.Property.WALL_AT_START.name().equals(propertyName)
               || Wall.Property.WALL_AT_END.name().equals(propertyName)
               || Wall.Property.THICKNESS.name().equals(propertyName)
-              || Wall.Property.ARC_EXTENT.name().equals(propertyName)) {
-            wallsAreaCache = null;
+              || Wall.Property.ARC_EXTENT.name().equals(propertyName)
+              || Wall.Property.PATTERN.name().equals(propertyName)) {
+            wallAreasCache = null;
             revalidate();
+          } else if (Wall.Property.LEVEL.name().equals(propertyName)
+              || Wall.Property.HEIGHT.name().equals(propertyName)
+              || Wall.Property.HEIGHT_AT_END.name().equals(propertyName)) {
+            otherLevelWallAreaCache = null;
+            otherLevelWallsCache = null;
+            wallAreasCache = null;
+            repaint();
           }
         }
       };
@@ -626,7 +647,9 @@
           } else if (ev.getType() == CollectionEvent.Type.DELETE) {
             ev.getItem().removePropertyChangeListener(wallChangeListener);
           }
-          wallsAreaCache = null;
+          otherLevelWallAreaCache = null;
+          otherLevelWallsCache = null;
+          wallAreasCache = null;
           revalidate();
         }
       });
@@ -634,21 +657,24 @@
     // Add listener to update plan when rooms change
     final PropertyChangeListener roomChangeListener = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
-          if (Room.Property.POINTS.name().equals(ev.getPropertyName())
-              || Room.Property.NAME.name().equals(ev.getPropertyName())
-              || Room.Property.NAME_X_OFFSET.name().equals(ev.getPropertyName())
-              || Room.Property.NAME_Y_OFFSET.name().equals(ev.getPropertyName())
-              || Room.Property.NAME_STYLE.name().equals(ev.getPropertyName())
-              || Room.Property.AREA_VISIBLE.name().equals(ev.getPropertyName())
-              || Room.Property.AREA_X_OFFSET.name().equals(ev.getPropertyName())
-              || Room.Property.AREA_Y_OFFSET.name().equals(ev.getPropertyName())
-              || Room.Property.AREA_STYLE.name().equals(ev.getPropertyName())) {
-            sortedHomeRooms = null;
+          String propertyName = ev.getPropertyName();
+          if (Room.Property.POINTS.name().equals(propertyName)
+              || Room.Property.NAME.name().equals(propertyName)
+              || Room.Property.NAME_X_OFFSET.name().equals(propertyName)
+              || Room.Property.NAME_Y_OFFSET.name().equals(propertyName)
+              || Room.Property.NAME_STYLE.name().equals(propertyName)
+              || Room.Property.AREA_VISIBLE.name().equals(propertyName)
+              || Room.Property.AREA_X_OFFSET.name().equals(propertyName)
+              || Room.Property.AREA_Y_OFFSET.name().equals(propertyName)
+              || Room.Property.AREA_STYLE.name().equals(propertyName)) {
+            sortedLevelRooms = null;
+            otherLevelRoomsCache = null;
+            otherLevelRoomAreaCache = null;
             revalidate();
           } else if (preferences.isRoomFloorColoredOrTextured()
-                     && (Room.Property.FLOOR_COLOR.name().equals(ev.getPropertyName())
-                         || Room.Property.FLOOR_TEXTURE.name().equals(ev.getPropertyName())
-                         || Room.Property.FLOOR_VISIBLE.name().equals(ev.getPropertyName()))) {
+                     && (Room.Property.FLOOR_COLOR.name().equals(propertyName)
+                         || Room.Property.FLOOR_TEXTURE.name().equals(propertyName)
+                         || Room.Property.FLOOR_VISIBLE.name().equals(propertyName))) {
             repaint(); 
           }
         }
@@ -663,7 +689,9 @@
           } else if (ev.getType() == CollectionEvent.Type.DELETE) {
             ev.getItem().removePropertyChangeListener(roomChangeListener);
           }
-          sortedHomeRooms = null;
+          sortedLevelRooms = null;
+          otherLevelRoomsCache = null;
+          otherLevelRoomAreaCache = null;
           revalidate();
         }
       });
@@ -708,14 +736,54 @@
         }
       });
 
+    // Add listener to update plan when levels change
+    final PropertyChangeListener levelChangeListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          String propertyName = ev.getPropertyName();
+          if (Level.Property.BACKGROUND_IMAGE.name().equals(propertyName)) {
+            backgroundImageCache = null;
+            revalidate();
+          } else if (Level.Property.ELEVATION.name().equals(propertyName)) {
+            otherLevelWallAreaCache = null;
+            otherLevelWallsCache = null;
+            otherLevelRoomsCache = null;
+            otherLevelRoomAreaCache = null;
+            wallAreasCache = null;
+            sortedLevelFurniture = null;
+            repaint();
+          }
+        }
+      };
+    for (Level level : home.getLevels()) {
+      level.addPropertyChangeListener(levelChangeListener);
+    }
+    home.addLevelsListener(new CollectionListener<Level> () {
+        public void collectionChanged(CollectionEvent<Level> ev) {
+          Level level = ev.getItem();
+          if (ev.getType() == CollectionEvent.Type.ADD) {
+            level.addPropertyChangeListener(levelChangeListener);
+          } else if (ev.getType() == CollectionEvent.Type.DELETE) {
+            level.removePropertyChangeListener(levelChangeListener);
+          }
+          revalidate();
+        }
+      });
+
+    home.addPropertyChangeListener(Home.Property.CAMERA, new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          revalidate();
+        }
+      });
     home.getObserverCamera().addPropertyChangeListener(new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
           String propertyName = ev.getPropertyName();
           if (Camera.Property.X.name().equals(propertyName)
               || Camera.Property.Y.name().equals(propertyName) 
-              || Camera.Property.Z.name().equals(propertyName)
               || Camera.Property.FIELD_OF_VIEW.name().equals(propertyName)
-              || Camera.Property.YAW.name().equals(propertyName)) {
+              || Camera.Property.YAW.name().equals(propertyName)
+              || ObserverCamera.Property.WIDTH.name().equals(propertyName)
+              || ObserverCamera.Property.DEPTH.name().equals(propertyName) 
+              || ObserverCamera.Property.HEIGHT.name().equals(propertyName)) {
             revalidate();
           }
         }
@@ -744,6 +812,19 @@
           repaint();
         }
       });
+    home.addPropertyChangeListener(Home.Property.SELECTED_LEVEL, new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          backgroundImageCache = null;
+          otherLevelWallAreaCache = null;
+          otherLevelWallsCache = null;
+          otherLevelRoomsCache = null;
+          otherLevelRoomAreaCache = null;
+          wallAreasCache = null;
+          sortedLevelRooms = null;
+          sortedLevelFurniture = null;
+          repaint();
+        }
+      });
     preferences.addPropertyChangeListener(UserPreferences.Property.UNIT, 
         new UserPreferencesChangeListener(this));
     preferences.addPropertyChangeListener(UserPreferences.Property.LANGUAGE, 
@@ -809,7 +890,7 @@
             }
             break;
           case WALL_PATTERN :
-            planComponent.wallsPatternImageCache = null;
+            planComponent.wallAreasCache = null;
             break;
           case FURNITURE_VIEWED_FROM_TOP :
             if (planComponent.furnitureTopViewIconsCache != null
@@ -1265,11 +1346,20 @@
         // Ensure plan bounds are 10 x 10 meters wide at minimum
         this.planBoundsCache = new Rectangle2D.Float(0, 0, 1000, 1000);
       }
-      // Enlarge plan bounds to include background image, home bounds and observer camera
+      // Enlarge plan bounds to include background images, home bounds and observer camera
       if (this.backgroundImageCache != null) {
         BackgroundImage backgroundImage = this.home.getBackgroundImage();
-        this.planBoundsCache.add(this.backgroundImageCache.getWidth() * backgroundImage.getScale() - backgroundImage.getXOrigin(),
-            this.backgroundImageCache.getHeight() * backgroundImage.getScale() - backgroundImage.getYOrigin());
+        if (backgroundImage != null) {
+          this.planBoundsCache.add(this.backgroundImageCache.getWidth() * backgroundImage.getScale() - backgroundImage.getXOrigin(),
+              this.backgroundImageCache.getHeight() * backgroundImage.getScale() - backgroundImage.getYOrigin());
+        }
+        for (Level level : this.home.getLevels()) {
+          BackgroundImage levelBackgroundImage = level.getBackgroundImage();
+          if (levelBackgroundImage != null) {
+            this.planBoundsCache.add(this.backgroundImageCache.getWidth() * levelBackgroundImage.getScale() - levelBackgroundImage.getXOrigin(),
+                this.backgroundImageCache.getHeight() * levelBackgroundImage.getScale() - levelBackgroundImage.getYOrigin());
+          }
+        }
       }
       Rectangle2D homeItemsBounds = getItemsBounds(getGraphics(), getPaintedItems());
       if (homeItemsBounds != null) {
@@ -1285,7 +1375,7 @@
   
   /**
    * Returns the collection of walls, furniture, rooms and dimension lines of the home 
-   * painted by this component.
+   * painted by this component wherever the level they belong to is selected or not.
    */
   protected List<Selectable> getPaintedItems() {
     List<Selectable> homeItems = new ArrayList<Selectable>(this.home.getWalls());
@@ -1854,10 +1944,12 @@
   }
 
   /**
-   * Paints background image.
+   * Paints background image and returns <code>true</code> if an image is painted.
    */
-  private void paintBackgroundImage(Graphics2D g2D, PaintMode paintMode) {
-    final BackgroundImage backgroundImage = this.home.getBackgroundImage();
+  private boolean paintBackgroundImage(Graphics2D g2D, PaintMode paintMode) {
+    final BackgroundImage backgroundImage = this.home.getSelectedLevel() == null 
+        ? this.home.getBackgroundImage()
+        : this.home.getSelectedLevel().getBackgroundImage();
     if (backgroundImage != null && backgroundImage.isVisible()) {
       if (this.backgroundImageCache == null && paintMode == PaintMode.PAINT) {
         // Load background image in an executor
@@ -1872,19 +1964,16 @@
         AffineTransform previousTransform = g2D.getTransform();
         g2D.translate(-backgroundImage.getXOrigin(), -backgroundImage.getYOrigin());
         g2D.scale(backgroundImage.getScale(), backgroundImage.getScale());
-        Composite oldComposite = g2D.getComposite();
-        if (oldComposite instanceof AlphaComposite) {
-          g2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 
-            ((AlphaComposite)oldComposite).getAlpha() * 0.7f));
-        } else {
-          g2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.7f));
-        }
+        Composite oldComposite = setTransparency(g2D, 0.7f);
         g2D.drawImage(this.backgroundImageCache != null
             ? this.backgroundImageCache
             : readImage(backgroundImage.getImage()), 0, 0, this);
         g2D.setComposite(oldComposite);
         g2D.setTransform(previousTransform);
       }
+      return true;
+    } else {
+      return false;
     }
   }
 
@@ -1908,6 +1997,86 @@
   } 
 
   /**
+   * Paints walls and rooms of lower levels or upper levels to help the user draw in the selected level. 
+   */
+  private void paintOtherLevels(Graphics2D g2D, float planScale, 
+                                Color backgroundColor, Color foregroundColor) {
+    List<Level> levels = this.home.getLevels();
+    Level selectedLevel = this.home.getSelectedLevel();
+    if (levels.size() > 1 
+        && selectedLevel != null) {
+      int selectedLevelIndex = levels.indexOf(selectedLevel);
+      boolean level0 = levels.get(0) == selectedLevel 
+          || levels.get(selectedLevelIndex - 1).getElevation() == selectedLevel.getElevation();
+      if (this.otherLevelRoomAreaCache == null
+          && (!level0 || levels.size() >= 2)) {
+        // Search floors in level 1 or ceilings in previous level 
+        Level otherLevel = levels.get(level0 && selectedLevelIndex < levels.size() - 1 
+            ? selectedLevelIndex + 1 
+            : selectedLevelIndex  - 1);
+        List<Room> otherLevelRooms = new ArrayList<Room>();
+        for (Room room : this.home.getRooms()) {
+          if (room.isAtLevel(otherLevel)
+              && (level0 && room.isFloorVisible()
+                  || !level0 && room.isCeilingVisible())) {
+            otherLevelRooms.add(room);
+          }
+        }
+        if (otherLevelRooms.size() > 0) {
+          this.otherLevelRoomAreaCache = getItemsArea(otherLevelRooms);
+          this.otherLevelRoomsCache = otherLevelRooms;
+        }
+      }
+      if (this.otherLevelRoomAreaCache != null) {
+        Composite oldComposite = setTransparency(g2D, 
+            this.preferences.isGridVisible() ? 0.2f : 0.1f);
+        g2D.setPaint(Color.GRAY);
+        g2D.fill(this.otherLevelRoomAreaCache);
+        g2D.setComposite(oldComposite);
+      }
+
+      if (this.otherLevelWallAreaCache == null) {
+        // Search visible walls in level 1 or in previous level 
+        Level otherLevel = levels.get(level0 && selectedLevelIndex < levels.size() - 1 
+            ? selectedLevelIndex + 1 
+            : selectedLevelIndex  - 1);
+        List<Wall> otherLevelwalls = new ArrayList<Wall>();
+        for (Wall wall : this.home.getWalls()) {
+          if (!isViewableAtSelectedLevel(wall)
+              && wall.isAtLevel(otherLevel)) {
+            otherLevelwalls.add(wall);
+          }
+        }
+        if (otherLevelwalls.size() > 0) {
+          this.otherLevelWallAreaCache = getItemsArea(otherLevelwalls);
+          this.otherLevelWallsCache = otherLevelwalls;
+        }
+      }
+      if (this.otherLevelWallAreaCache != null) {
+        Composite oldComposite = setTransparency(g2D, 
+            this.preferences.isGridVisible() ? 0.2f : 0.1f);
+        fillAndDrawArea(g2D, this.otherLevelWallAreaCache, planScale, 
+            getWallPaint(planScale, backgroundColor, foregroundColor, this.preferences.getWallPattern()), foregroundColor);
+        g2D.setComposite(oldComposite);
+      }
+    }
+  }
+
+  /**
+   * Sets the transparency composite to the given percentage and returns the old composite.
+   */
+  private Composite setTransparency(Graphics2D g2D, float alpha) {
+    Composite oldComposite = g2D.getComposite();
+    if (oldComposite instanceof AlphaComposite) {
+      g2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 
+        ((AlphaComposite)oldComposite).getAlpha() * alpha));
+    } else {
+      g2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
+    }
+    return oldComposite;
+  }
+
+  /**
    * Paints background grid lines.
    */
   private void paintGrid(Graphics2D g2D, float gridScale) {
@@ -2025,8 +2194,11 @@
                             Color backgroundColor, Color foregroundColor, PaintMode paintMode) throws InterruptedIOException {
     if (this.backgroundPainted) {
       paintBackgroundImage(g2D, paintMode);
-      if (paintMode == PaintMode.PAINT && this.preferences.isGridVisible()) {
-        paintGrid(g2D, planScale);
+      if (paintMode == PaintMode.PAINT) {
+        paintOtherLevels(g2D, planScale, backgroundColor, foregroundColor);
+        if (this.preferences.isGridVisible()) {
+          paintGrid(g2D, planScale);
+        }
       }
     }
     
@@ -2106,14 +2278,18 @@
                                 Color backgroundColor, Color foregroundColor, PaintMode paintMode) throws InterruptedIOException {
     Graphics2D g2D = (Graphics2D)g;
     List<Selectable> selectedItems = this.home.getSelectedItems();
-    if (this.sortedHomeFurniture == null) {
+    if (this.sortedLevelFurniture == null) {
       // Sort home furniture in elevation order
-      this.sortedHomeFurniture = 
-          new ArrayList<HomePieceOfFurniture>(this.home.getFurniture());
-      Collections.sort(this.sortedHomeFurniture,
+      this.sortedLevelFurniture = new ArrayList<HomePieceOfFurniture>();
+      for (HomePieceOfFurniture piece : this.home.getFurniture()) {
+        if (isViewableAtSelectedLevel(piece)) {
+          this.sortedLevelFurniture.add(piece);
+        }
+      }
+      Collections.sort(this.sortedLevelFurniture,
           new Comparator<HomePieceOfFurniture>() {
             public int compare(HomePieceOfFurniture piece1, HomePieceOfFurniture piece2) {
-              float elevationDelta = piece1.getElevation() - piece2.getElevation();
+              float elevationDelta = piece1.getGroundElevation() - piece2.getGroundElevation();
               if (elevationDelta < 0) {
                 return -1;
               } else if (elevationDelta > 0) {
@@ -2145,7 +2321,7 @@
     paintWalls(g2D, selectedItems, planScale, backgroundColor, foregroundColor, paintMode);
     
     checkCurrentThreadIsntInterrupted(paintMode);
-    paintFurniture(g2D, this.sortedHomeFurniture, selectedItems, 
+    paintFurniture(g2D, this.sortedLevelFurniture, selectedItems, 
         planScale, backgroundColor, foregroundColor, getFurnitureOutlineColor(), paintMode, true);
     
     checkCurrentThreadIsntInterrupted(paintMode);
@@ -2158,7 +2334,7 @@
     paintRoomsNameAndArea(g2D, selectedItems, planScale, foregroundColor, paintMode);
 
     checkCurrentThreadIsntInterrupted(paintMode);
-    paintFurnitureName(g2D, this.sortedHomeFurniture, selectedItems, planScale, foregroundColor, paintMode);
+    paintFurnitureName(g2D, this.sortedLevelFurniture, selectedItems, planScale, foregroundColor, paintMode);
 
     checkCurrentThreadIsntInterrupted(paintMode);
     paintLabels(g2D, this.home.getLabels(), selectedItems, selectionOutlinePaint, dimensionLinesSelectionOutlineStroke, 
@@ -2211,10 +2387,15 @@
    */
   private void paintRooms(Graphics2D g2D, List<Selectable> selectedItems, float planScale, 
                           Color foregroundColor, PaintMode paintMode) {
-    if (this.sortedHomeRooms == null) {
+    if (this.sortedLevelRooms == null) {
       // Sort home rooms in floor / floor-ceiling / ceiling order
-      this.sortedHomeRooms = new ArrayList<Room>(this.home.getRooms());
-      Collections.sort(this.sortedHomeRooms,
+      this.sortedLevelRooms = new ArrayList<Room>();
+      for (Room room : this.home.getRooms()) {
+        if (isViewableAtSelectedLevel(room)) {
+          this.sortedLevelRooms.add(room);
+        }
+      }
+      Collections.sort(this.sortedLevelRooms,
           new Comparator<Room>() {
             public int compare(Room room1, Room room2) {
               if (room1.isFloorVisible() == room2.isFloorVisible()
@@ -2233,10 +2414,9 @@
     Color defaultFillPaint = paintMode == PaintMode.PRINT 
         ? Color.WHITE
         : Color.GRAY;
-    Composite oldComposite = g2D.getComposite();
     // Draw rooms area
     g2D.setStroke(new BasicStroke(WALL_STROKE_WIDTH / planScale));
-    for (Room room : this.sortedHomeRooms) { 
+    for (Room room : this.sortedLevelRooms) { 
       boolean selectedRoom = selectedItems.contains(room);
       // In clipboard paint mode, paint room only if it is selected
       if (paintMode != PaintMode.CLIPBOARD
@@ -2257,7 +2437,19 @@
               if (textureImage == null
                   || textureImage == WAIT_TEXTURE_IMAGE) {
                 final boolean waitForTexture = paintMode != PaintMode.PAINT;
-                if ("true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D"))) {
+                if (!isTextureManagerAvailable()) {
+                  // Prefer to share textures images with texture manager if it's available
+                  TextureManager.getInstance().loadTexture(floorTexture.getImage(), waitForTexture,
+                      new TextureManager.TextureObserver() {
+                        public void textureUpdated(Texture texture) {
+                          floorTextureImagesCache.put(floorTexture.getImage(), 
+                              ((ImageComponent2D)texture.getImage(0)).getImage());
+                          if (!waitForTexture) {
+                            repaint();
+                          }
+                        }
+                      });
+                } else {
                   // Use icon manager if texture manager should be ignored
                   Icon textureIcon = IconManager.getInstance().getIcon(floorTexture.getImage(), 
                       waitForTexture ? null : this);
@@ -2273,33 +2465,17 @@
                     g2DIcon.dispose();
                     floorTextureImagesCache.put(floorTexture.getImage(), textureIconImage);
                   } 
-                } else { 
-                  // Prefer to share textures images with texture manager if it's available
-                  TextureManager.getInstance().loadTexture(floorTexture.getImage(), waitForTexture,
-                      new TextureManager.TextureObserver() {
-                        public void textureUpdated(Texture texture) {
-                          floorTextureImagesCache.put(floorTexture.getImage(), 
-                              ((ImageComponent2D)texture.getImage(0)).getImage());
-                          if (!waitForTexture) {
-                            repaint();
-                          }
-                        }
-                      });
                 }
                 textureImage = this.floorTextureImagesCache.get(floorTexture.getImage());
               }
+              
               g2D.setPaint(new TexturePaint(textureImage, 
                   new Rectangle2D.Float(0, 0, floorTexture.getWidth(), floorTexture.getHeight())));
             }
           }          
         }
         
-        if (oldComposite instanceof AlphaComposite) {
-          g2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 
-            ((AlphaComposite)oldComposite).getAlpha() * 0.75f));
-        } else {
-          g2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.75f));
-        }
+        Composite oldComposite = setTransparency(g2D, 0.75f);
         g2D.fill(getShape(room.getPoints()));
         g2D.setComposite(oldComposite);
 
@@ -2310,13 +2486,27 @@
   }
 
   /**
+   * Returns <code>true</code> if <code>TextureManager</code> can be used to manage textures.
+   * @return
+   */
+  private static boolean isTextureManagerAvailable() {
+    try {
+      return !Boolean.getBoolean("com.eteks.sweethome3d.no3D");
+    } catch (AccessControlException ex) {
+      // If com.eteks.sweethome3d.no3D can't be read, 
+      // security manager won't allow to access to Java 3D DLLs required by TextureManager class too 
+    }
+    return false;
+  }
+  
+  /**
    * Paints rooms name and area. 
    */
   private void paintRoomsNameAndArea(Graphics2D g2D, List<Selectable> selectedItems, float planScale, 
                                      Color foregroundColor, PaintMode paintMode) {
     g2D.setPaint(foregroundColor);
     Font previousFont = g2D.getFont();
-    for (Room room : this.sortedHomeRooms) { 
+    for (Room room : this.sortedLevelRooms) { 
       boolean selectedRoom = selectedItems.contains(room);
       // In clipboard paint mode, paint room only if it is selected
       if (paintMode != PaintMode.CLIPBOARD
@@ -2374,19 +2564,21 @@
     float scaleInverse = 1 / planScale;
     // Draw selection border
     for (Room room : rooms) {
-      g2D.setPaint(selectionOutlinePaint);
-      g2D.setStroke(selectionOutlineStroke);
-      g2D.draw(getShape(room.getPoints()));
-
-      if (indicatorPaint != null) {
-        g2D.setPaint(indicatorPaint);         
-        // Draw points of the room
-        for (float [] point : room.getPoints()) {
-          g2D.translate(point [0], point [1]);
-          g2D.scale(scaleInverse, scaleInverse);
-          g2D.setStroke(POINT_STROKE);
-          g2D.fill(WALL_POINT);
-          g2D.setTransform(previousTransform);
+      if (isViewableAtSelectedLevel(room)) {
+        g2D.setPaint(selectionOutlinePaint);
+        g2D.setStroke(selectionOutlineStroke);
+        g2D.draw(getShape(room.getPoints()));
+  
+        if (indicatorPaint != null) {
+          g2D.setPaint(indicatorPaint);         
+          // Draw points of the room
+          for (float [] point : room.getPoints()) {
+            g2D.translate(point [0], point [1]);
+            g2D.scale(scaleInverse, scaleInverse);
+            g2D.setStroke(POINT_STROKE);
+            g2D.fill(WALL_POINT);
+            g2D.setTransform(previousTransform);
+          }
         }
       }
     }
@@ -2395,7 +2587,9 @@
     g2D.setPaint(foregroundColor);
     g2D.setStroke(new BasicStroke(WALL_STROKE_WIDTH / planScale));
     for (Room room : rooms) { 
-      g2D.draw(getShape(room.getPoints()));
+      if (isViewableAtSelectedLevel(room)) {
+        g2D.draw(getShape(room.getPoints()));
+      }
     }
 
     // Paint resize indicators of the room if indicator paint exists
@@ -2403,10 +2597,12 @@
         && rooms.size() == 1 
         && indicatorPaint != null) {
       Room selectedRoom = rooms.iterator().next();
-      g2D.setPaint(indicatorPaint);         
-      paintRoomResizeIndicators(g2D, selectedRoom, indicatorPaint, planScale);
-      paintRoomNameOffsetIndicator(g2D, selectedRoom, indicatorPaint, planScale);
-      paintRoomAreaOffsetIndicator(g2D, selectedRoom, indicatorPaint, planScale);
+      if (isViewableAtSelectedLevel(selectedRoom)) {
+        g2D.setPaint(indicatorPaint);         
+        paintRoomResizeIndicators(g2D, selectedRoom, indicatorPaint, planScale);
+        paintRoomNameOffsetIndicator(g2D, selectedRoom, indicatorPaint, planScale);
+        paintRoomAreaOffsetIndicator(g2D, selectedRoom, indicatorPaint, planScale);
+      }
     }
   }
 
@@ -2507,127 +2703,154 @@
   private void paintWalls(Graphics2D g2D, List<Selectable> selectedItems, float planScale, 
                           Color backgroundColor, Color foregroundColor, PaintMode paintMode) {
     Collection<Wall> paintedWalls;
-    Shape wallsArea;
+    Map<Collection<Wall>, Area> wallAreas;
     if (paintMode != PaintMode.CLIPBOARD) {
-      wallsArea = getWallsArea();
+      wallAreas = getWallAreas();
     } else {
       // In clipboard paint mode, paint only selected walls
       paintedWalls = Home.getWallsSubList(selectedItems);
-      wallsArea = getWallsArea(paintedWalls);
+      wallAreas = getWallAreas(getDrawableWallsInSelectedLevel(paintedWalls));
     }
-    // Fill walls area
     float wallPaintScale = paintMode == PaintMode.PRINT 
         ? planScale / 72 * 150 // Adjust scale to 150 dpi for print
         : planScale;
-    g2D.setPaint(getWallPaint(wallPaintScale, backgroundColor, foregroundColor));
-    g2D.fill(wallsArea);
-    
+    for (Map.Entry<Collection<Wall>, Area> areaEntry : wallAreas.entrySet()) {
+      TextureImage wallPattern = areaEntry.getKey().iterator().next().getPattern();
+      fillAndDrawArea(g2D, areaEntry.getValue(), planScale, 
+          getWallPaint(wallPaintScale, backgroundColor, foregroundColor, 
+              wallPattern != null ? wallPattern : this.preferences.getWallPattern()), foregroundColor);
+    }
+  }
+
+  /**
+   * Fills and paints the given area.
+   */
+  private void fillAndDrawArea( Graphics2D g2D, Area area, float planScale, Paint fillPaint, Paint drawPaint) {
+    // Fill walls area
+    g2D.setPaint(fillPaint);
+    g2D.fill(area);
     // Draw walls area
-    g2D.setPaint(foregroundColor);
+    g2D.setPaint(drawPaint);
     g2D.setStroke(new BasicStroke(WALL_STROKE_WIDTH / planScale));
-    g2D.draw(wallsArea);
+    g2D.draw(area);
   }
-
+  
   /**
    * Paints the outline of walls among <code>items</code> and a resize indicator if 
    * <code>items</code> contains only one wall and indicator paint isn't <code>null</code>. 
    */
   private void paintWallsOutline(Graphics2D g2D, List<Selectable> items,   
-                          Paint selectionOutlinePaint, Stroke selectionOutlineStroke, 
-                          Paint indicatorPaint, float planScale, Color foregroundColor) {
+                                 Paint selectionOutlinePaint, Stroke selectionOutlineStroke, 
+                                 Paint indicatorPaint, float planScale, Color foregroundColor) {
     float scaleInverse = 1 / planScale;
     Collection<Wall> walls = Home.getWallsSubList(items);
-    Shape wallsArea = getWallsArea(walls);
     AffineTransform previousTransform = g2D.getTransform();
     for (Wall wall : walls) {
-      // Draw selection border
-      g2D.setPaint(selectionOutlinePaint);
-      g2D.setStroke(selectionOutlineStroke);
-      g2D.draw(getShape(wall.getPoints()));
-      
-      if (indicatorPaint != null) {
-        // Draw start point of the wall
-        g2D.translate(wall.getXStart(), wall.getYStart());
-        g2D.scale(scaleInverse, scaleInverse);
-        g2D.setPaint(indicatorPaint);         
-        g2D.setStroke(POINT_STROKE);
-        g2D.fill(WALL_POINT);
-      
-        Float arcExtent = wall.getArcExtent();
-        double indicatorAngle;
-        double distanceAtScale;
-        float xArcCircleCenter = 0;
-        float yArcCircleCenter = 0;
-        double arcCircleRadius = 0;
-        double startPointToEndPointDistance = wall.getStartPointToEndPointDistance();
-        double wallAngle = Math.atan2(wall.getYEnd() - wall.getYStart(), 
-            wall.getXEnd() - wall.getXStart());
-        if (arcExtent != null) {
-          xArcCircleCenter = wall.getXArcCircleCenter();
-          yArcCircleCenter = wall.getYArcCircleCenter();
-          arcCircleRadius = Point2D.distance(wall.getXStart(), wall.getYStart(), 
-              xArcCircleCenter, yArcCircleCenter);
-          distanceAtScale = arcCircleRadius * Math.abs(arcExtent) * planScale;
-          indicatorAngle = Math.atan2(yArcCircleCenter - wall.getYStart(), 
-                  xArcCircleCenter - wall.getXStart())  
-              + (arcExtent > 0 ? -Math.PI / 2 : Math.PI /2);
-        } else {
-          distanceAtScale = startPointToEndPointDistance * planScale;
-          indicatorAngle = wallAngle;
-        }
-        // If the distance between start and end points is < 30
-        if (distanceAtScale < 30) { 
-          // Draw only one orientation indicator between the two points
-          g2D.rotate(wallAngle);
+      if (isViewableAtSelectedLevel(wall)) {
+        // Draw selection border
+        g2D.setPaint(selectionOutlinePaint);
+        g2D.setStroke(selectionOutlineStroke);
+        g2D.draw(getShape(wall.getPoints()));
+        
+        if (indicatorPaint != null) {
+          // Draw start point of the wall
+          g2D.translate(wall.getXStart(), wall.getYStart());
+          g2D.scale(scaleInverse, scaleInverse);
+          g2D.setPaint(indicatorPaint);         
+          g2D.setStroke(POINT_STROKE);
+          g2D.fill(WALL_POINT);
+        
+          Float arcExtent = wall.getArcExtent();
+          double indicatorAngle;
+          double distanceAtScale;
+          float xArcCircleCenter = 0;
+          float yArcCircleCenter = 0;
+          double arcCircleRadius = 0;
+          double startPointToEndPointDistance = wall.getStartPointToEndPointDistance();
+          double wallAngle = Math.atan2(wall.getYEnd() - wall.getYStart(), 
+              wall.getXEnd() - wall.getXStart());
           if (arcExtent != null) {
-            double wallToStartPointArcCircleCenterAngle = Math.abs(arcExtent) > Math.PI 
-                ? -(Math.PI + arcExtent) / 2
-                : (Math.PI - arcExtent) / 2;
-            float arcCircleCenterToWallDistance = (float)(Math.tan(wallToStartPointArcCircleCenterAngle) 
-                * startPointToEndPointDistance / 2); 
-            g2D.translate(startPointToEndPointDistance * planScale / 2, 
-                (arcCircleCenterToWallDistance - arcCircleRadius * (Math.abs(wallAngle) > Math.PI / 2 ? -1: 1)) * planScale);
+            xArcCircleCenter = wall.getXArcCircleCenter();
+            yArcCircleCenter = wall.getYArcCircleCenter();
+            arcCircleRadius = Point2D.distance(wall.getXStart(), wall.getYStart(), 
+                xArcCircleCenter, yArcCircleCenter);
+            distanceAtScale = arcCircleRadius * Math.abs(arcExtent) * planScale;
+            indicatorAngle = Math.atan2(yArcCircleCenter - wall.getYStart(), 
+                    xArcCircleCenter - wall.getXStart())  
+                + (arcExtent > 0 ? -Math.PI / 2 : Math.PI /2);
           } else {
-            g2D.translate(distanceAtScale / 2, 0);
+            distanceAtScale = startPointToEndPointDistance * planScale;
+            indicatorAngle = wallAngle;
+          }
+          // If the distance between start and end points is < 30
+          if (distanceAtScale < 30) { 
+            // Draw only one orientation indicator between the two points
+            g2D.rotate(wallAngle);
+            if (arcExtent != null) {
+              double wallToStartPointArcCircleCenterAngle = Math.abs(arcExtent) > Math.PI 
+                  ? -(Math.PI + arcExtent) / 2
+                  : (Math.PI - arcExtent) / 2;
+              float arcCircleCenterToWallDistance = (float)(Math.tan(wallToStartPointArcCircleCenterAngle) 
+                  * startPointToEndPointDistance / 2); 
+              g2D.translate(startPointToEndPointDistance * planScale / 2, 
+                  (arcCircleCenterToWallDistance - arcCircleRadius * (Math.abs(wallAngle) > Math.PI / 2 ? -1: 1)) * planScale);
+            } else {
+              g2D.translate(distanceAtScale / 2, 0);
+            }
+          } else {
+            // Draw orientation indicator at start of the wall
+            g2D.rotate(indicatorAngle);
+            g2D.translate(8, 0);
           }
-        } else {
-          // Draw orientation indicator at start of the wall
-          g2D.rotate(indicatorAngle);
-          g2D.translate(8, 0);
-        }
-        g2D.draw(WALL_ORIENTATION_INDICATOR);
-        g2D.setTransform(previousTransform);
-        
-        // Draw end point of the wall
-        g2D.translate(wall.getXEnd(), wall.getYEnd());
-        g2D.scale(scaleInverse, scaleInverse);
-        g2D.fill(WALL_POINT);
-        if (distanceAtScale >= 30) { 
-          if (arcExtent != null) {
-            indicatorAngle += arcExtent;
-          } 
-          // Draw orientation indicator at end of the wall
-          g2D.rotate(indicatorAngle);
-          g2D.translate(-10, 0);
           g2D.draw(WALL_ORIENTATION_INDICATOR);
-        }        
-        g2D.setTransform(previousTransform);
-      }      
+          g2D.setTransform(previousTransform);
+          
+          // Draw end point of the wall
+          g2D.translate(wall.getXEnd(), wall.getYEnd());
+          g2D.scale(scaleInverse, scaleInverse);
+          g2D.fill(WALL_POINT);
+          if (distanceAtScale >= 30) { 
+            if (arcExtent != null) {
+              indicatorAngle += arcExtent;
+            } 
+            // Draw orientation indicator at end of the wall
+            g2D.rotate(indicatorAngle);
+            g2D.translate(-10, 0);
+            g2D.draw(WALL_ORIENTATION_INDICATOR);
+          }        
+          g2D.setTransform(previousTransform);
+        }      
+      }
     }
     // Draw walls area
     g2D.setPaint(foregroundColor);
     g2D.setStroke(new BasicStroke(WALL_STROKE_WIDTH / planScale));
-    g2D.draw(wallsArea);
+    for (Area area : getWallAreas(walls).values()) {
+      g2D.draw(area);
+    }
     
     // Paint resize indicator of the wall if indicator paint exists
     if (items.size() == 1 
         && walls.size() == 1 
         && indicatorPaint != null) {
-      paintWallResizeIndicator(g2D, walls.iterator().next(), indicatorPaint, planScale);
+      Wall wall = walls.iterator().next();
+      if (isViewableAtSelectedLevel(wall)) {
+        paintWallResizeIndicator(g2D, wall, indicatorPaint, planScale);
+      }
     }
   }
 
   /**
+   * Returns <code>true</code> if the given item can be viewed in the plan at the selected level. 
+   */
+  private boolean isViewableAtSelectedLevel(Elevatable item) {
+    Level selectedLevel = this.home.getSelectedLevel();
+    return item.getLevel() == null
+        || item.getLevel() == selectedLevel
+        || item.isAtLevel(selectedLevel);
+  }
+
+  /**
    * Paints resize indicator on <code>wall</code>.
    */
   private void paintWallResizeIndicator(Graphics2D g2D, Wall wall,
@@ -2673,39 +2896,94 @@
   }
   
   /**
-   * Returns an area matching the union of all home wall shapes. 
+   * Returns areas matching the union of home wall shapes sorted by pattern. 
    */
-  private Area getWallsArea() {
-    if (this.wallsAreaCache == null) {
-      this.wallsAreaCache = getWallsArea(this.home.getWalls());
+  private Map<Collection<Wall>, Area> getWallAreas() {
+    if (this.wallAreasCache == null) {
+      this.wallAreasCache = getWallAreas(getDrawableWallsInSelectedLevel(this.home.getWalls()));
     }
-    return this.wallsAreaCache;
+    return this.wallAreasCache;
+  }
+
+  /**
+   * Returns the walls that belong to the selected level in home.
+   */
+  private Collection<Wall> getDrawableWallsInSelectedLevel(Collection<Wall> walls) {
+    List<Wall> wallsInSelectedLevel = new ArrayList<Wall>();
+    for (Wall wall : walls) {
+      if (isViewableAtSelectedLevel(wall)) {
+        wallsInSelectedLevel.add(wall);
+      }
+    }
+    return wallsInSelectedLevel;
   }
   
   /**
-   * Returns an area matching the union of all <code>walls</code> shapes. 
+   * Returns areas matching the union of <code>walls</code> shapes sorted by pattern. 
    */
-  private Area getWallsArea(Collection<Wall> walls) {
-    Area wallsArea = new Area();
+  private Map<Collection<Wall>, Area> getWallAreas(Collection<Wall> walls) {
+    if (walls.size() == 0) {
+      return Collections.emptyMap();
+    }
+    // Check if all walls use the same pattern
+    TextureImage pattern = walls.iterator().next().getPattern();
+    boolean samePattern = true;
     for (Wall wall : walls) {
-      wallsArea.add(new Area(getShape(wall.getPoints())));
+      if (pattern != wall.getPattern()) {
+        samePattern = false;
+        break;
+      }
+    }
+    Map<Collection<Wall>, Area> wallAreas = new LinkedHashMap<Collection<Wall>, Area>();
+    if (samePattern) {
+      wallAreas.put(walls, getItemsArea(walls));
+    } else {
+      // Create walls sublists by pattern
+      Map<TextureImage, Collection<Wall>> sortedWalls = new LinkedHashMap<TextureImage, Collection<Wall>>();
+      for (Wall wall : walls) {
+        TextureImage wallPattern = wall.getPattern();
+        if (wallPattern == null) {
+          wallPattern = this.preferences.getWallPattern();
+        }
+        Collection<Wall> patternWalls = sortedWalls.get(wallPattern);
+        if (patternWalls == null) {
+          patternWalls = new ArrayList<Wall>();
+          sortedWalls.put(wallPattern, patternWalls);
+        }
+        patternWalls.add(wall);
+      }
+      for (Collection<Wall> patternWalls : sortedWalls.values()) {
+        wallAreas.put(patternWalls, getItemsArea(patternWalls));
+      }
     }
-    return wallsArea;
+    return wallAreas;
   }
   
   /**
+   * Returns an area matching the union of all <code>items</code> shapes. 
+   */
+  private Area getItemsArea(Collection<? extends Selectable> items) {
+    Area itemsArea = new Area();
+    for (Selectable item : items) {
+      itemsArea.add(new Area(getShape(item.getPoints())));
+    }
+    return itemsArea;
+  }
+
+  /**
    * Returns the <code>Paint</code> object used to fill walls.
    */
-  private Paint getWallPaint(float planScale, Color backgroundColor, Color foregroundColor) {
-    if (this.wallsPatternImageCache == null
+  private Paint getWallPaint(float planScale, Color backgroundColor, Color foregroundColor, TextureImage wallPattern) {
+    BufferedImage patternImage = this.patternImagesCache.get(wallPattern);
+    if (patternImage == null
         || !backgroundColor.equals(this.wallsPatternBackgroundCache)
         || !foregroundColor.equals(this.wallsPatternForegroundCache)) {
-      this.wallsPatternImageCache = SwingTools.getPatternImage(this.preferences.getWallPattern(), 
-          backgroundColor, foregroundColor);
+      patternImage = SwingTools.getPatternImage(wallPattern, backgroundColor, foregroundColor);
+      this.patternImagesCache.put(wallPattern, patternImage);
       this.wallsPatternBackgroundCache = backgroundColor;
       this.wallsPatternForegroundCache = foregroundColor;
     }
-    return new TexturePaint(this.wallsPatternImageCache, 
+    return new TexturePaint(patternImage, 
         new Rectangle2D.Float(0, 0, 10 / planScale, 10 / planScale));
   }
   
@@ -2719,11 +2997,7 @@
                               PaintMode paintMode, boolean paintIcon) {    
     if (!furniture.isEmpty()) {
       BasicStroke pieceBorderStroke = new BasicStroke(BORDER_STROKE_WIDTH / planScale);
-      boolean allFurnitureViewedFromTop = 
-          !"true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D")) 
-          && this.preferences.isFurnitureViewedFromTop()
-          && Component3DManager.getInstance().isOffScreenImageSupported();
-      
+      Boolean allFurnitureViewedFromTop = null;
       // Draw furniture
       for (HomePieceOfFurniture piece : furniture) {
         if (piece.isVisible()) {
@@ -2749,12 +3023,31 @@
             } else {
               pieceShape2D = pieceShape;
             }
-                      
+
+            boolean viewedFromTop;
+            if (this.preferences.isFurnitureViewedFromTop()) {
+              if (piece.getPlanIcon() != null
+                  || piece instanceof HomeDoorOrWindow) {
+                viewedFromTop = true;
+              } else {
+                if (allFurnitureViewedFromTop == null) {
+                  try {
+                    // Evaluate allFurnitureViewedFromTop value as late as possible to avoid mandatory dependency towards Java 3D 
+                    allFurnitureViewedFromTop = !Boolean.getBoolean("com.eteks.sweethome3d.no3D") 
+                        && Component3DManager.getInstance().isOffScreenImageSupported();
+                  } catch (AccessControlException ex) {
+                    // If com.eteks.sweethome3d.no3D property can't be read, 
+                    // security manager won't allow to access to Java 3D DLLs required by PieceOfFurnitureModelIcon class too
+                    allFurnitureViewedFromTop = false;
+                  }
+                }
+                viewedFromTop = allFurnitureViewedFromTop.booleanValue();
+              }                
+            } else {
+              viewedFromTop = false;
+            }
             if (paintIcon 
-                && (allFurnitureViewedFromTop
-                    || this.preferences.isFurnitureViewedFromTop()
-                        && (piece.getPlanIcon() != null
-                            || piece instanceof HomeDoorOrWindow))) {
+                && viewedFromTop) {
               if (piece instanceof HomeDoorOrWindow) {
                 // Draw doors and windows border
                 g2D.setPaint(backgroundColor);
@@ -2913,7 +3206,8 @@
     BasicStroke pieceFrontBorderStroke = new BasicStroke(4 * BORDER_STROKE_WIDTH / planScale, 
         BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
     for (HomePieceOfFurniture piece : Home.getFurnitureSubList(items)) {
-      if (piece.isVisible()) {
+      if (piece.isVisible() 
+          && isViewableAtSelectedLevel(piece)) {
         float [][] points = piece.getPoints();
         Shape pieceShape = getShape(points);
         
@@ -3128,22 +3422,37 @@
     BasicStroke dimensionLineStroke = new BasicStroke(BORDER_STROKE_WIDTH / planScale);
     // Change font size
     Font previousFont = g2D.getFont();
-    Composite oldComposite = g2D.getComposite();
     for (DimensionLine dimensionLine : dimensionLines) {
-      AffineTransform previousTransform = g2D.getTransform();
-      double angle = Math.atan2(dimensionLine.getYEnd() - dimensionLine.getYStart(), 
-          dimensionLine.getXEnd() - dimensionLine.getXStart());
-      float dimensionLineLength = dimensionLine.getLength();
-      g2D.translate(dimensionLine.getXStart(), dimensionLine.getYStart());
-      g2D.rotate(angle);
-      g2D.translate(0, dimensionLine.getOffset());
-      
-      if (paintMode == PaintMode.PAINT
-          && this.selectedItemsOutlinePainted
-          && selectedItems.contains(dimensionLine)) {
-        // Draw selection border
-        g2D.setPaint(selectionOutlinePaint);
-        g2D.setStroke(selectionOutlineStroke);
+      if (isViewableAtSelectedLevel(dimensionLine)) {
+        AffineTransform previousTransform = g2D.getTransform();
+        double angle = Math.atan2(dimensionLine.getYEnd() - dimensionLine.getYStart(), 
+            dimensionLine.getXEnd() - dimensionLine.getXStart());
+        float dimensionLineLength = dimensionLine.getLength();
+        g2D.translate(dimensionLine.getXStart(), dimensionLine.getYStart());
+        g2D.rotate(angle);
+        g2D.translate(0, dimensionLine.getOffset());
+        
+        if (paintMode == PaintMode.PAINT
+            && this.selectedItemsOutlinePainted
+            && selectedItems.contains(dimensionLine)) {
+          // Draw selection border
+          g2D.setPaint(selectionOutlinePaint);
+          g2D.setStroke(selectionOutlineStroke);
+          // Draw dimension line
+          g2D.draw(new Line2D.Float(0, 0, dimensionLineLength, 0));
+          // Draw dimension line ends
+          g2D.draw(DIMENSION_LINE_END);
+          g2D.translate(dimensionLineLength, 0);
+          g2D.draw(DIMENSION_LINE_END);
+          g2D.translate(-dimensionLineLength, 0);
+          // Draw extension lines
+          g2D.draw(new Line2D.Float(0, -dimensionLine.getOffset(), 0, -5));
+          g2D.draw(new Line2D.Float(dimensionLineLength, -dimensionLine.getOffset(), dimensionLineLength, -5));
+          
+          g2D.setPaint(foregroundColor);
+        }
+        
+        g2D.setStroke(dimensionLineStroke);
         // Draw dimension line
         g2D.draw(new Line2D.Float(0, 0, dimensionLineLength, 0));
         // Draw dimension line ends
@@ -3152,69 +3461,49 @@
         g2D.draw(DIMENSION_LINE_END);
         g2D.translate(-dimensionLineLength, 0);
         // Draw extension lines
+        g2D.setStroke(extensionLineStroke);
         g2D.draw(new Line2D.Float(0, -dimensionLine.getOffset(), 0, -5));
         g2D.draw(new Line2D.Float(dimensionLineLength, -dimensionLine.getOffset(), dimensionLineLength, -5));
         
-        g2D.setPaint(foregroundColor);
-      }
-      
-      g2D.setStroke(dimensionLineStroke);
-      // Draw dimension line
-      g2D.draw(new Line2D.Float(0, 0, dimensionLineLength, 0));
-      // Draw dimension line ends
-      g2D.draw(DIMENSION_LINE_END);
-      g2D.translate(dimensionLineLength, 0);
-      g2D.draw(DIMENSION_LINE_END);
-      g2D.translate(-dimensionLineLength, 0);
-      // Draw extension lines
-      g2D.setStroke(extensionLineStroke);
-      g2D.draw(new Line2D.Float(0, -dimensionLine.getOffset(), 0, -5));
-      g2D.draw(new Line2D.Float(dimensionLineLength, -dimensionLine.getOffset(), dimensionLineLength, -5));
-      
-      float displayedValue = feedback
-          ? this.preferences.getLengthUnit().getMagnetizedLength(dimensionLineLength, getPixelLength())
-          : dimensionLineLength;
-      String lengthText = this.preferences.getLengthUnit().getFormat().format(displayedValue);
-      TextStyle lengthStyle = dimensionLine.getLengthStyle();
-      if (lengthStyle == null) {
-        lengthStyle = this.preferences.getDefaultTextStyle(dimensionLine.getClass());
-      }          
-      if (feedback) {
-        // Use default for feedback
-        lengthStyle = lengthStyle.deriveStyle(getFont().getSize() / getScale());
-      }
-      Font font = getFont(previousFont, lengthStyle);
-      FontMetrics lengthFontMetrics = getFontMetrics(font, lengthStyle);
-      Rectangle2D lengthTextBounds = lengthFontMetrics.getStringBounds(lengthText, g2D);
-      int fontAscent = lengthFontMetrics.getAscent();
-      g2D.translate((dimensionLineLength - (float)lengthTextBounds.getWidth()) / 2, 
-          dimensionLine.getOffset() <= 0 
-              ? -lengthFontMetrics.getDescent() - 1
-              : fontAscent + 1);
-      if (feedback) {
-        // Draw text outline with half transparent background color
-        g2D.setPaint(backgroundColor);
-        if (oldComposite instanceof AlphaComposite) {
-          g2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 
-            ((AlphaComposite)oldComposite).getAlpha() * 0.7f));
-        } else {
-          g2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.7f));
+        float displayedValue = feedback
+            ? this.preferences.getLengthUnit().getMagnetizedLength(dimensionLineLength, getPixelLength())
+            : dimensionLineLength;
+        String lengthText = this.preferences.getLengthUnit().getFormat().format(displayedValue);
+        TextStyle lengthStyle = dimensionLine.getLengthStyle();
+        if (lengthStyle == null) {
+          lengthStyle = this.preferences.getDefaultTextStyle(dimensionLine.getClass());
+        }          
+        if (feedback) {
+          // Use default for feedback
+          lengthStyle = lengthStyle.deriveStyle(getFont().getSize() / getScale());
+        }
+        Font font = getFont(previousFont, lengthStyle);
+        FontMetrics lengthFontMetrics = getFontMetrics(font, lengthStyle);
+        Rectangle2D lengthTextBounds = lengthFontMetrics.getStringBounds(lengthText, g2D);
+        int fontAscent = lengthFontMetrics.getAscent();
+        g2D.translate((dimensionLineLength - (float)lengthTextBounds.getWidth()) / 2, 
+            dimensionLine.getOffset() <= 0 
+                ? -lengthFontMetrics.getDescent() - 1
+                : fontAscent + 1);
+        if (feedback) {
+          // Draw text outline with half transparent background color
+          g2D.setPaint(backgroundColor);
+          Composite oldComposite = setTransparency(g2D, 0.7f);
+          g2D.setStroke(new BasicStroke(3 / planScale));
+          FontRenderContext fontRenderContext = g2D.getFontRenderContext();
+          TextLayout textLayout = new TextLayout(lengthText, font, fontRenderContext);
+          g2D.draw(textLayout.getOutline(new AffineTransform()));
+          g2D.setComposite(oldComposite);
+          g2D.setPaint(foregroundColor);
         }
-        g2D.setStroke(new BasicStroke(3 / planScale));
-        FontRenderContext fontRenderContext = g2D.getFontRenderContext();
-        TextLayout textLayout = new TextLayout(lengthText, font, fontRenderContext);
-        g2D.draw(textLayout.getOutline(new AffineTransform()));
-        g2D.setComposite(oldComposite);
-        g2D.setPaint(foregroundColor);
+        // Draw dimension length in middle
+        g2D.setFont(font);
+        g2D.drawString(lengthText, 0, 0);
+        
+        g2D.setTransform(previousTransform);
       }
-      // Draw dimension length in middle
-      g2D.setFont(font);
-      g2D.drawString(lengthText, 0, 0);
-      
-      g2D.setTransform(previousTransform);
     }
     g2D.setFont(previousFont);
-    
     // Paint resize indicator of selected dimension line
     if (selectedItems.size() == 1 
         && selectedItems.get(0) instanceof DimensionLine
@@ -3280,31 +3569,30 @@
     g2D.setPaint(foregroundColor);
     // Draw labels
     for (Label label : labels) {
-      boolean selectedLabel = selectedItems.contains(label);
-      // In clipboard paint mode, paint label only if it is selected
-      if (paintMode != PaintMode.CLIPBOARD
-          || selectedLabel) {
-        String labelText = label.getText();
-        float xLabel = label.getX(); 
-        float yLabel = label.getY();
-        TextStyle labelStyle = label.getStyle();
-        if (labelStyle == null) {
-          labelStyle = this.preferences.getDefaultTextStyle(label.getClass());
-        }          
-        float [][] labelBounds = getTextBounds(labelText, labelStyle, xLabel, yLabel, 0);
-        float labelWidth = labelBounds [2][0] - labelBounds [0][0];
-        // Draw label text
-        g2D.setFont(getFont(previousFont, labelStyle));        
-        g2D.drawString(labelText, xLabel - labelWidth / 2, yLabel);
-
-        if (paintMode == PaintMode.PAINT
-            && this.selectedItemsOutlinePainted
-            && selectedLabel) {
-          // Draw selection border
-          g2D.setPaint(selectionOutlinePaint);
-          g2D.setStroke(selectionOutlineStroke);
-          g2D.draw(getShape(labelBounds));
-          g2D.setPaint(foregroundColor);
+      if (isViewableAtSelectedLevel(label)) {
+        boolean selectedLabel = selectedItems.contains(label);
+        // In clipboard paint mode, paint label only if it is selected
+        if (paintMode != PaintMode.CLIPBOARD || selectedLabel) {
+          String labelText = label.getText();
+          float xLabel = label.getX();
+          float yLabel = label.getY();
+          TextStyle labelStyle = label.getStyle();
+          if (labelStyle == null) {
+            labelStyle = this.preferences.getDefaultTextStyle(label.getClass());
+          }
+          float [][] labelBounds = getTextBounds(labelText, labelStyle, xLabel, yLabel, 0);
+          float labelWidth = labelBounds [2][0] - labelBounds [0][0];
+          // Draw label text
+          g2D.setFont(getFont(previousFont, labelStyle));
+          g2D.drawString(labelText, xLabel - labelWidth / 2, yLabel);
+
+          if (paintMode == PaintMode.PAINT && this.selectedItemsOutlinePainted && selectedLabel) {
+            // Draw selection border
+            g2D.setPaint(selectionOutlinePaint);
+            g2D.setStroke(selectionOutlineStroke);
+            g2D.draw(getShape(labelBounds));
+            g2D.setPaint(foregroundColor);
+          }
         }
       }
     }
@@ -3409,7 +3697,7 @@
       float y = (float)locationFeedback.getY();
       float deltaXToClosestWall = Float.POSITIVE_INFINITY;
       float deltaYToClosestWall = Float.POSITIVE_INFINITY;
-      for (Wall wall : this.home.getWalls()) {
+      for (Wall wall : getViewedItems(this.home.getWalls(), this.otherLevelWallsCache)) {
         if (wall != alignedWall) {
           if (Math.abs(x - wall.getXStart()) < margin
               && (alignedWall == null
@@ -3493,6 +3781,22 @@
   }
 
   /**
+   * Returns the items viewed in the plan at the selected level.
+   */
+  private <T extends Elevatable> Collection<T> getViewedItems(Collection<T> homeItems, List<T> otherLevelItems) {
+    List<T> viewedWalls = new ArrayList<T>();
+    if (otherLevelItems != null) {
+      viewedWalls.addAll(otherLevelItems);
+    }
+    for (T wall : homeItems) {
+      if (isViewableAtSelectedLevel(wall)) {
+        viewedWalls.add(wall);
+      }
+    }
+    return viewedWalls;
+  }
+
+  /**
    * Paints point feedback.
    */
   private void paintPointFeedback(Graphics2D g2D, Point2D locationFeedback, 
@@ -3540,7 +3844,7 @@
       float y = (float)locationFeedback.getY();
       float deltaXToClosestObject = Float.POSITIVE_INFINITY;
       float deltaYToClosestObject = Float.POSITIVE_INFINITY;
-      for (Room room : this.home.getRooms()) {
+      for (Room room : getViewedItems(this.home.getRooms(), this.otherLevelRoomsCache)) {
         float [][] roomPoints = room.getPoints();
         int editedPointIndex = -1;
         if (room == alignedRoom) {
@@ -3553,9 +3857,7 @@
           }
         }
         for (int i = 0; i < roomPoints.length; i++) {
-          if (editedPointIndex == -1
-              || (i != editedPointIndex
-                  && roomPoints.length > 2)) {
+          if (editedPointIndex == -1 || (i != editedPointIndex && roomPoints.length > 2)) {
             if (Math.abs(x - roomPoints [i][0]) < margin
                 && Math.abs(deltaYToClosestObject) > Math.abs(y - roomPoints [i][1])) {
               deltaYToClosestObject = y - roomPoints [i][1];
@@ -3568,7 +3870,7 @@
         }
       }
       // Search which wall points are at locationFeedback abscissa or ordinate
-      for (Wall wall : this.home.getWalls()) {
+      for (Wall wall : getViewedItems(this.home.getWalls(), this.otherLevelWallsCache)) {
         float [][] wallPoints = wall.getPoints();
         // Take into account only points at start and end of the wall
         wallPoints = new float [][] {wallPoints [0], wallPoints [wallPoints.length / 2 - 1], 
@@ -3631,7 +3933,7 @@
       float y = (float)locationFeedback.getY();
       float deltaXToClosestObject = Float.POSITIVE_INFINITY;
       float deltaYToClosestObject = Float.POSITIVE_INFINITY;
-      for (Room room : this.home.getRooms()) {
+      for (Room room : getViewedItems(this.home.getRooms(), this.otherLevelRoomsCache)) {
         float [][] roomPoints = room.getPoints();
         for (int i = 0; i < roomPoints.length; i++) {
           if (Math.abs(x - roomPoints [i][0]) < margin
@@ -3641,13 +3943,14 @@
           if (Math.abs(y - roomPoints [i][1]) < margin
               && Math.abs(deltaXToClosestObject) > Math.abs(x - roomPoints [i][0])) {
             deltaXToClosestObject = x - roomPoints [i][0];
-          } 
+          }
         }
       }
       // Search which dimension line start or end point is at locationFeedback abscissa or ordinate
       // ignoring the start and end point of alignedDimensionLine
       for (DimensionLine dimensionLine : this.home.getDimensionLines()) {
-        if (dimensionLine != alignedDimensionLine) {
+        if (isViewableAtSelectedLevel(dimensionLine) 
+            && dimensionLine != alignedDimensionLine) {
           if (Math.abs(x - dimensionLine.getXStart()) < margin
               && (alignedDimensionLine == null
                   || !equalsDimensionLinePoint(dimensionLine.getXStart(), dimensionLine.getYStart(), 
@@ -3681,7 +3984,7 @@
         }
       }
       // Search which wall points are at locationFeedback abscissa or ordinate
-      for (Wall wall : this.home.getWalls()) {
+      for (Wall wall : getViewedItems(this.home.getWalls(), this.otherLevelWallsCache)) {
         float [][] wallPoints = wall.getPoints();
         // Take into account only points at start and end of the wall
         wallPoints = new float [][] {wallPoints [0], wallPoints [wallPoints.length / 2 - 1], 
@@ -3698,18 +4001,21 @@
         }
       }
       // Search which piece of furniture points are at locationFeedback abscissa or ordinate
-      for (HomePieceOfFurniture furniture : this.home.getFurniture()) {
-        float [][] piecePoints = furniture.getPoints();
-        for (int i = 0; i < piecePoints.length; i++) {
-          if (Math.abs(x - piecePoints [i][0]) < margin
-              && Math.abs(deltaYToClosestObject) > Math.abs(y - piecePoints [i][1])) {
-            deltaYToClosestObject = y - piecePoints [i][1];
-          }
-          if (Math.abs(y - piecePoints [i][1]) < margin
-              && Math.abs(deltaXToClosestObject) > Math.abs(x - piecePoints [i][0])) {
-            deltaXToClosestObject = x - piecePoints [i][0];
+      for (HomePieceOfFurniture piece : this.home.getFurniture()) {
+        if (piece.isVisible()
+            && isViewableAtSelectedLevel(piece)) {
+          float [][] piecePoints = piece.getPoints();
+          for (int i = 0; i < piecePoints.length; i++) {
+            if (Math.abs(x - piecePoints [i][0]) < margin
+                && Math.abs(deltaYToClosestObject) > Math.abs(y - piecePoints [i][1])) {
+              deltaYToClosestObject = y - piecePoints [i][1];
+            }
+            if (Math.abs(y - piecePoints [i][1]) < margin
+                && Math.abs(deltaXToClosestObject) > Math.abs(x - piecePoints [i][0])) {
+              deltaXToClosestObject = x - piecePoints [i][0];
+            }
+
           }
-          
         }
       }
       
@@ -4191,11 +4497,7 @@
         
         @Override
         public void mouseMoved(MouseEvent ev) {
-          Point mouseLocationInPlan = SwingUtilities.convertPoint(toolTipWindow, 
-              ev.getX(), ev.getY(), PlanComponent.this);
-          dispatchEvent(new MouseEvent(PlanComponent.this, ev.getID(), ev.getWhen(),
-              ev.getModifiers(), mouseLocationInPlan.x, mouseLocationInPlan.y, 
-              ev.getClickCount(), ev.isPopupTrigger(), ev.getButton()));
+          dispatchEvent(SwingUtilities.convertMouseEvent(toolTipWindow, ev, PlanComponent.this));
         }
         
         @Override
@@ -4464,7 +4766,13 @@
     repaint();
   }
 
-  
+  /**
+   * Returns <code>true</code>.
+   */
+  public boolean canImportDraggedItems(List<Selectable> items, int x, int y) {
+    return true;
+  }
+
   // Scrollable implementation
   public Dimension getPreferredScrollableViewportSize() {
     return getPreferredSize();
@@ -4787,7 +5095,7 @@
   }
   
   /**
-   * A proxy for the furniture plan icon. 
+   * A proxy for the furniture plan icon generated from its plan icon. 
    */
   private static class PieceOfFurniturePlanIcon extends PieceOfFurnitureTopViewIcon {
     private final float pieceWidth;
@@ -4849,7 +5157,15 @@
           // Don't need color information anymore
           this.pieceColor = null;
         } else if (this.pieceTexture != null) {
-          if ("true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D"))) {
+          if (isTextureManagerAvailable()) {
+            // Prefer to share textures images with texture manager if it's available
+            TextureManager.getInstance().loadTexture(this.pieceTexture.getImage(), true,
+                new TextureManager.TextureObserver() {
+                  public void textureUpdated(Texture texture) {                  
+                    setTexturedIcon(c, ((ImageComponent2D)texture.getImage(0)).getImage());
+                  }
+                });
+          } else { 
             Icon textureIcon = IconManager.getInstance().getIcon(this.pieceTexture.getImage(), null);
             if (IconManager.getInstance().isErrorIcon(textureIcon)) {
               setTexturedIcon(c, ERROR_TEXTURE_IMAGE);                    
@@ -4860,15 +5176,7 @@
               textureIcon.paintIcon(c, g2DIcon, 0, 0);
               g2DIcon.dispose();
               setTexturedIcon(c, textureIconImage);
-            } 
-          } else { 
-            // Prefer to share textures images with texture manager if it's available
-            TextureManager.getInstance().loadTexture(this.pieceTexture.getImage(), true,
-                new TextureManager.TextureObserver() {
-                  public void textureUpdated(Texture texture) {                  
-                    setTexturedIcon(c, ((ImageComponent2D)texture.getImage(0)).getImage());
-                  }
-                });
+            }
           }
   
           // Don't need texture information anymore
@@ -4896,7 +5204,7 @@
   }
   
   /**
-   * A proxy for the furniture top view icon. 
+   * A proxy for the furniture top view icon generated from its 3D model. 
    */
   private static class PieceOfFurnitureModelIcon extends PieceOfFurnitureTopViewIcon {
     private static Canvas3D        canvas3D;
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/PlanTransferHandler.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/PlanTransferHandler.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/PlanTransferHandler.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/PlanTransferHandler.java	2011-12-21 00:48:52.000000000 +0000
@@ -220,7 +220,7 @@
     if (isDrop()) {
       Point2D dropLocation = getDropModelLocation(destination);
       if (destination instanceof View) {
-        this.homeController.drop(transferedItems, (View)destination, 
+        this.homeController.drop(transferedItems, this.homeController.getPlanController().getView(), 
             (float)dropLocation.getX(), (float)dropLocation.getY());
       } else {
         this.homeController.drop(transferedItems,  
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/resources/icons/tango/identity.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/resources/icons/tango/identity.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/resources/icons/tango/language-import.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/resources/icons/tango/language-import.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/resources/icons/tango/plan-add-level.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/resources/icons/tango/plan-add-level.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/RoomPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/RoomPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/RoomPanel.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/RoomPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -93,7 +93,7 @@
     // Create name label and its text field bound to NAME controller property
     this.nameLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         RoomPanel.class, "nameLabel.text"));
-    this.nameTextField = new JTextField(controller.getName(), 10);
+    this.nameTextField = new AutoCompleteTextField(controller.getName(), 10, preferences.getAutoCompletionStrings("RoomName"));
     if (!OperatingSystem.isMacOSXLeopardOrSuperior()) {
       SwingTools.addAutoSelectionOnFocusGain(this.nameTextField);
     }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/SwingTools.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/SwingTools.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/SwingTools.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/SwingTools.java	2011-12-21 00:48:52.000000000 +0000
@@ -25,6 +25,8 @@
 import java.awt.Frame;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.Rectangle;
@@ -36,14 +38,17 @@
 import java.awt.event.FocusListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.geom.Area;
 import java.awt.image.BufferedImage;
 import java.awt.image.FilteredImageSource;
 import java.awt.image.RGBImageFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
@@ -51,6 +56,9 @@
 import java.util.concurrent.Executors;
 
 import javax.imageio.ImageIO;
+import javax.jnlp.BasicService;
+import javax.jnlp.ServiceManager;
+import javax.jnlp.UnavailableServiceException;
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.JComponent;
@@ -636,4 +644,57 @@
     public void popupMenuWillBecomeInvisible(PopupMenuEvent ev) {
     }
   }
+  
+  /**
+   * Attempts to display the given <code>url</code> in a browser and returns <code>true</code>
+   * if it was done successfully.
+   */
+  public static boolean showDocumentInBrowser(URL url) {
+    try { 
+      // Lookup the javax.jnlp.BasicService object 
+      BasicService basicService = (BasicService)ServiceManager.lookup("javax.jnlp.BasicService"); 
+      // Ignore the basic service, if it doesn't support web browser
+      if (basicService.isWebBrowserSupported()) {
+        return basicService.showDocument(url); 
+      }
+    } catch (UnavailableServiceException ex) {
+      // Too bad : service is unavailable
+    } catch (LinkageError ex) {
+      // JNLP classes not available in classpath
+      System.err.println("Can't show document in browser. JNLP classes not available in classpath.");
+    }
+    return false;
+  }
+
+  /**
+   * Returns the children of a component of the given class.
+   */
+  public static <T extends JComponent> List<T> findChildren(JComponent parent, Class<T> childrenClass) {
+    List<T> children = new ArrayList<T>();
+    findChildren(parent, childrenClass, children); 
+    return children;
+  }
+
+  private static <T extends JComponent> void findChildren(JComponent parent, Class<T> childrenClass, List<T> children) {
+    for (int i = 0; i < parent.getComponentCount(); i++) {
+      Component child = parent.getComponent(i);
+      if (childrenClass.isInstance(child)) {
+        children.add((T)child);
+      } else if (child instanceof JComponent) {
+        findChildren((JComponent)child, childrenClass, children);
+      }            
+    }
+  }
+
+  /**
+   * Returns <code>true</code> if the given rectangle is fully visible at screen.
+   */
+  public static boolean isRectangleVisibleAtScreen(Rectangle rectangle) {
+    Area devicesArea = new Area();
+    GraphicsEnvironment environment = GraphicsEnvironment.getLocalGraphicsEnvironment();
+    for (GraphicsDevice device : environment.getScreenDevices()) {
+      devicesArea.add(new Area(device.getDefaultConfiguration().getBounds()));
+    }
+    return devicesArea.contains(rectangle);
+  }
 }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/SwingViewFactory.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/SwingViewFactory.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/SwingViewFactory.java	2011-12-21 00:48:52.000000000 +0000
@@ -19,6 +19,8 @@
  */
 package com.eteks.sweethome3d.swing;
 
+import java.security.AccessControlException;
+
 import com.eteks.sweethome3d.model.BackgroundImage;
 import com.eteks.sweethome3d.model.CatalogPieceOfFurniture;
 import com.eteks.sweethome3d.model.CatalogTexture;
@@ -41,6 +43,7 @@
 import com.eteks.sweethome3d.viewcontroller.ImportedFurnitureWizardStepsView;
 import com.eteks.sweethome3d.viewcontroller.ImportedTextureWizardController;
 import com.eteks.sweethome3d.viewcontroller.LabelController;
+import com.eteks.sweethome3d.viewcontroller.LevelController;
 import com.eteks.sweethome3d.viewcontroller.PageSetupController;
 import com.eteks.sweethome3d.viewcontroller.PhotoController;
 import com.eteks.sweethome3d.viewcontroller.PlanController;
@@ -89,7 +92,7 @@
    */
   public PlanView createPlanView(Home home, UserPreferences preferences,
                                  PlanController planController) {
-    return new PlanComponent(home, preferences, planController);
+    return new MultipleLevelsPlanPanel(home, preferences, planController);
   }
 
   /**
@@ -97,11 +100,15 @@
    */
   public View createView3D(Home home, UserPreferences preferences,
                            HomeController3D homeController3D) {
-    if ("true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D"))) {
-      return null;
-    } else {
-      return new HomeComponent3D(home, preferences, homeController3D);
+    try {
+      if (!Boolean.getBoolean("com.eteks.sweethome3d.no3D")) {
+        return new HomeComponent3D(home, preferences, homeController3D);
+      }
+    } catch (AccessControlException ex) {
+      // If com.eteks.sweethome3d.no3D property can't be read, 
+      // security manager won't allow to access to Java 3D DLLs required by HomeComponent3D class too
     }
+    return null;
   }
 
   /**
@@ -169,9 +176,16 @@
                                           UserPreferencesController userPreferencesController) {
     return new UserPreferencesPanel(preferences, userPreferencesController);
   }
-  
+
+  /**
+   * Returns a new view that edits level values.
+   */
+  public DialogView createLevelView(UserPreferences preferences, LevelController levelController) {
+    return new LevelPanel(preferences, levelController);
+  }
+
   /**
-   * Returns a new view that edits the selected furniture in <code>home</code>.
+   * Returns a new view that edits furniture values.
    */
   public DialogView createHomeFurnitureView(UserPreferences preferences,
                                HomeFurnitureController homeFurnitureController) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/UserPreferencesPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/UserPreferencesPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/UserPreferencesPanel.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/UserPreferencesPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -31,6 +31,9 @@
 import java.awt.image.BufferedImage;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.lang.ref.WeakReference;
+import java.security.AccessControlException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
@@ -70,6 +73,7 @@
   private final UserPreferencesController controller;
   private JLabel         languageLabel;
   private JComboBox      languageComboBox;
+  private JButton        languageLibraryImportButton;
   private JLabel         unitLabel;
   private JRadioButton   centimeterRadioButton;
   private JRadioButton   inchRadioButton;
@@ -98,6 +102,8 @@
   private JSpinner       newWallThicknessSpinner;
   private JLabel         newWallHeightLabel;
   private JSpinner       newWallHeightSpinner;
+  private JLabel         newFloorThicknessLabel;
+  private JSpinner       newFloorThicknessSpinner;
   private JCheckBox      autoSaveDelayForRecoveryCheckBox;
   private JSpinner       autoSaveDelayForRecoverySpinner;
   private JLabel         autoSaveDelayForRecoveryUnitLabel;
@@ -149,7 +155,7 @@
                 cellHasFocus);
           }
         });
-      this.languageComboBox.setMaximumRowCount(this.languageComboBox.getModel().getSize());
+      this.languageComboBox.setMaximumRowCount(Integer.MAX_VALUE);
       this.languageComboBox.setSelectedItem(controller.getLanguage());
       this.languageComboBox.addItemListener(new ItemListener() {
           public void itemStateChanged(ItemEvent ev) {
@@ -162,6 +168,20 @@
               languageComboBox.setSelectedItem(controller.getLanguage());
             }
           });
+      preferences.addPropertyChangeListener(UserPreferences.Property.SUPPORTED_LANGUAGES, 
+          new SupportedLanguagesChangeListener(this));
+    }
+    
+    if (controller.mayImportLanguageLibrary()) {
+      this.languageLibraryImportButton = new JButton(new ResourceAction(
+          preferences, UserPreferencesPanel.class, "IMPORT_LANGUAGE_LIBRARY", true) {
+            @Override
+            public void actionPerformed(ActionEvent ev) {
+              controller.importLanguageLibrary();
+            }
+          });
+      this.languageLibraryImportButton.setToolTipText(preferences.getLocalizedString(
+          UserPreferencesPanel.class, "IMPORT_LANGUAGE_LIBRARY.tooltip"));
     }
     
     if (controller.isPropertyEditable(UserPreferencesController.Property.UNIT)) {
@@ -249,8 +269,16 @@
           });
     }
 
+    boolean no3D;
+    try {
+      no3D = Boolean.getBoolean("com.eteks.sweethome3d.no3D");
+    } catch (AccessControlException ex) {
+      // If com.eteks.sweethome3d.no3D property can't be read, 
+      // security manager won't allow to access to Java 3D DLLs required by 3D view too
+      no3D = true;
+    }
     if (controller.isPropertyEditable(UserPreferencesController.Property.NAVIGATION_PANEL_VISIBLE)
-        && !"true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D"))) {
+        && !no3D) {
       // Create navigation panel label and check box bound to controller NAVIGATION_PANEL_VISIBLE property
       this.navigationPanelLabel = new JLabel(preferences.getLocalizedString(
           UserPreferencesPanel.class, "navigationPanelLabel.text"));
@@ -343,7 +371,7 @@
       this.topViewRadioButton = new JRadioButton(SwingTools.getLocalizedLabelText(preferences, 
           UserPreferencesPanel.class, "topViewRadioButton.text"), 
           controller.isFurnitureViewedFromTop());
-      if ("true".equalsIgnoreCase(System.getProperty("com.eteks.sweethome3d.no3D"))) {
+      if (no3D) {
         this.catalogIconRadioButton.setEnabled(false);
         this.topViewRadioButton.setEnabled(false);
       } else { 
@@ -492,6 +520,27 @@
           });
     }
     
+    if (controller.isPropertyEditable(UserPreferencesController.Property.NEW_FLOOR_THICKNESS)) {
+      // Create wall thickness label and spinner bound to controller NEW_FLOOR_THICKNESS property
+      this.newFloorThicknessLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
+          UserPreferencesPanel.class, "newFloorThicknessLabel.text"));
+      final SpinnerLengthModel newFloorThicknessSpinnerModel = new SpinnerLengthModel(
+          0.5f, 0.125f, 5f, 0.005f, controller);
+      this.newFloorThicknessSpinner = new AutoCommitSpinner(newFloorThicknessSpinnerModel);
+      newFloorThicknessSpinnerModel.setLength(controller.getNewFloorThickness());
+      newFloorThicknessSpinnerModel.addChangeListener(new ChangeListener() {
+          public void stateChanged(ChangeEvent ev) {
+            controller.setNewFloorThickness(newFloorThicknessSpinnerModel.getLength());
+          }
+        });
+      controller.addPropertyChangeListener(UserPreferencesController.Property.NEW_FLOOR_THICKNESS, 
+          new PropertyChangeListener() {
+            public void propertyChange(PropertyChangeEvent ev) {
+              newFloorThicknessSpinnerModel.setLength(controller.getNewFloorThickness());
+            }
+          });
+    }
+    
     if (controller.isPropertyEditable(UserPreferencesController.Property.AUTO_SAVE_DELAY_FOR_RECOVERY)) {
       this.autoSaveDelayForRecoveryCheckBox = new JCheckBox(SwingTools.getLocalizedLabelText(preferences, 
           UserPreferencesPanel.class, "autoSaveDelayForRecoveryCheckBox.text"));
@@ -548,6 +597,40 @@
     this.dialogTitle = preferences.getLocalizedString(UserPreferencesPanel.class, "preferences.title");
   }
 
+  /**
+   * Preferences property listener bound to this component with a weak reference to avoid
+   * strong link between preferences and this component.  
+   */
+  private static class SupportedLanguagesChangeListener implements PropertyChangeListener {
+    private WeakReference<UserPreferencesPanel> userPreferencesPanel;
+
+    public SupportedLanguagesChangeListener(UserPreferencesPanel userPreferencesPanel) {
+      this.userPreferencesPanel = new WeakReference<UserPreferencesPanel>(userPreferencesPanel);
+    }
+    
+    public void propertyChange(PropertyChangeEvent ev) {
+      // If panel was garbage collected, remove this listener from preferences
+      UserPreferencesPanel userPreferencesPanel = this.userPreferencesPanel.get();
+      if (userPreferencesPanel == null) {
+        ((UserPreferences)ev.getSource()).removePropertyChangeListener(
+            UserPreferences.Property.SUPPORTED_LANGUAGES, this);
+      } else {
+        JComboBox languageComboBox = userPreferencesPanel.languageComboBox;
+        List<String> oldSupportedLanguages = Arrays.asList((String [])ev.getOldValue());
+        String [] supportedLanguages = (String [])ev.getNewValue();
+        languageComboBox.setModel(new DefaultComboBoxModel(supportedLanguages));
+        // Select the first language added to supported languages
+        for (String language : supportedLanguages) {
+          if (!oldSupportedLanguages.contains(language)) {
+            languageComboBox.setSelectedItem(language);
+            return;
+          }
+        }
+        languageComboBox.setSelectedItem(userPreferencesPanel.controller.getLanguage());
+      }
+    }
+  }
+
   private void updateAutoSaveDelayForRecoveryComponents(UserPreferencesController controller) {
     int autoSaveDelayForRecoveryInMinutes = controller.getAutoSaveDelayForRecovery() / 60000;
     boolean autoSaveForRecoveryEnabled = controller.isAutoSaveForRecoveryEnabled();
@@ -627,6 +710,11 @@
             UserPreferencesPanel.class, "newWallHeightLabel.mnemonic")).getKeyCode());
         this.newWallHeightLabel.setLabelFor(this.newWallHeightSpinner);
       }      
+      if (this.newFloorThicknessLabel != null) {
+        this.newFloorThicknessLabel.setDisplayedMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
+            UserPreferencesPanel.class, "newFloorThicknessLabel.mnemonic")).getKeyCode());
+        this.newFloorThicknessLabel.setLabelFor(this.newFloorThicknessSpinner);
+      }
       if (this.autoSaveDelayForRecoveryCheckBox != null) {
         this.autoSaveDelayForRecoveryCheckBox.setMnemonic(KeyStroke.getKeyStroke(preferences.getLocalizedString(
             UserPreferencesPanel.class, "autoSaveDelayForRecoveryCheckBox.mnemonic")).getKeyCode());
@@ -651,8 +739,13 @@
           0, 0, 1, 1, 0, 0, labelAlignment, 
           GridBagConstraints.NONE, labelInsets, 0, 0));
       add(this.languageComboBox, new GridBagConstraints(
-          1, 0, 2, 1, 0, 0, GridBagConstraints.LINE_START, 
-          GridBagConstraints.NONE, rightComponentInsets, 0, 0));
+          1, 0, 1, 1, 0, 0, GridBagConstraints.LINE_START, 
+          GridBagConstraints.NONE, new Insets(OperatingSystem.isMacOSX() ? 1 : 0, 0, 5, 5), 0, 0));
+      if (this.languageLibraryImportButton != null) {
+        add(this.languageLibraryImportButton, new GridBagConstraints(
+            2, 0, 1, 1, 0, 0, GridBagConstraints.LINE_START, 
+            GridBagConstraints.NONE, new Insets(0, 0, 5, 0), 0, 0));
+      }
     }
     if (this.unitLabel != null) {
       // Second row
@@ -772,14 +865,23 @@
           1, 12, 1, 1, 0, 0, GridBagConstraints.LINE_START, 
           GridBagConstraints.HORIZONTAL, rightComponentInsets, 0, 0));
     }
+    if (this.newFloorThicknessLabel != null) {
+      // Fourteenth  row
+      add(this.newFloorThicknessLabel, new GridBagConstraints(
+          0, 13, 1, 1, 0, 0, labelAlignment, 
+          GridBagConstraints.NONE, labelInsets, 0, 0));
+      add(this.newFloorThicknessSpinner, new GridBagConstraints(
+          1, 13, 1, 1, 0, 0, GridBagConstraints.LINE_START, 
+          GridBagConstraints.HORIZONTAL, rightComponentInsets, 0, 0));
+    }
     if (this.autoSaveDelayForRecoveryCheckBox != null) {
       JPanel autoSaveDelayForRecoveryPanel = new JPanel();
-      // Fourteenth  row
+      // Fifteenth  row
       autoSaveDelayForRecoveryPanel.add(this.autoSaveDelayForRecoveryCheckBox);
       autoSaveDelayForRecoveryPanel.add(this.autoSaveDelayForRecoverySpinner);
       autoSaveDelayForRecoveryPanel.add(this.autoSaveDelayForRecoveryUnitLabel);
       add(autoSaveDelayForRecoveryPanel, new GridBagConstraints(
-          0, 13, 3, 1, 0, 0, GridBagConstraints.LINE_START, 
+          0, 14, 3, 1, 0, 0, GridBagConstraints.LINE_START, 
           GridBagConstraints.HORIZONTAL, rightComponentInsets, 0, 0));
     }
     // Last row
@@ -787,7 +889,7 @@
         && this.resetDisplayedActionTipsButton.getText().length() > 0) {
       // Display reset button only if its text isn't empty 
       add(this.resetDisplayedActionTipsButton, new GridBagConstraints(
-          0, 14, 3, 1, 0, 0, GridBagConstraints.CENTER, 
+          0, 15, 3, 1, 0, 0, GridBagConstraints.CENTER, 
           GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
     }
   }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/VideoPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/VideoPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/VideoPanel.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/VideoPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -37,6 +37,8 @@
 import java.awt.GridBagLayout;
 import java.awt.Image;
 import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -985,6 +987,7 @@
       dialog.setModal(false);
       
       Component homeRoot = SwingUtilities.getRoot((Component)parentView);
+      Point dialogLocation = null;
       if (homeRoot != null) {
         // Restore location if it exists
         Integer x = (Integer)this.home.getVisualProperty(VIDEO_DIALOG_X_VISUAL_PROPERTY);
@@ -1009,18 +1012,20 @@
         if (x != null && y != null 
             && x + dialogWidth <= screenRightBorder
             && y + dialogHeight <= screenBottomBorder) {
-          dialog.setLocation(x, y);
+          dialogLocation = new Point(x, y);
         } else if (screenRightBorder - windowRightBorder > dialogWidth / 2
             || dialogHeight == screenHeight) {
           // If there some space left at the right of the window
           // move the dialog to the right of window
-          dialog.setLocationByPlatform(false);
-          dialog.setLocation(Math.min(windowRightBorder + 5, screenRightBorder - dialogWidth), 
+          dialogLocation = new Point(Math.min(windowRightBorder + 5, screenRightBorder - dialogWidth), 
               Math.max(Math.min(homeRoot.getY() + dialog.getInsets().top, 
                   screenSize.height - dialogHeight - screenInsets.bottom), screenInsets.top));
-        } else {
-          dialog.setLocationByPlatform(true);
         }
+      }
+      if (dialogLocation != null
+          && SwingTools.isRectangleVisibleAtScreen(new Rectangle(dialogLocation, dialog.getSize()))) {
+        dialog.setLocationByPlatform(false);
+        dialog.setLocation(dialogLocation);
       } else {
         dialog.setLocationByPlatform(true);
       }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/WallPanel.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/WallPanel.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/swing/WallPanel.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/swing/WallPanel.java	2011-12-21 00:48:52.000000000 +0000
@@ -119,8 +119,9 @@
     // Create X start label and its spinner bound to X_START controller property
     this.xStartLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         WallPanel.class, "xLabel.text", unitName));
+    final float maximumLength = preferences.getLengthUnit().getMaximumLength();
     final NullableSpinner.NullableSpinnerLengthModel xStartSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, -100000f, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, -maximumLength, maximumLength);
     this.xStartSpinner = new NullableSpinner(xStartSpinnerModel);
     xStartSpinnerModel.setNullable(controller.getXStart() == null);
     xStartSpinnerModel.setLength(controller.getXStart());
@@ -143,7 +144,7 @@
     this.yStartLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         WallPanel.class, "yLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel yStartSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, -100000f, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, -maximumLength, maximumLength);
     this.yStartSpinner = new NullableSpinner(yStartSpinnerModel);
     yStartSpinnerModel.setNullable(controller.getYStart() == null);
     yStartSpinnerModel.setLength(controller.getYStart());
@@ -166,7 +167,7 @@
     this.xEndLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         WallPanel.class, "xLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel xEndSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, -100000f, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, -maximumLength, maximumLength);
     this.xEndSpinner = new NullableSpinner(xEndSpinnerModel);
     xEndSpinnerModel.setNullable(controller.getXEnd() == null);
     xEndSpinnerModel.setLength(controller.getXEnd());
@@ -189,7 +190,7 @@
     this.yEndLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         WallPanel.class, "yLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel yEndSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, -100000f, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, -maximumLength, maximumLength);
     this.yEndSpinner = new NullableSpinner(yEndSpinnerModel);
     yEndSpinnerModel.setNullable(controller.getYEnd() == null);
     yEndSpinnerModel.setLength(controller.getYEnd());
@@ -213,7 +214,7 @@
         WallPanel.class, "distanceToEndPointLabel.text", unitName));
     float minimumLength = preferences.getLengthUnit().getMinimumLength();
     final NullableSpinner.NullableSpinnerLengthModel distanceToEndPointSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 100000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 2 * maximumLength * (float)Math.sqrt(2));
     this.distanceToEndPointSpinner = new NullableSpinner(distanceToEndPointSpinnerModel);
     distanceToEndPointSpinnerModel.setNullable(controller.getLength() == null);
     distanceToEndPointSpinnerModel.setLength(controller.getLength());
@@ -429,7 +430,7 @@
     this.rectangularWallHeightLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
             WallPanel.class, "rectangularWallHeightLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel rectangularWallHeightSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 10000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength);
     this.rectangularWallHeightSpinner = new NullableSpinner(rectangularWallHeightSpinnerModel);
     rectangularWallHeightSpinnerModel.setNullable(controller.getRectangularWallHeight() == null);
     rectangularWallHeightSpinnerModel.setLength(controller.getRectangularWallHeight());
@@ -469,7 +470,7 @@
     this.slopingWallHeightAtStartLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         WallPanel.class, "slopingWallHeightAtStartLabel.text"));
     final NullableSpinner.NullableSpinnerLengthModel slopingWallHeightAtStartSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 10000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength);
     this.slopingWallHeightAtStartSpinner = new NullableSpinner(slopingWallHeightAtStartSpinnerModel);
     slopingWallHeightAtStartSpinnerModel.setNullable(controller.getSlopingWallHeightAtStart() == null);
     slopingWallHeightAtStartSpinnerModel.setLength(controller.getSlopingWallHeightAtStart());
@@ -495,7 +496,7 @@
     this.slopingWallHeightAtEndLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         WallPanel.class, "slopingWallHeightAtEndLabel.text"));
     final NullableSpinner.NullableSpinnerLengthModel slopingWallHeightAtEndSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 10000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength);
     this.slopingWallHeightAtEndSpinner = new NullableSpinner(slopingWallHeightAtEndSpinnerModel);
     slopingWallHeightAtEndSpinnerModel.setNullable(controller.getSlopingWallHeightAtEnd() == null);
     slopingWallHeightAtEndSpinnerModel.setLength(controller.getSlopingWallHeightAtEnd());
@@ -521,7 +522,7 @@
     this.thicknessLabel = new JLabel(SwingTools.getLocalizedLabelText(preferences, 
         WallPanel.class, "thicknessLabel.text", unitName));
     final NullableSpinner.NullableSpinnerLengthModel thicknessSpinnerModel = 
-        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, 10000f);
+        new NullableSpinner.NullableSpinnerLengthModel(preferences, minimumLength, maximumLength / 10);
     this.thicknessSpinner = new NullableSpinner(thicknessSpinnerModel);
     thicknessSpinnerModel.setNullable(controller.getThickness() == null);
     thicknessSpinnerModel.setLength(controller.getThickness());
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/tools/OperatingSystem.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/tools/OperatingSystem.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/tools/OperatingSystem.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/tools/OperatingSystem.java	2011-12-21 00:48:52.000000000 +0000
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
+import java.security.AccessControlException;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.util.Timer;
@@ -64,8 +65,12 @@
     } catch (MissingResourceException ex) {
       temporarySubFolder = "work";
     }
-    temporarySubFolder = System.getProperty(
-        "com.eteks.sweethome3d.tools.temporarySubFolder", temporarySubFolder);
+    try {
+      temporarySubFolder = System.getProperty(
+          "com.eteks.sweethome3d.tools.temporarySubFolder", temporarySubFolder);
+    } catch (AccessControlException ex) {
+      // Don't change temporarySubFolder value
+    }
     TEMPORARY_SUB_FOLDER = temporarySubFolder;
     TEMPORARY_SESSION_SUB_FOLDER = UUID.randomUUID().toString();
   }
@@ -137,6 +142,7 @@
       }
     } catch (IOException ex) {
       // Ignore temporary folder that can't be found
+    } catch (AccessControlException ex) {
     }
   }
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/BackgroundImageWizardController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/BackgroundImageWizardController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/BackgroundImageWizardController.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/BackgroundImageWizardController.java	2011-12-21 00:48:52.000000000 +0000
@@ -33,6 +33,7 @@
 import com.eteks.sweethome3d.model.BackgroundImage;
 import com.eteks.sweethome3d.model.Content;
 import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.UserPreferences;
 
 /**
@@ -93,16 +94,24 @@
    */
   @Override
   public void finish() {
-    BackgroundImage oldImage = this.home.getBackgroundImage();
+    Level selectedLevel = this.home.getSelectedLevel();
+    BackgroundImage oldImage = selectedLevel != null
+        ? selectedLevel.getBackgroundImage()
+        : this.home.getBackgroundImage();
     float [][] scaleDistancePoints = getScaleDistancePoints();
     BackgroundImage image = new BackgroundImage(getImage(),
         getScaleDistance(), scaleDistancePoints [0][0], scaleDistancePoints [0][1],
         scaleDistancePoints [1][0], scaleDistancePoints [1][1], 
         getXOrigin(), getYOrigin());
-    this.home.setBackgroundImage(image);
+    if (selectedLevel != null) {
+      selectedLevel.setBackgroundImage(image);
+    } else {
+      this.home.setBackgroundImage(image);
+    }
     boolean modification = oldImage == null;
     UndoableEdit undoableEdit = 
-        new BackgroundImageUndoableEdit(this.home, this.preferences,modification, oldImage, image);
+        new BackgroundImageUndoableEdit(this.home, selectedLevel, 
+            this.preferences, modification, oldImage, image);
     this.undoSupport.postEdit(undoableEdit);
   }
 
@@ -112,17 +121,20 @@
    */
   private static class BackgroundImageUndoableEdit extends AbstractUndoableEdit {
     private final Home            home;
+    private final Level           level;
     private final UserPreferences preferences;
     private final boolean         modification;
     private final BackgroundImage oldImage;
     private final BackgroundImage image;
 
     private BackgroundImageUndoableEdit(Home home,
+                                        Level level, 
                                         UserPreferences preferences,
                                         boolean modification,
                                         BackgroundImage oldImage,
                                         BackgroundImage image) {
       this.home = home;
+      this.level = level;
       this.preferences = preferences;
       this.modification = modification;
       this.oldImage = oldImage;
@@ -132,13 +144,23 @@
     @Override
     public void undo() throws CannotUndoException {
       super.undo();
-      this.home.setBackgroundImage(this.oldImage); 
+      this.home.setSelectedLevel(this.level);
+      if (this.level != null) {
+        this.level.setBackgroundImage(this.oldImage);
+      } else {
+        this.home.setBackgroundImage(this.oldImage);
+      } 
     }
 
     @Override
     public void redo() throws CannotRedoException {
       super.redo();
-      this.home.setBackgroundImage(this.image);
+      this.home.setSelectedLevel(this.level);
+      if (this.level != null) {
+        this.level.setBackgroundImage(this.image);
+      } else {
+        this.home.setBackgroundImage(this.image);
+      } 
     }
 
     @Override
@@ -192,8 +214,11 @@
   protected View getStepsView() {
     // Create view lazily only once it's needed
     if (this.stepsView == null) {
+      BackgroundImage image = this.home.getSelectedLevel() != null
+          ? this.home.getSelectedLevel().getBackgroundImage()
+          : this.home.getBackgroundImage();
       this.stepsView = this.viewFactory.createBackgroundImageWizardStepsView(
-          this.home.getBackgroundImage(), this.preferences, this);
+          image, this.preferences, this);
     }
     return this.stepsView;
   }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/FurnitureController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/FurnitureController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/FurnitureController.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/FurnitureController.java	2011-12-21 00:48:52.000000000 +0000
@@ -36,10 +36,16 @@
 
 import com.eteks.sweethome3d.model.CollectionEvent;
 import com.eteks.sweethome3d.model.CollectionListener;
+import com.eteks.sweethome3d.model.DoorOrWindow;
 import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.HomeDoorOrWindow;
 import com.eteks.sweethome3d.model.HomeFurnitureGroup;
+import com.eteks.sweethome3d.model.HomeLight;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture.SortableProperty;
+import com.eteks.sweethome3d.model.Level;
+import com.eteks.sweethome3d.model.Light;
+import com.eteks.sweethome3d.model.PieceOfFurniture;
 import com.eteks.sweethome3d.model.Selectable;
 import com.eteks.sweethome3d.model.SelectionEvent;
 import com.eteks.sweethome3d.model.SelectionListener;
@@ -166,8 +172,9 @@
       basePlanLocked &= !isPieceOfFurniturePartOfBasePlan(newFurniture [i]);
     }  
     final boolean newBasePlanLocked = basePlanLocked;
+    final Level furnitureLevel = this.home.getSelectedLevel();
     
-    doAddFurniture(newFurniture, furnitureIndex, newBasePlanLocked); 
+    doAddFurniture(newFurniture, furnitureIndex, furnitureLevel, null, newBasePlanLocked); 
     if (this.undoSupport != null) {
       UndoableEdit undoableEdit = new AbstractUndoableEdit() {
         @Override
@@ -180,7 +187,7 @@
         @Override
         public void redo() throws CannotRedoException {
           super.redo();
-          doAddFurniture(newFurniture, furnitureIndex, newBasePlanLocked); 
+          doAddFurniture(newFurniture, furnitureIndex, furnitureLevel, null, newBasePlanLocked); 
         }
         
         @Override
@@ -194,9 +201,12 @@
   
   private void doAddFurniture(HomePieceOfFurniture [] furniture,
                               int [] furnitureIndex,
+                              Level furnitureLevel, 
+                              Level [] furnitureLevels, 
                               boolean basePlanLocked) {
     for (int i = 0; i < furnitureIndex.length; i++) {
       this.home.addPieceOfFurniture (furniture [i], furnitureIndex [i]);
+      furniture [i].setLevel(furnitureLevels != null ? furnitureLevels [i] : furnitureLevel);
     }
     this.home.setBasePlanLocked(basePlanLocked);
     this.home.setSelectedItems(Arrays.asList(furniture)); 
@@ -228,9 +238,12 @@
     final HomePieceOfFurniture [] furniture = sortedMap.values().
         toArray(new HomePieceOfFurniture [sortedMap.size()]); 
     final int [] furnitureIndex = new int [furniture.length];
+    final Level [] furnitureLevels = new Level [furniture.length];
     int i = 0;
     for (int index : sortedMap.keySet()) {
-      furnitureIndex [i++] = index; 
+      furnitureIndex [i] = index; 
+      furnitureLevels [i] = furniture [i].getLevel();
+      i++;
     }
     doDeleteFurniture(furniture, basePlanLocked); 
     if (this.undoSupport != null) {
@@ -238,7 +251,7 @@
         @Override
         public void undo() throws CannotUndoException {
           super.undo();
-          doAddFurniture(furniture, furnitureIndex, basePlanLocked); 
+          doAddFurniture(furniture, furnitureIndex, null, furnitureLevels, basePlanLocked); 
         }
         
         @Override
@@ -306,6 +319,19 @@
   }
 
   /**
+   * Returns a new home piece of furniture created from an other given <code>piece</code> of furniture.
+   */
+  public HomePieceOfFurniture createHomePieceOfFurniture(PieceOfFurniture piece) {
+    if (piece instanceof DoorOrWindow) {
+      return new HomeDoorOrWindow((DoorOrWindow)piece);
+    } else if (piece instanceof Light) {
+      return new HomeLight((Light)piece);
+    } else {
+      return new HomePieceOfFurniture(piece);
+    }
+  }
+
+  /**
    * Returns the furniture among the given list that are not part of the base plan.
    */
   private List<HomePieceOfFurniture> getFurnitureNotPartOfBasePlan(List<HomePieceOfFurniture> furniture) {
@@ -398,6 +424,7 @@
               HomePieceOfFurniture.SortableProperty.Y,
               HomePieceOfFurniture.SortableProperty.ELEVATION,
               HomePieceOfFurniture.SortableProperty.ANGLE,
+              HomePieceOfFurniture.SortableProperty.LEVEL,
               HomePieceOfFurniture.SortableProperty.COLOR,
               HomePieceOfFurniture.SortableProperty.TEXTURE,
               HomePieceOfFurniture.SortableProperty.MOVABLE,
@@ -438,6 +465,18 @@
   }
 
   /**
+   * Controls the modification of the visibility of the selected piece of furniture.
+   */
+  public void toggleSelectedFurnitureVisibility() {
+    if (Home.getFurnitureSubList(this.home.getSelectedItems()).size() == 1) {
+      HomeFurnitureController controller = new HomeFurnitureController(this.home, this.preferences,  
+          this.viewFactory, this.contentManager, this.undoSupport);
+      controller.setVisible(!controller.getVisible());
+      controller.modifyFurniture();
+    }
+  }
+
+  /**
    * Groups the selected furniture as one piece of furniture.
    */
   public void groupSelectedFurniture() {
@@ -455,31 +494,49 @@
       final HomePieceOfFurniture [] groupPieces = sortedMap.values().
           toArray(new HomePieceOfFurniture [sortedMap.size()]); 
       final int [] groupPiecesIndex = new int [groupPieces.length];
+      final Level [] groupPiecesLevel = new Level [groupPieces.length];
+      final float [] groupPiecesElevation = new float [groupPieces.length];
       final boolean [] groupPiecesMovable = new boolean [groupPieces.length];
       final boolean [] groupPiecesVisible = new boolean [groupPieces.length];
+      Level minLevel = this.home.getSelectedLevel();
       int i = 0;
       for (Entry<Integer, HomePieceOfFurniture> pieceEntry : sortedMap.entrySet()) {
         groupPiecesIndex [i] = pieceEntry.getKey();
-        groupPiecesMovable [i] = pieceEntry.getValue().isMovable();
-        groupPiecesVisible [i++] = pieceEntry.getValue().isVisible();
+        HomePieceOfFurniture piece = pieceEntry.getValue();
+        groupPiecesLevel [i] = piece.getLevel();
+        groupPiecesElevation [i] = piece.getElevation();
+        groupPiecesMovable [i] = piece.isMovable();
+        groupPiecesVisible [i] = piece.isVisible();
+        if (groupPiecesLevel [i] != null) {
+          if (minLevel == null
+              || groupPiecesLevel [i].getElevation() < minLevel.getElevation()) {
+            minLevel = groupPiecesLevel [i];
+          }
+        }
+        i++;
+      }
+
+      final HomeFurnitureGroup furnitureGroup = createHomeFurnitureGroup(selectedFurniture);
+      final float [] groupPiecesNewElevation = new float [groupPieces.length];
+      i = 0;
+      for (HomePieceOfFurniture piece : sortedMap.values()) {
+        groupPiecesNewElevation [i++] = piece.getElevation();
       }
-
-      String furnitureGroupName = this.preferences.getLocalizedString(
-          FurnitureController.class, "groupName", getFurnitureGroupCount(homeFurniture) + 1);
-      final HomeFurnitureGroup furnitureGroup = new HomeFurnitureGroup(selectedFurniture, furnitureGroupName);
       final int furnitureGroupIndex = homeFurniture.size() - groupPieces.length;
       final boolean movable = furnitureGroup.isMovable();
+      final Level groupLevel = minLevel;
       
       doGroupFurniture(groupPieces, new HomeFurnitureGroup [] {furnitureGroup}, 
-          new int [] {furnitureGroupIndex}, basePlanLocked);
+          new int [] {furnitureGroupIndex}, new Level [] {groupLevel}, basePlanLocked);
       if (this.undoSupport != null) {
         UndoableEdit undoableEdit = new AbstractUndoableEdit() {
             @Override
             public void undo() throws CannotUndoException {
               super.undo();
               doUngroupFurniture(groupPieces, groupPiecesIndex, 
-                  new HomeFurnitureGroup [] {furnitureGroup}, basePlanLocked);
+                  new HomeFurnitureGroup [] {furnitureGroup}, groupPiecesLevel, basePlanLocked);
               for (int i = 0; i < groupPieces.length; i++) {
+                groupPieces [i].setElevation(groupPiecesElevation [i]);
                 groupPieces [i].setMovable(groupPiecesMovable [i]);
                 groupPieces [i].setVisible(groupPiecesVisible [i]);
               }
@@ -489,10 +546,14 @@
             @Override
             public void redo() throws CannotRedoException {
               super.redo();
-              doGroupFurniture(groupPieces, new HomeFurnitureGroup [] {furnitureGroup}, 
-                  new int [] {furnitureGroupIndex}, basePlanLocked);
+              for (int i = 0; i < groupPieces.length; i++) {
+                groupPieces [i].setElevation(groupPiecesNewElevation [i]);
+                groupPieces [i].setLevel(null);
+              }
               furnitureGroup.setMovable(movable);
               furnitureGroup.setVisible(true);
+              doGroupFurniture(groupPieces, new HomeFurnitureGroup [] {furnitureGroup}, 
+                  new int [] {furnitureGroupIndex}, new Level [] {groupLevel}, basePlanLocked);
             }
             
             @Override
@@ -506,6 +567,16 @@
   }
 
   /**
+   * Returns a new furniture group for the given furniture list.
+   */
+  protected HomeFurnitureGroup createHomeFurnitureGroup(List<HomePieceOfFurniture> furniture) {
+    String furnitureGroupName = this.preferences.getLocalizedString(
+        FurnitureController.class, "groupName", getFurnitureGroupCount(this.home.getFurniture()) + 1);
+    final HomeFurnitureGroup furnitureGroup = new HomeFurnitureGroup(furniture, furnitureGroupName);
+    return furnitureGroup;
+  }
+
+  /**
    * Returns the count of furniture groups among the given list.
    */
   private int getFurnitureGroupCount(List<HomePieceOfFurniture> furniture) {
@@ -521,17 +592,19 @@
   private void doGroupFurniture(HomePieceOfFurniture [] groupPieces,
                                 HomeFurnitureGroup [] furnitureGroups,
                                 int [] furnitureGroupsIndex,
+                                Level [] groupLevels, 
                                 boolean basePlanLocked) {
     doDeleteFurniture(groupPieces, basePlanLocked);
-    doAddFurniture(furnitureGroups, furnitureGroupsIndex, basePlanLocked);
+    doAddFurniture(furnitureGroups, furnitureGroupsIndex, null, groupLevels, basePlanLocked);
   }
 
   private void doUngroupFurniture(HomePieceOfFurniture [] groupPieces,
                                   int [] groupPiecesIndex,
                                   HomeFurnitureGroup [] furnitureGroups,
+                                  Level [] groupLevels, 
                                   boolean basePlanLocked) {
     doDeleteFurniture(furnitureGroups, basePlanLocked);
-    doAddFurniture(groupPieces, groupPiecesIndex, basePlanLocked);
+    doAddFurniture(groupPieces, groupPiecesIndex, null, groupLevels, basePlanLocked);
   }
 
   /**
@@ -572,29 +645,31 @@
       final HomePieceOfFurniture [] groupPieces = 
           groupPiecesList.toArray(new HomePieceOfFurniture [groupPiecesList.size()]);      
       final int [] groupPiecesIndex = new int [groupPieces.length];
+      final Level [] groupPiecesLevel = new Level [groupPieces.length];
       int endIndex = homeFurniture.size() - furnitureGroups.length;
       boolean basePlanLocked = oldBasePlanLocked;
       for (i = 0; i < groupPieces.length; i++) {
         groupPiecesIndex [i] = endIndex++; 
+        groupPiecesLevel [i] = groupPieces [i].getLevel();
         // Unlock base plan if the piece is a part of it
         basePlanLocked &= !isPieceOfFurniturePartOfBasePlan(groupPieces [i]);
       }  
       final boolean newBasePlanLocked = basePlanLocked;
 
-      doUngroupFurniture(groupPieces, groupPiecesIndex, furnitureGroups, newBasePlanLocked);
+      doUngroupFurniture(groupPieces, groupPiecesIndex, furnitureGroups, groupPiecesLevel, newBasePlanLocked);
       if (this.undoSupport != null) {
         UndoableEdit undoableEdit = new AbstractUndoableEdit() {
             @Override
             public void undo() throws CannotUndoException {
               super.undo();
-              doGroupFurniture(groupPieces, furnitureGroups, furnitureGroupsIndex, oldBasePlanLocked);
+              doGroupFurniture(groupPieces, furnitureGroups, furnitureGroupsIndex, groupPiecesLevel, oldBasePlanLocked);
               home.setSelectedItems(oldSelection);
             }
             
             @Override
             public void redo() throws CannotRedoException {
               super.redo();
-              doUngroupFurniture(groupPieces, groupPiecesIndex, furnitureGroups, newBasePlanLocked);
+              doUngroupFurniture(groupPieces, groupPiecesIndex, furnitureGroups, groupPiecesLevel, newBasePlanLocked);
             }
             
             @Override
@@ -611,7 +686,7 @@
    * Displays the wizard that helps to import furniture to home. 
    */
   public void importFurniture() {
-    new ImportedFurnitureWizardController(this.home, this.preferences, this.viewFactory, 
+    new ImportedFurnitureWizardController(this.home, this.preferences, this, this.viewFactory, 
         this.contentManager, this.undoSupport).displayView(getView());
   }
   
@@ -620,7 +695,7 @@
    * given model name. 
    */
   public void importFurniture(String modelName) {
-    new ImportedFurnitureWizardController(this.home, modelName, this.preferences, 
+    new ImportedFurnitureWizardController(this.home, modelName, this.preferences, this, 
         this.viewFactory, this.contentManager, this.undoSupport).displayView(getView());
   }
   
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HelpController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HelpController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HelpController.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HelpController.java	2011-12-21 00:48:52.000000000 +0000
@@ -549,15 +549,14 @@
       @Override
       public void handleStartTag(HTML.Tag tag,
                                  MutableAttributeSet att, int pos) {
-        String attribute;
         if (tag.equals(HTML.Tag.A)) { // <a href=...> tag
-          attribute = (String)att.getAttribute(HTML.Attribute.HREF);
+          String attribute = (String)att.getAttribute(HTML.Attribute.HREF);
           if (attribute != null) {
             addReferencedDocument(attribute);
           }
         } else if (tag.equals(HTML.Tag.TITLE)) {
           this.inTitle = true;
-        }
+        } 
       }
       
       @Override
@@ -568,12 +567,27 @@
       }
       
       @Override
+      public void handleSimpleTag(Tag tag, MutableAttributeSet att, int pos) {
+        if (tag.equals(HTML.Tag.META)) {
+          String nameAttribute = (String)att.getAttribute(HTML.Attribute.NAME); 
+          String contentAttribute = (String)att.getAttribute(HTML.Attribute.CONTENT);
+          if ("keywords".equalsIgnoreCase(nameAttribute)
+              && contentAttribute != null) {
+            searchWords(contentAttribute);
+          }
+        }
+      }
+      
+      @Override
       public void handleText(char [] data, int pos) {
         String text = new String(data);
         if (this.inTitle) {
           title += text;
         }
-        
+        searchWords(text);
+      }
+
+      private void searchWords(String text) {
         String lowerCaseText = text.toLowerCase();
         for (String searchedWord : searchedWords) {
           for (int index = 0; index < lowerCaseText.length(); index += searchedWord.length() + 1) {
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/Home3DAttributesController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/Home3DAttributesController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/Home3DAttributesController.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/Home3DAttributesController.java	2011-12-21 00:48:52.000000000 +0000
@@ -22,6 +22,7 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
+import java.util.List;
 
 import javax.swing.undo.AbstractUndoableEdit;
 import javax.swing.undo.CannotRedoException;
@@ -32,6 +33,7 @@
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomeEnvironment;
 import com.eteks.sweethome3d.model.HomeTexture;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.ObserverCamera;
 import com.eteks.sweethome3d.model.UserPreferences;
 
@@ -43,7 +45,7 @@
   /**
    * The properties that may be edited by the view associated to this controller. 
    */
-  public enum Property {OBSERVER_FIELD_OF_VIEW_IN_DEGREES, OBSERVER_HEIGHT, 
+  public enum Property {OBSERVER_FIELD_OF_VIEW_IN_DEGREES, OBSERVER_HEIGHT, OBSERVER_CAMERA_ELEVATION, MINIMUM_ELEVATION, 
       GROUND_COLOR, GROUND_PAINT, SKY_COLOR, SKY_PAINT,
       LIGHT_COLOR, WALLS_ALPHA}
   /**
@@ -61,14 +63,16 @@
   private final PropertyChangeSupport propertyChangeSupport;
   private DialogView                  home3DAttributesView;
 
-  private int   observerFieldOfViewInDegrees;
-  private float observerHeight;
-  private int   groundColor;
-  private EnvironmentPaint groundPaint;
-  private int   skyColor;
-  private EnvironmentPaint skyPaint;
-  private int   lightColor;
-  private float wallsAlpha;
+  private int               observerFieldOfViewInDegrees;
+  private float             observerHeight;
+  private Float             observerCameraElevation;
+  private float             minimumElevation;
+  private int               groundColor;
+  private EnvironmentPaint  groundPaint;
+  private int               skyColor;
+  private EnvironmentPaint  skyPaint;
+  private int               lightColor;
+  private float             wallsAlpha;
 
   /**
    * Creates the controller of 3D view with undo support.
@@ -166,6 +170,11 @@
     setObserverFieldOfViewInDegrees((int)(Math.round(Math.toDegrees(
         this.home.getObserverCamera().getFieldOfView())) + 360) % 360);
     setObserverHeight(this.home.getObserverCamera().getZ() * 15 / 14);
+    List<Level> levels = this.home.getLevels();
+    setMinimumElevation(levels.size() == 0  ? 10  : 10 + levels.get(0).getElevation());
+    setObserverCameraElevation(levels.size() == 0 || levels.get(0).getElevation() == 0 && levels.get(levels.size() - 1).getElevation() == 0  
+        ? null  
+        : this.home.getObserverCamera().getZ());
     HomeEnvironment homeEnvironment = this.home.getEnvironment();
     setGroundColor(homeEnvironment.getGroundColor());
     HomeTexture groundTexture = homeEnvironment.getGroundTexture();
@@ -225,6 +234,43 @@
   }
 
   /**
+   * Sets the edited camera elevation.
+   */
+  public void setObserverCameraElevation(Float observerCameraElevation) {
+    if (observerCameraElevation != this.observerCameraElevation
+        || observerCameraElevation != null && !observerCameraElevation.equals(this.observerCameraElevation)) {
+      Float oldObserverCameraElevation = this.observerCameraElevation;
+      this.observerCameraElevation = observerCameraElevation;
+      this.propertyChangeSupport.firePropertyChange(Property.OBSERVER_CAMERA_ELEVATION.name(), oldObserverCameraElevation, observerCameraElevation);
+    }
+  }
+
+  /**
+   * Returns the edited camera elevation or <code>null</code> if observer height should be preferred.
+   */
+  public Float getObserverCameraElevation() {
+    return this.observerCameraElevation;
+  }
+
+  /**
+   * Sets the minimum elevation.
+   */
+  private void setMinimumElevation(float minimumElevation) {
+    if (minimumElevation != this.minimumElevation) {
+      float oldMinimumElevation = this.minimumElevation;
+      this.minimumElevation = minimumElevation;
+      this.propertyChangeSupport.firePropertyChange(Property.MINIMUM_ELEVATION.name(), oldMinimumElevation, minimumElevation);
+    }
+  }
+
+  /**
+   * Returns the minimum elevation.
+   */
+  public float getMinimumElevation() {
+    return this.minimumElevation;
+  }
+
+  /**
    * Sets the edited ground color.
    */
   public void setGroundColor(int groundColor) {
@@ -339,7 +385,10 @@
    */
   public void modify3DAttributes() {
     float observerCameraFieldOfView = (float)Math.toRadians(getObserverFieldOfViewInDegrees());
-    float observerCameraZ = getObserverHeight() * 14 / 15;
+    Float observerCameraElevation = getObserverCameraElevation();
+    float observerCameraZ = observerCameraElevation != null  
+        ? observerCameraElevation.floatValue()  
+        : getObserverHeight() * 14 / 15;
     int   groundColor = getGroundColor();
     HomeTexture groundTexture = getGroundPaint() == EnvironmentPaint.TEXTURED
         ? getGroundTextureController().getTexture()
@@ -369,8 +418,8 @@
           this.home, this.preferences,
           oldObserverCameraFieldOfView, oldObserverCameraZ,
           oldGroundColor, oldGroundTexture, oldSkyColor,
-          oldSkyTexture, oldLightColor, oldWallsAlpha, observerCameraFieldOfView,
-          observerCameraZ, groundColor, groundTexture, skyColor,
+          oldSkyTexture, oldLightColor, oldWallsAlpha, observerCameraFieldOfView, observerCameraZ, 
+          groundColor, groundTexture, skyColor,
           skyTexture, lightColor, wallsAlpha);
       this.undoSupport.postEdit(undoableEdit);
     }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeController3D.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeController3D.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeController3D.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeController3D.java	2011-12-21 00:48:52.000000000 +0000
@@ -33,8 +33,11 @@
 import com.eteks.sweethome3d.model.Camera;
 import com.eteks.sweethome3d.model.CollectionEvent;
 import com.eteks.sweethome3d.model.CollectionListener;
+import com.eteks.sweethome3d.model.Elevatable;
 import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.HomeEnvironment;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.ObserverCamera;
 import com.eteks.sweethome3d.model.Room;
 import com.eteks.sweethome3d.model.Selectable;
@@ -86,6 +89,23 @@
               : observerCameraState);
         }
       });
+    // Add a listener to home to update visible levels according to selected level.
+    PropertyChangeListener selectedLevelListener = new PropertyChangeListener() {
+         public void propertyChange(PropertyChangeEvent ev) {
+           List<Level> levels = home.getLevels();
+           Level selectedLevel = home.getSelectedLevel();
+           boolean visible = true;
+           for (int i = 0; i < levels.size(); i++) {
+             levels.get(i).setVisible(visible);
+             if (levels.get(i) == selectedLevel
+                 && !home.getEnvironment().isAllLevelsVisible()) {
+               visible = false;
+             }
+           }
+         }
+       };
+     this.home.addPropertyChangeListener(Home.Property.SELECTED_LEVEL, selectedLevelListener);
+     this.home.getEnvironment().addPropertyChangeListener(HomeEnvironment.Property.ALL_LEVELS_VISIBLE, selectedLevelListener);
   }
 
   /**
@@ -138,8 +158,8 @@
       }
     }
     storedCameras.add(0, camera);
-    // Ensure home stored cameras don't contain more than 10 cameras
-    while (storedCameras.size() > 10) {
+    // Ensure home stored cameras don't contain more than 20 cameras
+    while (storedCameras.size() > 20) {
       storedCameras.remove(storedCameras.size() - 1);
     }
     this.home.setStoredCameras(storedCameras);
@@ -163,6 +183,20 @@
   }
   
   /**
+   * Makes all levels visible.
+   */
+  public void displayAllLevels() {
+    this.home.getEnvironment().setAllLevelsVisible(true);
+  }
+  
+  /**
+   * Makes the selected level and below visible.
+   */
+  public void displaySelectedLevel() {
+    this.home.getEnvironment().setAllLevelsVisible(false);
+  }
+  
+  /**
    * Controls the edition of 3D attributes. 
    */
   public void modifyAttributes() {
@@ -260,12 +294,29 @@
     private Camera      topCamera;
     private Rectangle2D homeBounds;
     private float       minDistanceToHomeCenter;
+    private PropertyChangeListener levelVisibilityChangeListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          if (Level.Property.VISIBLE.name().equals(ev.getPropertyName())) {
+            updateCameraFromHomeBounds();
+          }
+        }
+      };
+    private CollectionListener<Level> levelsListener = new CollectionListener<Level>() {
+        public void collectionChanged(CollectionEvent<Level> ev) {
+          if (ev.getType() == CollectionEvent.Type.ADD) {
+            ev.getItem().addPropertyChangeListener(levelVisibilityChangeListener);
+          } else if (ev.getType() == CollectionEvent.Type.DELETE) {
+            ev.getItem().removePropertyChangeListener(levelVisibilityChangeListener);
+          } 
+          updateCameraFromHomeBounds();
+        }
+      };
     private PropertyChangeListener objectChangeListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
+        public void propertyChange(PropertyChangeEvent ev) {
           updateCameraFromHomeBounds();
         }
       };
-    private CollectionListener<Wall> wallListener = new CollectionListener<Wall>() {
+    private CollectionListener<Wall> wallsListener = new CollectionListener<Wall>() {
         public void collectionChanged(CollectionEvent<Wall> ev) {
           if (ev.getType() == CollectionEvent.Type.ADD) {
             ev.getItem().addPropertyChangeListener(objectChangeListener);
@@ -300,10 +351,14 @@
     public void enter() {
       this.topCamera = home.getCamera();
       updateCameraFromHomeBounds();
+      for (Level level : home.getLevels()) {
+        level.addPropertyChangeListener(this.levelVisibilityChangeListener);
+      }
+      home.addLevelsListener(this.levelsListener);
       for (Wall wall : home.getWalls()) {
         wall.addPropertyChangeListener(this.objectChangeListener);
       }
-      home.addWallsListener(this.wallListener);
+      home.addWallsListener(this.wallsListener);
       for (HomePieceOfFurniture piece : home.getFurniture()) {
         piece.addPropertyChangeListener(this.objectChangeListener);
       }
@@ -335,27 +390,32 @@
     private Rectangle2D getHomeBounds() {
       // Compute plan bounds to include rooms, walls and furniture
       Rectangle2D homeBounds = null;
-      Collection<Wall> walls = home.getWalls();
-      for (Wall wall : walls) {
-        for (float [] point : wall.getPoints()) {
-          homeBounds = updateHomeBounds(homeBounds, point [0], point [1]);
+      boolean containsVisibleWalls = false;
+      for (Wall wall : home.getWalls()) {
+        if (isItemAtAVisibleLevel(wall)) {
+          containsVisibleWalls = true;
+          for (float [] point : wall.getPoints()) {
+            homeBounds = updateHomeBounds(homeBounds, point [0], point [1]);
+          }
         }
       }
       for (HomePieceOfFurniture piece : home.getFurniture()) {
-        if (piece.isVisible()) {
+        if (piece.isVisible() && isItemAtAVisibleLevel(piece)) {
           for (float [] point : piece.getPoints()) {
             homeBounds = updateHomeBounds(homeBounds, point [0], point [1]);
           }
         }
       }
       for (Room room : home.getRooms()) {
-        for (float [] point : room.getPoints()) {
-          homeBounds = updateHomeBounds(homeBounds, point [0], point [1]);
+        if (isItemAtAVisibleLevel(room)) {
+          for (float [] point : room.getPoints()) {
+            homeBounds = updateHomeBounds(homeBounds, point [0], point [1]);
+          }
         }
       }
 
       if (homeBounds != null) {
-        if (walls.isEmpty()) {
+        if (!containsVisibleWalls) {
           // If home contains only rooms and furniture don't fix minimum size
           return homeBounds;
         } else {
@@ -376,6 +436,13 @@
     }
 
     /**
+     * Returns <code>true</code> if the given <code>item</code> is at a visible level.
+     */
+    private boolean isItemAtAVisibleLevel(Elevatable item) {
+      return item.getLevel() == null || item.getLevel().isVisible();
+    }
+    
+    /**
      * Adds the point at the given coordinates to <code>homeBounds</code>.
      */
     private Rectangle2D updateHomeBounds(Rectangle2D homeBounds,
@@ -398,19 +465,23 @@
         // If home contains no wall, search the max height of the highest piece
         for (HomePieceOfFurniture piece : home.getFurniture()) {
           if (piece.isVisible()) {
-            maxHeight = Math.max(maxHeight, piece.getElevation() + piece.getHeight());
+            maxHeight = Math.max(maxHeight, piece.getGroundElevation() + piece.getHeight());
           }
         }
       } else {
          // Search the max height of the highest wall
         for (Wall wall : walls) {
           Float height = wall.getHeight();
+          Level wallLevel = wall.getLevel();
+          float levelElevation = wallLevel == null 
+              ? 0
+              : wallLevel.getElevation(); 
           if (height != null) {
-            maxHeight = Math.max(maxHeight, height);
+            maxHeight = Math.max(maxHeight, levelElevation + height);
           }
           Float heightAtEnd = wall.getHeightAtEnd();
           if (heightAtEnd != null) {
-            maxHeight = Math.max(maxHeight, heightAtEnd);
+            maxHeight = Math.max(maxHeight, levelElevation + heightAtEnd);
           }
         }
       }
@@ -491,7 +562,7 @@
       for (Wall wall : home.getWalls()) {
         wall.removePropertyChangeListener(this.objectChangeListener);
       }
-      home.removeWallsListener(wallListener);
+      home.removeWallsListener(wallsListener);
       for (HomePieceOfFurniture piece : home.getFurniture()) {
         piece.removePropertyChangeListener(this.objectChangeListener);
       }
@@ -500,6 +571,10 @@
         room.removePropertyChangeListener(this.objectChangeListener);
       }
       home.removeRoomsListener(this.roomsListener);
+      for (Level room : home.getLevels()) {
+        room.removePropertyChangeListener(this.levelVisibilityChangeListener);
+      }
+      home.removeLevelsListener(this.levelsListener);
     }
   }
   
@@ -508,10 +583,31 @@
    */
   private class ObserverCameraState extends CameraControllerState {
     private ObserverCamera observerCamera;
+    private PropertyChangeListener levelElevationChangeListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          if (Level.Property.ELEVATION.name().equals(ev.getPropertyName())) {
+            updateCameraMinimumElevation();
+          }
+        }
+      };
+    private CollectionListener<Level> levelsListener = new CollectionListener<Level>() {
+        public void collectionChanged(CollectionEvent<Level> ev) {
+          if (ev.getType() == CollectionEvent.Type.ADD) {
+            ev.getItem().addPropertyChangeListener(levelElevationChangeListener);
+          } else if (ev.getType() == CollectionEvent.Type.DELETE) {
+            ev.getItem().removePropertyChangeListener(levelElevationChangeListener);
+          } 
+          updateCameraMinimumElevation();
+        }
+      };
 
     @Override
     public void enter() {
       this.observerCamera = (ObserverCamera)home.getCamera();
+      for (Level level : home.getLevels()) {
+        level.addPropertyChangeListener(this.levelElevationChangeListener);
+      }
+      home.addLevelsListener(this.levelsListener);
       // Select observer camera for user feedback
       home.setSelectedItems(Arrays.asList(new Selectable [] {this.observerCamera}));
     }
@@ -527,13 +623,25 @@
     @Override
     public void elevateCamera(float delta) {
       float newElevation = this.observerCamera.getZ() + delta; 
-      newElevation = Math.max(newElevation, 10 * 14 / 15);
-      newElevation = Math.min(newElevation, 1000 * 14 / 15);
+      newElevation = Math.min(Math.max(newElevation, getMinimumElevation()), preferences.getLengthUnit().getMaximumElevation());
       this.observerCamera.setZ(newElevation);
       // Select observer camera for user feedback
       home.setSelectedItems(Arrays.asList(new Selectable [] {this.observerCamera}));
     }
 
+    private void updateCameraMinimumElevation() {
+      observerCamera.setZ(Math.max(observerCamera.getZ(), getMinimumElevation()));
+    }
+
+    public float getMinimumElevation() {
+      List<Level> levels = home.getLevels();
+      if (levels.size() > 0) {
+        return 10 + levels.get(0).getElevation();
+      } else {
+        return 10;
+      }
+    }
+    
     @Override
     public void rotateCameraYaw(float delta) {
       this.observerCamera.setYaw(this.observerCamera.getYaw() + delta); 
@@ -568,6 +676,10 @@
         selectedItems.remove(this.observerCamera);
         home.setSelectedItems(selectedItems);
       }
+      for (Level room : home.getLevels()) {
+        room.removePropertyChangeListener(this.levelElevationChangeListener);
+      }
+      home.removeLevelsListener(this.levelsListener);
       this.observerCamera = null;
     }
   }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeController.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeController.java	2011-12-21 00:48:52.000000000 +0000
@@ -46,27 +46,24 @@
 import com.eteks.sweethome3d.model.AspectRatio;
 import com.eteks.sweethome3d.model.BackgroundImage;
 import com.eteks.sweethome3d.model.Camera;
-import com.eteks.sweethome3d.model.CatalogDoorOrWindow;
-import com.eteks.sweethome3d.model.CatalogLight;
 import com.eteks.sweethome3d.model.CatalogPieceOfFurniture;
 import com.eteks.sweethome3d.model.CatalogTexture;
 import com.eteks.sweethome3d.model.CollectionEvent;
 import com.eteks.sweethome3d.model.CollectionListener;
 import com.eteks.sweethome3d.model.Compass;
 import com.eteks.sweethome3d.model.DimensionLine;
-import com.eteks.sweethome3d.model.DoorOrWindow;
+import com.eteks.sweethome3d.model.Elevatable;
 import com.eteks.sweethome3d.model.FurnitureCatalog;
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomeApplication;
 import com.eteks.sweethome3d.model.HomeDoorOrWindow;
 import com.eteks.sweethome3d.model.HomeEnvironment;
 import com.eteks.sweethome3d.model.HomeFurnitureGroup;
-import com.eteks.sweethome3d.model.HomeLight;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.HomeRecorder;
 import com.eteks.sweethome3d.model.InterruptedRecorderException;
 import com.eteks.sweethome3d.model.Label;
-import com.eteks.sweethome3d.model.Light;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.RecorderException;
 import com.eteks.sweethome3d.model.Room;
 import com.eteks.sweethome3d.model.Selectable;
@@ -235,6 +232,7 @@
     homeView.setEnabled(HomeView.ActionType.SORT_HOME_FURNITURE_BY_Y, true);
     homeView.setEnabled(HomeView.ActionType.SORT_HOME_FURNITURE_BY_ELEVATION, true);
     homeView.setEnabled(HomeView.ActionType.SORT_HOME_FURNITURE_BY_ANGLE, true);
+    homeView.setEnabled(HomeView.ActionType.SORT_HOME_FURNITURE_BY_LEVEL, true);
     homeView.setEnabled(HomeView.ActionType.SORT_HOME_FURNITURE_BY_COLOR, true);
     homeView.setEnabled(HomeView.ActionType.SORT_HOME_FURNITURE_BY_TEXTURE, true);
     homeView.setEnabled(HomeView.ActionType.SORT_HOME_FURNITURE_BY_MOVABILITY, true);
@@ -255,6 +253,7 @@
     homeView.setEnabled(HomeView.ActionType.DISPLAY_HOME_FURNITURE_Y, true); 
     homeView.setEnabled(HomeView.ActionType.DISPLAY_HOME_FURNITURE_ELEVATION, true); 
     homeView.setEnabled(HomeView.ActionType.DISPLAY_HOME_FURNITURE_ANGLE, true); 
+    homeView.setEnabled(HomeView.ActionType.DISPLAY_HOME_FURNITURE_LEVEL, true); 
     homeView.setEnabled(HomeView.ActionType.DISPLAY_HOME_FURNITURE_COLOR, true); 
     homeView.setEnabled(HomeView.ActionType.DISPLAY_HOME_FURNITURE_TEXTURE, true); 
     homeView.setEnabled(HomeView.ActionType.DISPLAY_HOME_FURNITURE_MOVABLE, true); 
@@ -273,21 +272,23 @@
     homeView.setEnabled(HomeView.ActionType.LOCK_BASE_PLAN, true);
     homeView.setEnabled(HomeView.ActionType.UNLOCK_BASE_PLAN, true);
     homeView.setEnabled(HomeView.ActionType.MODIFY_COMPASS, true);
-    homeView.setEnabled(HomeView.ActionType.IMPORT_BACKGROUND_IMAGE, true);
-    BackgroundImage backgroundImage = this.home.getBackgroundImage();
-    boolean homeHasBackgroundImage = backgroundImage != null;
-    homeView.setEnabled(HomeView.ActionType.MODIFY_BACKGROUND_IMAGE, homeHasBackgroundImage);
-    homeView.setEnabled(HomeView.ActionType.HIDE_BACKGROUND_IMAGE, 
-        homeHasBackgroundImage && backgroundImage.isVisible());
-    homeView.setEnabled(HomeView.ActionType.SHOW_BACKGROUND_IMAGE, 
-        homeHasBackgroundImage && !backgroundImage.isVisible());
-    homeView.setEnabled(HomeView.ActionType.DELETE_BACKGROUND_IMAGE, homeHasBackgroundImage);
+    Level selectedLevel = this.home.getSelectedLevel();
+    enableBackgroungImageActions(homeView, selectedLevel != null
+        ? selectedLevel.getBackgroundImage()
+        : this.home.getBackgroundImage());
+    homeView.setEnabled(HomeView.ActionType.ADD_LEVEL, true);
+    List<Level> levels = this.home.getLevels();
+    boolean homeContainsOneSelectedLevel = levels.size() > 1 && selectedLevel != null;
+    homeView.setEnabled(HomeView.ActionType.MODIFY_LEVEL, homeContainsOneSelectedLevel);
+    homeView.setEnabled(HomeView.ActionType.DELETE_LEVEL, homeContainsOneSelectedLevel);
     homeView.setEnabled(HomeView.ActionType.ZOOM_IN, true);
     homeView.setEnabled(HomeView.ActionType.ZOOM_OUT, true);
     homeView.setEnabled(HomeView.ActionType.EXPORT_TO_SVG, true); 
     homeView.setEnabled(HomeView.ActionType.VIEW_FROM_TOP, true);
     homeView.setEnabled(HomeView.ActionType.VIEW_FROM_OBSERVER, true);
     homeView.setEnabled(HomeView.ActionType.STORE_POINT_OF_VIEW, true);
+    homeView.setEnabled(HomeView.ActionType.DISPLAY_ALL_LEVELS, levels.size() > 1);
+    homeView.setEnabled(HomeView.ActionType.DISPLAY_SELECTED_LEVEL, levels.size() > 1);
     homeView.setEnabled(HomeView.ActionType.DETACH_3D_VIEW, true);
     homeView.setEnabled(HomeView.ActionType.ATTACH_3D_VIEW, true);
     homeView.setEnabled(HomeView.ActionType.VIEW_FROM_OBSERVER, true);
@@ -410,6 +411,7 @@
     addFurnitureSortListener();
     addUndoSupportListener();
     addHomeItemsListener();
+    addLevelListeners();
     addPlanControllerListeners();
     addLanguageListener();
   }
@@ -600,20 +602,27 @@
       this.home.addPropertyChangeListener(Home.Property.BACKGROUND_IMAGE, 
           new PropertyChangeListener() {
             public void propertyChange(PropertyChangeEvent ev) {
-              BackgroundImage backgroundImage = (BackgroundImage)ev.getNewValue();
-              boolean homeHasBackgroundImage = backgroundImage != null;
-              getView().setEnabled(HomeView.ActionType.MODIFY_BACKGROUND_IMAGE, homeHasBackgroundImage);
-              getView().setEnabled(HomeView.ActionType.HIDE_BACKGROUND_IMAGE, 
-                  homeHasBackgroundImage && backgroundImage.isVisible());
-              getView().setEnabled(HomeView.ActionType.SHOW_BACKGROUND_IMAGE, 
-                  homeHasBackgroundImage && !backgroundImage.isVisible());
-              getView().setEnabled(HomeView.ActionType.DELETE_BACKGROUND_IMAGE, homeHasBackgroundImage);
+              enableBackgroungImageActions(getView(), (BackgroundImage)ev.getNewValue());
             }
           });
     }
   }
 
   /**
+   * Enables background image actions.
+   */
+  private void enableBackgroungImageActions(HomeView homeView, BackgroundImage backgroundImage) {
+    boolean homeHasBackgroundImage = backgroundImage != null;
+    getView().setEnabled(HomeView.ActionType.IMPORT_BACKGROUND_IMAGE, !homeHasBackgroundImage);
+    getView().setEnabled(HomeView.ActionType.MODIFY_BACKGROUND_IMAGE, homeHasBackgroundImage);
+    getView().setEnabled(HomeView.ActionType.HIDE_BACKGROUND_IMAGE, 
+        homeHasBackgroundImage && backgroundImage.isVisible());
+    getView().setEnabled(HomeView.ActionType.SHOW_BACKGROUND_IMAGE, 
+        homeHasBackgroundImage && !backgroundImage.isVisible());
+    getView().setEnabled(HomeView.ActionType.DELETE_BACKGROUND_IMAGE, homeHasBackgroundImage);
+  }
+
+  /**
    * Adds listeners to track property changes that are not undoable.
    */
   private void addNotUndoableModificationListeners() {
@@ -914,6 +923,61 @@
   }
 
   /**
+   * Adds a property change listener to home to
+   * enable/disable authorized actions according to selected level.
+   */
+  private void addLevelListeners() {
+    final PropertyChangeListener selectedLevelListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          // Keep in selection only items that are at this level
+          List<Selectable> selectedItemsAtLevel = new ArrayList<Selectable>();
+          Level selectedLevel = home.getSelectedLevel();
+          for (Selectable item : home.getSelectedItems()) {
+            if (!(item instanceof Elevatable)
+                || ((Elevatable)item).isAtLevel(selectedLevel)) {
+              selectedItemsAtLevel.add(item);
+            }
+          }
+          home.setSelectedItems(selectedItemsAtLevel);
+          enableBackgroungImageActions(getView(), selectedLevel == null 
+              ? home.getBackgroundImage()
+              : selectedLevel.getBackgroundImage());
+          List<Level> levels = home.getLevels();
+          boolean homeContainsOneSelectedLevel = levels.size() > 1 && selectedLevel != null;
+          getView().setEnabled(HomeView.ActionType.MODIFY_LEVEL, homeContainsOneSelectedLevel);
+          getView().setEnabled(HomeView.ActionType.DELETE_LEVEL, homeContainsOneSelectedLevel);
+          getView().setEnabled(HomeView.ActionType.DISPLAY_ALL_LEVELS, levels.size() > 1);
+          getView().setEnabled(HomeView.ActionType.DISPLAY_SELECTED_LEVEL, levels.size() > 1);
+        }
+      };
+    this.home.addPropertyChangeListener(Home.Property.SELECTED_LEVEL, selectedLevelListener);
+    final PropertyChangeListener backgroundImageChangeListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          if (Level.Property.BACKGROUND_IMAGE.name().equals(ev.getPropertyName())) {
+            enableBackgroungImageActions(getView(), (BackgroundImage)ev.getNewValue());
+          }
+        }
+      };
+    for (Level level : home.getLevels()) {
+      level.addPropertyChangeListener(backgroundImageChangeListener);
+    }
+    this.home.addLevelsListener(new CollectionListener<Level>() {
+        public void collectionChanged(CollectionEvent<Level> ev) {
+          switch (ev.getType()) {
+            case ADD :
+              home.setSelectedLevel(ev.getItem());
+              ev.getItem().addPropertyChangeListener(backgroundImageChangeListener);
+              break;
+            case DELETE :
+              selectedLevelListener.propertyChange(null);
+              ev.getItem().removePropertyChangeListener(backgroundImageChangeListener);
+              break;
+          }
+        }
+      });
+  }
+
+  /**
    * Adds a property change listener to plan controller to 
    * enable/disable authorized actions according to its modification state and the plan scale.
    */
@@ -955,14 +1019,7 @@
       List<HomePieceOfFurniture> newFurniture = 
           new ArrayList<HomePieceOfFurniture>();
       for (CatalogPieceOfFurniture piece : selectedFurniture) {
-        HomePieceOfFurniture homePiece;
-        if (piece instanceof CatalogDoorOrWindow) {
-          homePiece = new HomeDoorOrWindow((DoorOrWindow)piece);
-        } else if (piece instanceof CatalogLight) {
-          homePiece = new HomeLight((Light)piece);
-        } else {
-          homePiece = new HomePieceOfFurniture(piece);
-        }
+        HomePieceOfFurniture homePiece = getFurnitureController().createHomePieceOfFurniture(piece);
         // If magnetism is enabled, adjust piece size and elevation
         if (this.preferences.isMagnetismEnabled()) {
           if (homePiece.isResizable()) {
@@ -993,6 +1050,20 @@
   }
   
   /**
+   * Imports a language library chosen by the user.  
+   */
+  public void importLanguageLibrary() {
+    getView().invokeLater(new Runnable() {
+        public void run() {
+          final String languageLibraryName = getView().showImportLanguageLibraryDialog();
+          if (languageLibraryName != null) {
+            importLanguageLibrary(languageLibraryName);
+          }
+        }
+      });
+  }
+
+  /**
    * Imports a given language library. 
    */
   public void importLanguageLibrary(String languageLibraryName) {
@@ -1184,7 +1255,7 @@
         }
       }
     }
-    addItems(items, pastedItemsDelta, pastedItemsDelta, false, "undoPasteName");
+    addPastedItems(items, pastedItemsDelta, pastedItemsDelta, false, "undoPasteName");
   }
 
   /**
@@ -1200,15 +1271,15 @@
    * and posts a drop operation to undo support.
    */
   public void drop(final List<? extends Selectable> items, View destinationView, float dx, float dy) {
-    addItems(items, dx, dy, destinationView == getPlanController().getView(), "undoDropName");
+    addPastedItems(items, dx, dy, destinationView == getPlanController().getView(), "undoDropName");
   }
 
   /**
    * Adds items to home.
    */
-  private void addItems(final List<? extends Selectable> items, 
-                        float dx, float dy, final boolean isDropInPlanView, 
-                        final String presentationNameKey) {
+  private void addPastedItems(final List<? extends Selectable> items, 
+                              float dx, float dy, final boolean isDropInPlanView, 
+                              final String presentationNameKey) {
     if (items.size() > 1
         || (items.size() == 1
             && !(items.get(0) instanceof Compass))) {
@@ -1223,7 +1294,10 @@
         for (HomePieceOfFurniture piece : addedFurniture) {
           if (piece.isResizable()) {
             piece.setWidth(this.preferences.getLengthUnit().getMagnetizedLength(piece.getWidth(), 0.1f));
-            piece.setDepth(this.preferences.getLengthUnit().getMagnetizedLength(piece.getDepth(), 0.1f));
+            // Don't adjust depth of doors or windows otherwise they may be misplaced in a wall 
+            if (!(piece instanceof HomeDoorOrWindow) || dx != 0 || dy != 0) {
+              piece.setDepth(this.preferences.getLengthUnit().getMagnetizedLength(piece.getDepth(), 0.1f));
+            }
             piece.setHeight(this.preferences.getLengthUnit().getMagnetizedLength(piece.getHeight(), 0.1f));
           }
           piece.setElevation(this.preferences.getLengthUnit().getMagnetizedLength(piece.getElevation(), 0.1f));
@@ -1841,7 +1915,7 @@
    */
   public void editPreferences() {
     new UserPreferencesController(this.preferences, 
-        this.viewFactory, this.contentManager).displayView(getView());
+        this.viewFactory, this.contentManager, this).displayView(getView());
   }
   
   /**
@@ -1911,25 +1985,28 @@
    * Toggles visibility of the background image and posts an undoable operation.
    */
   private void toggleBackgroundImageVisibility(final String presentationName) {
+    final Level selectedLevel = this.home.getSelectedLevel();
     doToggleBackgroundImageVisibility(); 
     UndoableEdit undoableEdit = new AbstractUndoableEdit() {
-      @Override
-      public void undo() throws CannotUndoException {
-        super.undo();
-        doToggleBackgroundImageVisibility(); 
-      }
-      
-      @Override
-      public void redo() throws CannotRedoException {
-        super.redo();
-        doToggleBackgroundImageVisibility();
-      }
-      
-      @Override
-      public String getPresentationName() {
-        return preferences.getLocalizedString(HomeController.class, presentationName);
-      }
-    };
+        @Override
+        public void undo() throws CannotUndoException {
+          super.undo();
+          home.setSelectedLevel(selectedLevel);
+          doToggleBackgroundImageVisibility(); 
+        }
+        
+        @Override
+        public void redo() throws CannotRedoException {
+          super.redo();
+          home.setSelectedLevel(selectedLevel);
+          doToggleBackgroundImageVisibility();
+        }
+        
+        @Override
+        public String getPresentationName() {
+          return preferences.getLocalizedString(HomeController.class, presentationName);
+        }
+      };
     getUndoableEditSupport().postEdit(undoableEdit);
   }
 
@@ -1937,31 +2014,55 @@
    * Toggles visibility of the background image.
    */
   private void doToggleBackgroundImageVisibility() {
-    BackgroundImage backgroundImage = this.home.getBackgroundImage();
-    this.home.setBackgroundImage(new BackgroundImage(backgroundImage.getImage(),
+    BackgroundImage backgroundImage = this.home.getSelectedLevel() != null
+        ? this.home.getSelectedLevel().getBackgroundImage()
+        : this.home.getBackgroundImage();
+    backgroundImage = new BackgroundImage(backgroundImage.getImage(),
         backgroundImage.getScaleDistance(), 
         backgroundImage.getScaleDistanceXStart(), backgroundImage.getScaleDistanceYStart(), 
         backgroundImage.getScaleDistanceXEnd(), backgroundImage.getScaleDistanceYEnd(),
-        backgroundImage.getXOrigin(), backgroundImage.getYOrigin(), !backgroundImage.isVisible()));
+        backgroundImage.getXOrigin(), backgroundImage.getYOrigin(), !backgroundImage.isVisible());
+    if (this.home.getSelectedLevel() != null) {
+      this.home.getSelectedLevel().setBackgroundImage(backgroundImage);
+    } else {
+      this.home.setBackgroundImage(backgroundImage);
+    }
   }
   
   /**
    * Deletes home background image and posts and posts an undoable operation. 
    */
   public void deleteBackgroundImage() {
-    final BackgroundImage oldImage = this.home.getBackgroundImage();
-    this.home.setBackgroundImage(null);
+    final Level selectedLevel = this.home.getSelectedLevel();
+    final BackgroundImage oldImage;
+    if (selectedLevel != null) {
+      oldImage = selectedLevel.getBackgroundImage();
+      selectedLevel.setBackgroundImage(null);
+    } else {
+      oldImage = this.home.getBackgroundImage();
+      this.home.setBackgroundImage(null);
+    }
     UndoableEdit undoableEdit = new AbstractUndoableEdit() {
       @Override
       public void undo() throws CannotUndoException {
         super.undo();
-        home.setBackgroundImage(oldImage); 
+        home.setSelectedLevel(selectedLevel);
+        if (selectedLevel != null) {
+          selectedLevel.setBackgroundImage(oldImage);
+        } else {
+          home.setBackgroundImage(oldImage);
+        }
       }
       
       @Override
       public void redo() throws CannotRedoException {
         super.redo();
-        home.setBackgroundImage(null);
+        home.setSelectedLevel(selectedLevel);
+        if (selectedLevel != null) {
+          selectedLevel.setBackgroundImage(null);
+        } else {
+          home.setBackgroundImage(null);
+        }
       }
       
       @Override
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeFurnitureController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeFurnitureController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeFurnitureController.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeFurnitureController.java	2011-12-21 00:48:52.000000000 +0000
@@ -80,8 +80,11 @@
   private Float   elevation;
   private Integer angleInDegrees;
   private Float   width;
+  private Float   proportionalWidth;
   private Float   depth;
+  private Float   proportionalDepth;
   private Float   height;
+  private Float   proportionalHeight;
   private boolean proportional;
   private Integer color;
   private FurniturePaint     paint;
@@ -193,9 +196,9 @@
       setY(null);
       setElevation(null);
       this.basePlanItemEditable = false;
-      setWidth(null, false);
-      setDepth(null, false);
-      setHeight(null, false);
+      setWidth(null, true, false);
+      setDepth(null, true, false);
+      setHeight(null, true, false);
       setColor(null);
       if (textureController != null) {
         textureController.setTexture(null);
@@ -308,7 +311,7 @@
           break;
         }
       }
-      setWidth(width, false);
+      setWidth(width, true, false);
 
       Float depth = firstPiece.getDepth();
       for (int i = 1; i < selectedFurniture.size(); i++) {
@@ -317,7 +320,7 @@
           break;
         }
       }
-      setDepth(depth, false);
+      setDepth(depth, true, false);
 
       Float height = firstPiece.getHeight();
       for (int i = 1; i < selectedFurniture.size(); i++) {
@@ -326,7 +329,7 @@
           break;
         }
       }
-      setHeight(height, false);
+      setHeight(height, true, false);
 
       Integer color = firstPiece.getColor();
       if (color != null) {
@@ -617,21 +620,30 @@
    * Sets the edited width.
    */
   public void setWidth(Float width) {
-    setWidth(width, isProportional());
+    setWidth(width, false, isProportional());
   }
 
-  private void setWidth(Float width, boolean updateDepthAndHeight) {
-    if (width != this.width) {
+  private void setWidth(Float width, boolean keepProportionalWidthUnchanged, boolean updateDepthAndHeight) {
+    Float adjustedWidth = width != null 
+        ? Math.max(width, 0.001f)
+        : null;
+    if (adjustedWidth == width 
+        || adjustedWidth != null && adjustedWidth.equals(width)
+        || !keepProportionalWidthUnchanged) {
+      this.proportionalWidth = width;
+    }
+    if (adjustedWidth == null && this.width != null
+        || adjustedWidth != null && !adjustedWidth.equals(this.width)) {
       Float oldWidth = this.width;
-      this.width = width;
-      this.propertyChangeSupport.firePropertyChange(Property.WIDTH.name(), oldWidth, width);
-      if (oldWidth != null && width != null && updateDepthAndHeight) {
-        float ratio = width / oldWidth;
-        if (getDepth() != null) {
-          setDepth(getDepth() * ratio, false);
+      this.width = adjustedWidth;
+      this.propertyChangeSupport.firePropertyChange(Property.WIDTH.name(), oldWidth, adjustedWidth);
+      if (oldWidth != null && adjustedWidth != null && updateDepthAndHeight) {
+        float ratio = adjustedWidth / oldWidth;
+        if (this.proportionalDepth != null) {
+          setDepth(this.proportionalDepth * ratio, true, false);
         }
-        if (getHeight() != null) {
-          setHeight(getHeight() * ratio, false);
+        if (this.proportionalHeight != null) {
+          setHeight(this.proportionalHeight * ratio, true, false);
         }
       }
     }
@@ -648,21 +660,30 @@
    * Sets the edited depth.
    */
   public void setDepth(Float depth) {
-    setDepth(depth, isProportional());
+    setDepth(depth, false, isProportional());
   }
 
-  private void setDepth(Float depth, boolean updateWidthAndHeight) {
-    if (depth != this.depth) {
+  private void setDepth(Float depth, boolean keepProportionalDepthUnchanged, boolean updateWidthAndHeight) {
+    Float adjustedDepth = depth != null 
+        ? Math.max(depth, 0.001f)
+        : null;
+    if (adjustedDepth == depth 
+        || adjustedDepth != null && adjustedDepth.equals(depth)
+        || !keepProportionalDepthUnchanged) {
+      this.proportionalDepth = depth;
+    }
+    if (adjustedDepth == null && this.depth != null
+        || adjustedDepth != null && !adjustedDepth.equals(this.depth)) {
       Float oldDepth = this.depth;
-      this.depth = depth;
-      this.propertyChangeSupport.firePropertyChange(Property.DEPTH.name(), oldDepth, depth);
-      if (oldDepth != null && depth != null && updateWidthAndHeight) {
-        float ratio = depth / oldDepth;
-        if (getWidth() != null) {
-          setWidth(getWidth() * ratio, false);
+      this.depth = adjustedDepth;
+      this.propertyChangeSupport.firePropertyChange(Property.DEPTH.name(), oldDepth, adjustedDepth);
+      if (oldDepth != null && adjustedDepth != null && updateWidthAndHeight) {
+        float ratio = adjustedDepth / oldDepth;
+        if (this.proportionalWidth != null) {
+          setWidth(this.proportionalWidth * ratio, true, false);
         }
-        if (getHeight() != null) {
-          setHeight(getHeight() * ratio, false);
+        if (this.proportionalHeight != null) {
+          setHeight(this.proportionalHeight * ratio, true, false);
         }
       }
     }
@@ -679,21 +700,30 @@
    * Sets the edited height.
    */
   public void setHeight(Float height) {
-    setHeight(height, isProportional());
+    setHeight(height, false, isProportional());
   }
 
-  public void setHeight(Float height, boolean updateWidthAndDepth) {
-    if (height != this.height) {
+  private void setHeight(Float height, boolean keepProportionalHeightUnchanged, boolean updateWidthAndDepth) {
+    Float adjustedHeight = height != null 
+        ? Math.max(height, 0.001f)
+        : null;
+    if (adjustedHeight == height 
+        || adjustedHeight != null && adjustedHeight.equals(height)
+        || !keepProportionalHeightUnchanged) {
+      this.proportionalHeight = height;
+    }
+    if (adjustedHeight == null && this.height != null
+        || adjustedHeight != null && !adjustedHeight.equals(this.height)) {
       Float oldHeight = this.height;
-      this.height = height;
-      this.propertyChangeSupport.firePropertyChange(Property.HEIGHT.name(), oldHeight, height);
-      if (oldHeight != null && height != null && updateWidthAndDepth) {
-        float ratio = height / oldHeight;
-        if (getWidth() != null) {
-          setWidth(getWidth() * ratio, false);
+      this.height = adjustedHeight;
+      this.propertyChangeSupport.firePropertyChange(Property.HEIGHT.name(), oldHeight, adjustedHeight);
+      if (oldHeight != null && adjustedHeight != null && updateWidthAndDepth) {
+        float ratio = adjustedHeight / oldHeight;
+        if (this.proportionalWidth != null) {
+          setWidth(this.proportionalWidth * ratio, true, false);
         }
-        if (getDepth() != null) {
-          setDepth(getDepth() * ratio, false);
+        if (this.proportionalDepth != null) {
+          setDepth(this.proportionalDepth * ratio, true, false);
         }
       }
     }
@@ -956,6 +986,9 @@
             defaultColorsAndTextures, color, texture, defaultShininess, shininess, visible, modelMirrored, lightPower);
         this.undoSupport.postEdit(undoableEdit);
       }
+      if (name != null) {
+        this.preferences.addAutoCompletionString("HomePieceOfFurnitureName", name);
+      }
     }
   }
   
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeView.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeView.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeView.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/HomeView.java	2011-12-21 00:48:52.000000000 +0000
@@ -41,7 +41,7 @@
       SORT_HOME_FURNITURE_BY_CATALOG_ID, SORT_HOME_FURNITURE_BY_NAME, 
       SORT_HOME_FURNITURE_BY_WIDTH, SORT_HOME_FURNITURE_BY_DEPTH, SORT_HOME_FURNITURE_BY_HEIGHT, 
       SORT_HOME_FURNITURE_BY_X, SORT_HOME_FURNITURE_BY_Y, SORT_HOME_FURNITURE_BY_ELEVATION, 
-      SORT_HOME_FURNITURE_BY_ANGLE, SORT_HOME_FURNITURE_BY_COLOR, SORT_HOME_FURNITURE_BY_TEXTURE, 
+      SORT_HOME_FURNITURE_BY_ANGLE, SORT_HOME_FURNITURE_BY_LEVEL, SORT_HOME_FURNITURE_BY_COLOR, SORT_HOME_FURNITURE_BY_TEXTURE, 
       SORT_HOME_FURNITURE_BY_MOVABILITY, SORT_HOME_FURNITURE_BY_TYPE, SORT_HOME_FURNITURE_BY_VISIBILITY, 
       SORT_HOME_FURNITURE_BY_PRICE, SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX_PERCENTAGE, 
       SORT_HOME_FURNITURE_BY_VALUE_ADDED_TAX, SORT_HOME_FURNITURE_BY_PRICE_VALUE_ADDED_TAX_INCLUDED,
@@ -49,19 +49,20 @@
       DISPLAY_HOME_FURNITURE_CATALOG_ID, DISPLAY_HOME_FURNITURE_NAME, 
       DISPLAY_HOME_FURNITURE_WIDTH, DISPLAY_HOME_FURNITURE_DEPTH, DISPLAY_HOME_FURNITURE_HEIGHT, 
       DISPLAY_HOME_FURNITURE_X, DISPLAY_HOME_FURNITURE_Y, DISPLAY_HOME_FURNITURE_ELEVATION, 
-      DISPLAY_HOME_FURNITURE_ANGLE, DISPLAY_HOME_FURNITURE_COLOR, DISPLAY_HOME_FURNITURE_TEXTURE, 
+      DISPLAY_HOME_FURNITURE_ANGLE, DISPLAY_HOME_FURNITURE_COLOR, DISPLAY_HOME_FURNITURE_LEVEL, DISPLAY_HOME_FURNITURE_TEXTURE, 
       DISPLAY_HOME_FURNITURE_MOVABLE, DISPLAY_HOME_FURNITURE_DOOR_OR_WINDOW, DISPLAY_HOME_FURNITURE_VISIBLE,
       DISPLAY_HOME_FURNITURE_PRICE, DISPLAY_HOME_FURNITURE_VALUE_ADDED_TAX_PERCENTAGE,
       DISPLAY_HOME_FURNITURE_VALUE_ADDED_TAX, DISPLAY_HOME_FURNITURE_PRICE_VALUE_ADDED_TAX_INCLUDED,
       ALIGN_FURNITURE_ON_TOP, ALIGN_FURNITURE_ON_BOTTOM, ALIGN_FURNITURE_ON_LEFT, ALIGN_FURNITURE_ON_RIGHT,
       GROUP_FURNITURE, UNGROUP_FURNITURE,
-      SELECT, PAN, CREATE_WALLS, CREATE_ROOMS, CREATE_DIMENSION_LINES, CREATE_LABELS, DELETE_SELECTION, 
+      SELECT, PAN, CREATE_WALLS, CREATE_ROOMS, CREATE_DIMENSION_LINES, CREATE_LABELS, DELETE_SELECTION,
       LOCK_BASE_PLAN, UNLOCK_BASE_PLAN, MODIFY_COMPASS, MODIFY_WALL, REVERSE_WALL_DIRECTION, SPLIT_WALL, MODIFY_ROOM, MODIFY_LABEL,
       INCREASE_TEXT_SIZE, DECREASE_TEXT_SIZE, TOGGLE_BOLD_STYLE, TOGGLE_ITALIC_STYLE,
       IMPORT_BACKGROUND_IMAGE, MODIFY_BACKGROUND_IMAGE, HIDE_BACKGROUND_IMAGE, SHOW_BACKGROUND_IMAGE, DELETE_BACKGROUND_IMAGE, 
+      ADD_LEVEL, DELETE_LEVEL, MODIFY_LEVEL,
       ZOOM_OUT, ZOOM_IN, EXPORT_TO_SVG,
-      VIEW_FROM_TOP, VIEW_FROM_OBSERVER, STORE_POINT_OF_VIEW,  
-      DETACH_3D_VIEW, ATTACH_3D_VIEW, MODIFY_3D_ATTRIBUTES, CREATE_PHOTO, CREATE_VIDEO, EXPORT_TO_OBJ,
+      VIEW_FROM_TOP, VIEW_FROM_OBSERVER, STORE_POINT_OF_VIEW, DETACH_3D_VIEW, ATTACH_3D_VIEW,  
+      DISPLAY_ALL_LEVELS, DISPLAY_SELECTED_LEVEL, MODIFY_3D_ATTRIBUTES, CREATE_PHOTO, CREATE_VIDEO, EXPORT_TO_OBJ,
       HELP, ABOUT}
   public enum SaveAnswer {SAVE, CANCEL, DO_NOT_SAVE}
 
@@ -100,6 +101,11 @@
   public abstract String showOpenDialog();
 
   /**
+   * Displays a content chooser open dialog to choose a language library.
+   */
+  public abstract String showImportLanguageLibraryDialog();
+
+  /**
    * Displays a dialog that lets user choose whether he wants to overwrite
    * an existing language library or not. 
    */
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/ImportedFurnitureWizardController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/ImportedFurnitureWizardController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/ImportedFurnitureWizardController.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/ImportedFurnitureWizardController.java	2011-12-21 00:48:52.000000000 +0000
@@ -36,11 +36,9 @@
 import com.eteks.sweethome3d.model.CatalogDoorOrWindow;
 import com.eteks.sweethome3d.model.CatalogPieceOfFurniture;
 import com.eteks.sweethome3d.model.Content;
-import com.eteks.sweethome3d.model.DoorOrWindow;
 import com.eteks.sweethome3d.model.FurnitureCatalog;
 import com.eteks.sweethome3d.model.FurnitureCategory;
 import com.eteks.sweethome3d.model.Home;
-import com.eteks.sweethome3d.model.HomeDoorOrWindow;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.Sash;
 import com.eteks.sweethome3d.model.Selectable;
@@ -53,7 +51,7 @@
 public class ImportedFurnitureWizardController extends WizardController 
                                                implements Controller {
   public enum Property {STEP, NAME, MODEL, WIDTH, DEPTH, HEIGHT, ELEVATION, MOVABLE, 
-      DOOR_OR_WINDOW, COLOR, CATEGORY, BACK_FACE_SHOWN, MODEL_ROTATION,  
+      DOOR_OR_WINDOW, COLOR, CATEGORY, BACK_FACE_SHOWN, MODEL_ROTATION, STAIRCASE_CUT_OUT_SHAPE,
       ICON_YAW, PROPORTIONAL}
 
   public enum Step {MODEL, ROTATION, ATTRIBUTES, ICON};
@@ -62,6 +60,7 @@
   private final CatalogPieceOfFurniture          piece;
   private final String                           modelName;
   private final UserPreferences                  preferences;
+  private final FurnitureController              furnitureController;
   private final ContentManager                   contentManager;
   private final UndoableEditSupport              undoSupport;
   private final PropertyChangeSupport            propertyChangeSupport;
@@ -76,11 +75,15 @@
   private String                           name;
   private Content                          model;
   private float                            width;
+  private float                            proportionalWidth;
   private float                            depth;
+  private float                            proportionalDepth;
   private float                            height;
+  private float                            proportionalHeight;
   private float                            elevation;
   private boolean                          movable;
   private boolean                          doorOrWindow;
+  private String                           staircaseCutOutShape;
   private Integer                          color;
   private FurnitureCategory                category;
   private boolean                          backFaceShown;
@@ -95,7 +98,7 @@
   public ImportedFurnitureWizardController(UserPreferences preferences,
                                            ViewFactory    viewFactory,
                                            ContentManager contentManager) {
-    this(null, null, null, preferences, viewFactory, contentManager, null);
+    this(null, null, null, preferences, null, viewFactory, contentManager, null);
   }
   
   /**
@@ -106,7 +109,7 @@
                                            UserPreferences preferences,
                                            ViewFactory    viewFactory,
                                            ContentManager contentManager) {
-    this(null, null, modelName, preferences, viewFactory, contentManager, null);
+    this(null, null, modelName, preferences, null, viewFactory, contentManager, null);
   }
   
   /**
@@ -116,7 +119,7 @@
                                            UserPreferences preferences,
                                            ViewFactory    viewFactory,
                                            ContentManager contentManager) {
-    this(null, piece, null, preferences, viewFactory, contentManager, null);
+    this(null, piece, null, preferences, null, viewFactory, contentManager, null);
   }
   
   /**
@@ -124,10 +127,11 @@
    */
   public ImportedFurnitureWizardController(Home home, 
                                            UserPreferences preferences,
+                                           FurnitureController furnitureController,
                                            ViewFactory    viewFactory,
                                            ContentManager contentManager,
                                            UndoableEditSupport undoSupport) {
-    this(home, null, null, preferences, viewFactory, contentManager, undoSupport);
+    this(home, null, null, preferences, furnitureController, viewFactory, contentManager, undoSupport);
   }
   
   /**
@@ -137,10 +141,11 @@
   public ImportedFurnitureWizardController(Home home,
                                            String modelName,
                                            UserPreferences preferences,
+                                           FurnitureController furnitureController,
                                            ViewFactory    viewFactory,
                                            ContentManager contentManager,
                                            UndoableEditSupport undoSupport) {
-    this(home, null, modelName, preferences, viewFactory, contentManager, undoSupport);
+    this(home, null, modelName, preferences, furnitureController, viewFactory, contentManager, undoSupport);
   }
   
   /**
@@ -150,6 +155,7 @@
                                             CatalogPieceOfFurniture piece,
                                             String modelName,
                                             UserPreferences preferences,
+                                            FurnitureController furnitureController,
                                             ViewFactory    viewFactory,
                                             ContentManager contentManager,
                                             UndoableEditSupport undoSupport) {
@@ -158,6 +164,7 @@
     this.piece = piece;
     this.modelName = modelName;
     this.preferences = preferences;
+    this.furnitureController = furnitureController;
     this.viewFactory = viewFactory;
     this.undoSupport = undoSupport;
     this.contentManager = contentManager;
@@ -189,16 +196,14 @@
     } else {
       newPiece = new CatalogPieceOfFurniture(getName(), getIcon(), getModel(), 
           getWidth(), getDepth(), getHeight(), getElevation(), 
-          isMovable(), getColor(), 
-          getModelRotation(), isBackFaceShown(), 
+          isMovable(), getStaircaseCutOutShape(), 
+          getColor(), getModelRotation(), isBackFaceShown(), 
           getIconYaw(), isProportional());
     }
     
     if (this.home != null) {
       // Add new piece to home
-      addPieceOfFurniture(isDoorOrWindow() 
-          ? new HomeDoorOrWindow((DoorOrWindow)newPiece)
-          : new HomePieceOfFurniture(newPiece));
+      addPieceOfFurniture(this.furnitureController.createHomePieceOfFurniture(newPiece));
     }
     // Remove the edited piece from catalog
     FurnitureCatalog catalog = this.preferences.getFurnitureCatalog();
@@ -447,10 +452,21 @@
    * Sets the width of the imported piece.
    */
   public void setWidth(float width) {
-    if (width != this.width) {
+    setWidth(width, false);
+  }
+
+  /**
+   * Sets the width of the imported piece.
+   */
+  private void setWidth(float width, boolean keepProportionalWidthUnchanged) {
+    float adjustedWidth = Math.max(width, 0.001f);
+    if (adjustedWidth == width || !keepProportionalWidthUnchanged) {
+      this.proportionalWidth = width;
+    }
+    if (adjustedWidth != this.width) {
       float oldWidth = this.width;
-      this.width = width;
-      this.propertyChangeSupport.firePropertyChange(Property.WIDTH.name(), oldWidth, width);
+      this.width = adjustedWidth;
+      this.propertyChangeSupport.firePropertyChange(Property.WIDTH.name(), oldWidth, adjustedWidth);
     }
   }
 
@@ -465,10 +481,21 @@
    * Sets the depth of the imported piece.
    */
   public void setDepth(float depth) {
-    if (depth != this.depth) {
+    setDepth(depth, false);
+  }
+
+  /**
+   * Sets the depth of the imported piece.
+   */
+  private void setDepth(float depth, boolean keepProportionalDepthUnchanged) {
+    float adjustedDepth = Math.max(depth, 0.001f);
+    if (adjustedDepth == depth || !keepProportionalDepthUnchanged) {
+      this.proportionalDepth = depth;
+    }
+    if (adjustedDepth != this.depth) {
       float oldDepth = this.depth;
-      this.depth = depth;
-      this.propertyChangeSupport.firePropertyChange(Property.DEPTH.name(), oldDepth, depth);
+      this.depth = adjustedDepth;
+      this.propertyChangeSupport.firePropertyChange(Property.DEPTH.name(), oldDepth, adjustedDepth);
     }
   }
 
@@ -483,10 +510,21 @@
    * Sets the size of the imported piece.
    */
   public void setHeight(float height) {
-    if (height != this.height) {
+    setHeight(height, false);
+  }
+
+  /**
+   * Sets the size of the imported piece.
+   */
+  private void setHeight(float height, boolean keepProportionalHeightUnchanged) {
+    float adjustedHeight = Math.max(height, 0.001f);
+    if (adjustedHeight == height || !keepProportionalHeightUnchanged) {
+      this.proportionalHeight = height;
+    }
+    if (adjustedHeight != this.height) {
       float oldHeight = this.height;
-      this.height = height;
-      this.propertyChangeSupport.firePropertyChange(Property.HEIGHT.name(), oldHeight, height);
+      this.height = adjustedHeight;
+      this.propertyChangeSupport.firePropertyChange(Property.HEIGHT.name(), oldHeight, adjustedHeight);
     }
   }
 
@@ -540,12 +578,38 @@
       this.doorOrWindow = doorOrWindow;
       this.propertyChangeSupport.firePropertyChange(Property.DOOR_OR_WINDOW.name(), !doorOrWindow, doorOrWindow);
       if (doorOrWindow) {
+        setStaircaseCutOutShape(null);
         setMovable(false);
       }
     }
   }
 
   /**
+   * Returns the shape used to cut out upper levels at its intersection with a staircase.
+   */
+  public String getStaircaseCutOutShape() {
+    return this.staircaseCutOutShape;
+  }
+  
+  /**
+   * Sets the shape used to cut out upper levels at its intersection with a staircase.
+   */
+  public void setStaircaseCutOutShape(String staircaseCutOutShape) {
+    if (staircaseCutOutShape != this.staircaseCutOutShape
+        || (staircaseCutOutShape != null && !staircaseCutOutShape.equals(this.staircaseCutOutShape))) {
+      String oldStaircaseCutOutShape = this.staircaseCutOutShape;
+      this.staircaseCutOutShape = staircaseCutOutShape;
+      if (this.propertyChangeSupport != null) {
+        this.propertyChangeSupport.firePropertyChange(Property.STAIRCASE_CUT_OUT_SHAPE.name(), oldStaircaseCutOutShape, staircaseCutOutShape);
+      }
+      if (this.staircaseCutOutShape != null) {
+        setDoorOrWindow(false);
+        setMovable(false);
+      }
+    }
+  }
+  
+  /**
    * Returns the color of the imported piece.
    */
   public Integer getColor() {
@@ -741,8 +805,8 @@
             
             // If proportions should be kept, update depth and height
             float ratio = (Float)ev.getNewValue() / (Float)ev.getOldValue();
-            setDepth(getDepth() * ratio); 
-            setHeight(getHeight() * ratio);
+            setDepth(proportionalDepth * ratio, true); 
+            setHeight(proportionalHeight * ratio, true);
             
             ImportedFurnitureWizardController.this.addPropertyChangeListener(Property.DEPTH, depthChangeListener);
             ImportedFurnitureWizardController.this.addPropertyChangeListener(Property.HEIGHT, heightChangeListener);
@@ -757,8 +821,8 @@
             
             // If proportions should be kept, update width and height
             float ratio = (Float)ev.getNewValue() / (Float)ev.getOldValue();
-            setWidth(getWidth() * ratio); 
-            setHeight(getHeight() * ratio);
+            setWidth(proportionalWidth * ratio, true); 
+            setHeight(proportionalHeight * ratio, true);
             
             ImportedFurnitureWizardController.this.addPropertyChangeListener(Property.WIDTH, widthChangeListener);
             ImportedFurnitureWizardController.this.addPropertyChangeListener(Property.HEIGHT, heightChangeListener);
@@ -773,8 +837,8 @@
             
             // If proportions should be kept, update width and depth
             float ratio = (Float)ev.getNewValue() / (Float)ev.getOldValue();
-            setWidth(getWidth() * ratio); 
-            setDepth(getDepth() * ratio);
+            setWidth(proportionalWidth * ratio, true); 
+            setDepth(proportionalDepth * ratio, true);
             
             ImportedFurnitureWizardController.this.addPropertyChangeListener(Property.WIDTH, widthChangeListener);
             ImportedFurnitureWizardController.this.addPropertyChangeListener(Property.DEPTH, depthChangeListener);
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/LabelController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/LabelController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/LabelController.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/LabelController.java	2011-12-21 00:48:52.000000000 +0000
@@ -182,6 +182,7 @@
             this.home, this.preferences, oldSelection, basePlanLocked, label, newBasePlanLocked);
         this.undoSupport.postEdit(undoableEdit);
       }
+      this.preferences.addAutoCompletionString("LabelText", text);
     }
   }
 
@@ -276,7 +277,8 @@
         UndoableEdit undoableEdit = new LabelModificationUndoableEdit(this.home, 
             this.preferences, oldSelection, modifiedLabels, text);
         this.undoSupport.postEdit(undoableEdit);
-      }
+      }      
+      this.preferences.addAutoCompletionString("LabelText", text);
     }
   }
   
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/LevelController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/LevelController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/LevelController.java	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/LevelController.java	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,393 @@
+/*
+ * LevelController.java 27 oct 2011
+ *
+ * Sweet Home 3D, Copyright (c) 2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package com.eteks.sweethome3d.viewcontroller;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.List;
+
+import javax.swing.undo.AbstractUndoableEdit;
+import javax.swing.undo.CannotRedoException;
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.UndoableEdit;
+import javax.swing.undo.UndoableEditSupport;
+
+import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.Level;
+import com.eteks.sweethome3d.model.UserPreferences;
+
+/**
+ * A MVC controller for home levels view.
+ * @author Emmanuel Puybaret
+ */
+public class LevelController implements Controller {
+  /**
+   * The properties that may be edited by the view associated to this controller. 
+   */
+  public enum Property {NAME, ELEVATION, FLOOR_THICKNESS, HEIGHT, LEVELS, SELECT_LEVEL_INDEX}
+  
+  private final Home                  home;
+  private final UserPreferences       preferences;
+  private final ViewFactory           viewFactory;
+  private final UndoableEditSupport   undoSupport;
+  private final PropertyChangeSupport propertyChangeSupport;
+  private DialogView                  homeLevelView;
+
+  private String   name;
+  private Float    elevation;
+  private Float    floorThickness;
+  private Float    height;
+  private Level [] levels;
+  private Integer  selectedLevelIndex;
+  
+  /**
+   * Creates the controller of home levels view with undo support.
+   */
+  public LevelController(Home home, 
+                         UserPreferences preferences, 
+                         ViewFactory viewFactory, 
+                         UndoableEditSupport undoSupport) {
+    this.home = home;
+    this.preferences = preferences;
+    this.viewFactory = viewFactory;
+    this.undoSupport = undoSupport;
+    this.propertyChangeSupport = new PropertyChangeSupport(this);
+    
+    updateProperties();
+  }
+
+  /**
+   * Returns the view associated with this controller.
+   */
+  public DialogView getView() {
+    // Create view lazily only once it's needed
+    if (this.homeLevelView == null) {
+      this.homeLevelView = this.viewFactory.createLevelView(this.preferences, this); 
+    }
+    return this.homeLevelView;
+  }
+  
+  /**
+   * Displays the view controlled by this controller.
+   */
+  public void displayView(View parentView) {
+    getView().displayView(parentView);
+  }
+
+  /**
+   * Adds the property change <code>listener</code> in parameter to this controller.
+   */
+  public void addPropertyChangeListener(Property property, PropertyChangeListener listener) {
+    this.propertyChangeSupport.addPropertyChangeListener(property.name(), listener);
+  }
+
+  /**
+   * Removes the property change <code>listener</code> in parameter from this controller.
+   */
+  public void removePropertyChangeListener(Property property, PropertyChangeListener listener) {
+    this.propertyChangeSupport.removePropertyChangeListener(property.name(), listener);
+  }
+
+  /**
+   * Updates edited properties from selected level in the home edited by this controller.
+   */
+  protected void updateProperties() {
+    Level selectedLevel = this.home.getSelectedLevel();
+    if (selectedLevel == null) {
+      setName(null); // Nothing to edit
+      setElevation(null);
+      setFloorThickness(null);
+      setHeight(null);      
+      setSelectedLevelIndex(null);
+    } else {
+      setName(selectedLevel.getName());
+      setElevation(selectedLevel.getElevation());
+      setFloorThickness(selectedLevel.getFloorThickness());
+      setHeight(selectedLevel.getHeight());
+      setSelectedLevelIndex(this.home.getLevels().indexOf(selectedLevel));
+    }
+    setLevels(duplicate(this.home.getLevels().toArray(new Level [0])));
+  }  
+  
+  private Level [] duplicate(Level[] levels) {
+    for (int i = 0; i < levels.length; i++) {
+      levels [i] = levels [i].clone();
+    }
+    return levels;
+  }
+
+  /**
+   * Returns <code>true</code> if the given <code>property</code> is editable.
+   * Depending on whether a property is editable or not, the view associated to this controller
+   * may render it differently.
+   * The implementation of this method always returns <code>true</code> except 
+   * for <code>FLOOR_THICKNESS</code> if the selected level is the first level
+   * and <code>HEIGHT</code> if the selected level is the last level. 
+   */
+  public boolean isPropertyEditable(Property property) {
+    switch (property) {
+      case FLOOR_THICKNESS :
+        List<Level> levels = this.home.getLevels();
+        Level selectedLevel = this.home.getSelectedLevel();
+        int selectedLevelIndex;
+        return selectedLevel != null
+            && (selectedLevel.getElevation() > 0
+                || ((selectedLevelIndex = levels.indexOf(selectedLevel)) != 0
+                    && levels.get(selectedLevelIndex - 1).getElevation() != selectedLevel.getElevation()));
+      default :
+        return true;
+    }
+  }
+  
+  /**
+   * Sets the edited name.
+   */
+  public void setName(String name) {
+    if (name != this.name) {
+      String oldName = this.name;
+      this.name = name;
+      this.propertyChangeSupport.firePropertyChange(Property.NAME.name(), oldName, name);
+    }
+  }
+
+  /**
+   * Returns the edited name.
+   */
+  public String getName() {
+    return this.name;
+  }
+  
+  /**
+   * Sets the edited elevation.
+   */
+  public void setElevation(Float elevation) {
+    if (elevation != this.elevation) {
+      Float oldElevation = this.elevation;
+      this.elevation = elevation;
+      this.propertyChangeSupport.firePropertyChange(Property.ELEVATION.name(), oldElevation, elevation);
+    }
+  }
+
+  /**
+   * Returns the edited elevation.
+   */
+  public Float getElevation() {
+    return this.elevation;
+  }
+  
+  /**
+   * Sets the edited floor thickness.
+   */
+  public void setFloorThickness(Float floorThickness) {
+    if (floorThickness != this.floorThickness) {
+      Float oldFloorThickness = this.floorThickness;
+      this.floorThickness = floorThickness;
+      this.propertyChangeSupport.firePropertyChange(Property.FLOOR_THICKNESS.name(), oldFloorThickness, floorThickness);
+    }
+  }
+
+  /**
+   * Returns the edited floor thickness.
+   */
+  public Float getFloorThickness() {
+    return this.floorThickness;
+  }
+  
+  /**
+   * Sets the edited height.
+   */
+  public void setHeight(Float height) {
+    if (height != this.height) {
+      Float oldHeight = this.height;
+      this.height = height;
+      this.propertyChangeSupport.firePropertyChange(Property.HEIGHT.name(), oldHeight, height);
+    }
+  }
+
+  /**
+   * Returns the edited height.
+   */
+  public Float getHeight() {
+    return this.height;
+  }
+  
+  /**
+   * Sets home levels.
+   */
+  private void setLevels(Level [] levels) {
+    if (levels != this.levels) {
+      Level [] oldLevels = this.levels;
+      this.levels = levels;
+      this.propertyChangeSupport.firePropertyChange(Property.LEVELS.name(), oldLevels, levels);
+    }
+  }
+
+  /**
+   * Returns a copy of home levels.
+   */
+  public Level [] getLevels() {
+    return this.levels.clone();
+  }
+  
+  /**
+   * Sets the selected level index.
+   */
+  private void setSelectedLevelIndex(Integer selectedLevelIndex) {
+    if (selectedLevelIndex != this.selectedLevelIndex) {
+      Integer oldSelectedLevelIndex = this.selectedLevelIndex;
+      this.selectedLevelIndex = selectedLevelIndex;
+      this.propertyChangeSupport.firePropertyChange(Property.SELECT_LEVEL_INDEX.name(), oldSelectedLevelIndex, selectedLevelIndex);
+    }
+  }
+
+  /**
+   * Returns the selected level index.
+   */
+  public Integer getSelectedLevelIndex() {
+    return this.selectedLevelIndex;
+  }
+  
+  /**
+   * Controls the modification of selected level in the edited home.
+   */
+  public void modifyLevels() {
+    Level selectedLevel = this.home.getSelectedLevel();
+    if (selectedLevel != null) {
+      String name = getName();
+      Float elevation = getElevation();
+      Float floorThickness = getFloorThickness();
+      Float height = getHeight();
+      
+      ModifiedLevel modifiedLevel = new ModifiedLevel(selectedLevel);
+      // Apply modification
+      doModifyLevel(modifiedLevel, name, elevation, floorThickness, height);
+      if (this.undoSupport != null) {
+        UndoableEdit undoableEdit = new LevelModificationUndoableEdit(
+            this.preferences, modifiedLevel, name, elevation, floorThickness, height);
+        this.undoSupport.postEdit(undoableEdit);
+      }
+      if (name != null) {
+        this.preferences.addAutoCompletionString("LevelName", name);
+      }
+    }
+  }
+  
+  /**
+   * Undoable edit for level modification. This class isn't anonymous to avoid
+   * being bound to controller and its view.
+   */
+  private static class LevelModificationUndoableEdit extends AbstractUndoableEdit {
+    private final UserPreferences  preferences;
+    private final ModifiedLevel    modifiedLevel;
+    private final String           name;
+    private final Float            elevation;
+    private final Float            floorThickness;
+    private final Float            height;
+
+    private LevelModificationUndoableEdit(UserPreferences preferences,
+                                          ModifiedLevel modifiedLevel, 
+                                          String name,
+                                          Float elevation,
+                                          Float floorThickness,
+                                          Float height) {
+      this.preferences = preferences;
+      this.modifiedLevel = modifiedLevel;
+      this.name = name;
+      this.elevation = elevation;
+      this.floorThickness = floorThickness;
+      this.height = height;
+    }
+
+    @Override
+    public void undo() throws CannotUndoException {
+      super.undo();
+      undoModifyLevel(this.modifiedLevel);
+    }
+
+    @Override
+    public void redo() throws CannotRedoException {
+      super.redo();
+      doModifyLevel(this.modifiedLevel, this.name, this.elevation, this.floorThickness, this.height); 
+    }
+
+    @Override
+    public String getPresentationName() {
+      return this.preferences.getLocalizedString(LevelController.class, "undoModifyLevelName");
+    }
+  }
+
+  /**
+   * Modifies level properties with the values in parameter.
+   */
+  private static void doModifyLevel(ModifiedLevel modifiedLevel, 
+                                    String name, Float elevation, 
+                                    Float floorThickness, Float height) {
+    Level level = modifiedLevel.getLevel();
+    if (name != null) {
+      level.setName(name);
+    }
+    if (elevation != null) {
+      level.setElevation(elevation); 
+    }
+    if (floorThickness != null) {
+      level.setFloorThickness(floorThickness);
+    }
+    if (height != null) {
+      level.setHeight(height);
+    }
+  }
+
+  /**
+   * Restores level properties from the values stored in <code>modifiedLevel</code>.
+   */
+  private static void undoModifyLevel(ModifiedLevel modifiedLevel) {
+    modifiedLevel.reset();
+  }
+
+  /**
+   * Stores the current properties values of a modified level.
+   */
+  private static class ModifiedLevel {
+    private final Level   level;
+    private final String  name;
+    private final float   elevation;
+    private final float   floorThickness;
+    private final float   height;
+
+    public ModifiedLevel(Level level) {
+      this.level = level;
+      this.name = level.getName();
+      this.elevation = level.getElevation();
+      this.floorThickness = level.getFloorThickness();
+      this.height = level.getHeight();
+    }
+
+    public Level getLevel() {
+      return this.level;
+    }
+        
+    public void reset() {
+      this.level.setName(this.name);
+      this.level.setElevation(this.elevation);
+      this.level.setFloorThickness(this.floorThickness);
+      this.level.setHeight(this.height);
+    }
+  }
+}
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_bg.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_bg.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_bg.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_bg.properties	2011-12-21 00:48:52.000000000 +0000
@@ -2,7 +2,7 @@
 #
 # Translated to Bulgarian by Valentin Laskov
 #
-# Sweet Home 3D, Copyright (c) 2007-2009 Emmanuel PUYBARET / eTeks <info@eteks.com>
+# Sweet Home 3D, Copyright (c) 2007-2011 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -112,6 +112,10 @@
 LabelController.undoModifyLabelsName=\u043f\u0440\u043e\u043c\u044f\u043d\u0430\u0442\u0430 \u043d\u0430 \u0442\u0435\u043a\u0441\u0442\u0430
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=\u043f\u0440\u043e\u043c\u044f\u043d\u0430\u0442\u0430
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=\u041f\u0440\u043e\u043c\u044f\u043d\u0430\u0442\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0442\u0435 \u0437\u0430 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u0432\u0430\u043d\u0435
 
@@ -144,6 +148,10 @@
 PlanController.undoModifyTextStyleName=\u043f\u0440\u043e\u043c\u044f\u043d\u0430\u0442\u0430 \u043d\u0430 \u0441\u0442\u0438\u043b\u0430
 PlanController.undoCompassRotationName=\u0437\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435\u0442\u043e \u043d\u0430 \u043a\u043e\u043c\u043f\u0430\u0441\u0430
 PlanController.undoCompassResizeName=\u043f\u0440\u0435\u043e\u0440\u0430\u0437\u043c\u0435\u0440\u044f\u0432\u0430\u043d\u0435\u0442\u043e \u043d\u0430 \u043a\u043e\u043c\u043f\u0430\u0441\u0430
+PlanController.undoAddLevel=\u0434\u043E\u0431\u0430\u0432\u044F\u043D\u0435\u0442\u043E \u043D\u0430 \u0435\u0442\u0430\u0436
+PlanController.undoDeleteSelectedLevel=\u0438\u0437\u0442\u0440\u0438\u0432\u0430\u043D\u0435\u0442\u043E \u043D\u0430 \u0435\u0442\u0430\u0436
+
+PlanController.levelName=\u0415\u0442\u0430\u0436 %d
 
 # Tool tip feedback (\u00b0 is the degree sign)
 PlanController.rotationToolTipFeedback=\u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_cs.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_cs.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_cs.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_cs.properties	2011-12-21 00:48:52.000000000 +0000
@@ -1,6 +1,6 @@
 # package_cs.properties 11 Dec 2008
 #
-# Translated to Czech by Stefan Novak, Kamil Paral, Roman Polasek and Emmanuel Puybaret
+# Translated to Czech by Stefan Novak, Kamil Paral, Roman Polasek, Ondrej Dolejsi and Emmanuel Puybaret
 #
 # Sweet Home 3D, Copyright (c) 2008 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
@@ -109,6 +109,10 @@
 LabelController.undoModifyLabeslsName=Upravit
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=Upravit
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=Upravit nastaven\u00ed str\u00e1nky
 
@@ -140,6 +144,10 @@
 PlanController.undoModifyTextStyleName=Upravit styl
 PlanController.undoCompassRotationName=Oto\u010dit kompas
 PlanController.undoCompassResizeName=Zm\u011bnit velikost kompasu
+PlanController.undoAddLevel=P\u0159idat \u00farove\u0148
+PlanController.undoDeleteSelectedLevel=Smazat \u00farove\u0148
+
+PlanController.levelName=\u00darove\u0148 %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=Rotace: %d\u00B0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_de.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_de.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_de.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_de.properties	2011-12-21 00:48:52.000000000 +0000
@@ -142,6 +142,10 @@
 PlanController.undoModifyTextStyleName=Stil �ndern
 PlanController.undoCompassRotationName=Kompass drehen
 PlanController.undoCompassResizeName=Kompass skalieren
+PlanController.undoAddLevel=Niveau hinzuf�gen
+PlanController.undoDeleteSelectedLevel=Niveau entfernen
+
+PlanController.levelName=Niveau %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=Winkel: %d�
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_el.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_el.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_el.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_el.properties	2011-12-21 00:48:52.000000000 +0000
@@ -112,6 +112,10 @@
 LabelController.undoModifyLabelsName=\u03a4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=\u03a4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=\u03a4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b4\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7\u03c2 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2
 
@@ -144,6 +148,10 @@
 PlanController.undoModifyTextStyleName=\u03a4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03bc\u03bf\u03c1\u03c6\u03ae\u03c2
 PlanController.undoCompassRotationName=\u03a0\u03c1\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03c0\u03c5\u03be\u03af\u03b4\u03b1\u03c2
 PlanController.undoCompassResizeName=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03bc\u03b5\u03b3\u03ad\u03b8\u03bf\u03c5\u03c2 \u03c0\u03c5\u03be\u03af\u03b4\u03b1\u03c2
+PlanController.undoAddLevel=\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5
+PlanController.undoDeleteSelectedLevel=\u0391\u03C6\u03B1\u03AF\u03C1\u03B5\u03C3\u03B7 \u03BF\u03C1\u03CC\u03C6\u03BF\u03C5
+
+PlanController.levelName=\u038C\u03C1\u03BF\u03C6\u03BF\u03C2 %d
 
 # Tool tip feedback (\u00b0 is the degree sign)
 PlanController.rotationToolTipFeedback=\u0393\u03c9\u03bd\u03af\u03b1: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_es.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_es.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_es.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_es.properties	2011-12-21 00:48:52.000000000 +0000
@@ -109,6 +109,10 @@
 LabelController.undoModifyLabelsName=Modificar
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=Modificar
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=Modificar Configurar P�gina
 
@@ -141,6 +145,10 @@
 PlanController.undoModifyTextStyleName=Modificar Estilo
 PlanController.undoCompassRotationName=Girar Brujula
 PlanController.undoCompassResizeName=Redimensionar Brujula
+PlanController.undoAddLevel=A�adir nivel
+PlanController.undoDeleteSelectedLevel=Eliminar nivel
+
+PlanController.levelName=Nivel %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=�ngulo: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_fr.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_fr.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_fr.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_fr.properties	2011-12-21 00:48:52.000000000 +0000
@@ -49,7 +49,7 @@
 # Resources for Home3DAttributesController class
 Home3DAttributesController.undoModify3DAttributesName=Modifier
 
-Home3DAttributesController.groundTextureTitle=Texture du sol
+Home3DAttributesController.groundTextureTitle=Texture du plancher
 Home3DAttributesController.skyTextureTitle=Texture du ciel
 
 
@@ -109,6 +109,10 @@
 LabelController.undoModifyLabelsName=Modifier
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=Modifier
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=Modifier mise en page
 
@@ -141,6 +145,10 @@
 PlanController.undoModifyTextStyleName=Modifier style
 PlanController.undoCompassRotationName=Orienter boussole
 PlanController.undoCompassResizeName=Redimensionner boussole
+PlanController.undoAddLevel=Ajouter niveau
+PlanController.undoDeleteSelectedLevel=Supprimer niveau
+
+PlanController.levelName=Niveau %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=Angle : %d\u00b0
@@ -163,7 +171,7 @@
 # Undo/Redo presentation names and other resources for RoomController class
 RoomController.undoModifyRoomsName=Modifier
 
-RoomController.floorTextureTitle=Texture du sol
+RoomController.floorTextureTitle=Texture du plancher
 RoomController.ceilingTextureTitle=Texture du plafond
 
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_hu.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_hu.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_hu.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_hu.properties	2011-12-21 00:48:52.000000000 +0000
@@ -1,6 +1,6 @@
 # package_hu.properties 11 Dec 2008
 #
-# Translated to Hungarian by Viktor Miklosi
+# Translated to Hungarian by Viktor Miklosi and Emmanuel Puybaret
 #
 # Sweet Home 3D, Copyright (c) 2007-2008 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
@@ -110,6 +110,10 @@
 LabelController.undoModifyLabelsName=M\u00f3dos\u00edt\u00e1s
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=M\u00f3dos\u00edt\u00e1s
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=Oldalbe\u00e1ll\u00edt\u00e1s m\u00f3dos\u00edt\u00e1sa
 
@@ -142,6 +146,10 @@
 PlanController.undoModifyTextStyleName=Form\u00e1tm m\u00f3dos\u00edt\u00e1sa
 PlanController.undoCompassRotationName=T\u00e1jol\u00f3 elforgat\u00e1sa
 PlanController.undoCompassResizeName=T\u00e1jol\u00f3 \u00e1tm\u00e9retez\u00e9se
+PlanController.undoAddLevel=Szint hozz�ad�sa
+PlanController.undoDeleteSelectedLevel=Szint t�rl�se
+
+PlanController.levelName=Szint %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=Sz\u00f6g: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_it.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_it.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_it.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_it.properties	2011-12-21 00:48:52.000000000 +0000
@@ -110,6 +110,10 @@
 LabelController.undoModifyLabelsName=Modifica
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=Modifica
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=Modifica impostazioni pagina
 
@@ -142,6 +146,10 @@
 PlanController.undoModifyTextStyleName=Modifica stile
 PlanController.undoCompassRotationName=Ruota bussola
 PlanController.undoCompassResizeName=Ridimensiona bussola
+PlanController.undoAddLevel=Aggiungi livello
+PlanController.undoDeleteSelectedLevel=Elimina livello
+
+PlanController.levelName=Level %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=Angolo: %d�
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_ja.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_ja.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_ja.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_ja.properties	2011-12-21 00:48:52.000000000 +0000
@@ -1,6 +1,6 @@
 # package_ja.properties 10 Sep 2009
 #
-# Translated to Japanese by Takahiro Sato and Ouiko
+# Translated to Japanese by Takahiro Sato, Ouiko, Vy and Miyoko
 #
 # Sweet Home 3D, Copyright (c) 2007-2009 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
@@ -111,6 +111,10 @@
 LabelController.undoModifyLabelsName=\u4fee\u6b63
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=\u4fee\u6b63
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=\u30da\u30fc\u30b8\u8a2d\u5b9a\u3092\u4fee\u6b63
 
@@ -143,6 +147,10 @@
 PlanController.undoModifyTextStyleName=\u30b9\u30bf\u30a4\u30eb\u3092\u4fee\u6b63
 PlanController.undoCompassRotationName=\u30b3\u30f3\u30d1\u30b9\u3092\u56de\u8ee2\u3059\u308b
 PlanController.undoCompassResizeName=\u30b3\u30f3\u30d1\u30b9\u306e\u30b5\u30a4\u30ba\u3092\u5909\u66f4\u3059\u308b
+PlanController.undoAddLevel=\u968E\u6570\u3092\u8DB3\u3059
+PlanController.undoDeleteSelectedLevel=\u968E\u6570\u3092\u524A\u9664\u3059\u308B
+
+PlanController.levelName=%d \u968E
 
 # Tool tip feedback (\u00b0 is the degree sign)
 PlanController.rotationToolTipFeedback=\u89d2\u5ea6: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_pl.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_pl.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_pl.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_pl.properties	2011-12-21 00:48:52.000000000 +0000
@@ -1,6 +1,6 @@
 # package_pl.properties 11 Dec 2008
 #
-# Translated to Polish by Pawel Antkowiak and Pawel "Bizkit" Popanda
+# Translated to Polish by Pawel Antkowiak, Pawel "Bizkit" Popanda and Emmanuel Puybaret
 #
 # Sweet Home 3D, Copyright (c) 2007-2008 Emmanuel PUYBARET / eTeks <info@eteks.com>
 #
@@ -110,6 +110,10 @@
 LabelController.undoModifyLabelsName=Modyfikuj
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=Modyfikuj
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=Konfiguracja strony
 
@@ -142,6 +146,10 @@
 PlanController.undoModifyTextStyleName=Modyfikuj styl
 PlanController.undoCompassRotationName=Obr\u00f3\u0107 kompas
 PlanController.undoCompassResizeName=Zmie\u0144 rozmiar
+PlanController.undoAddLevel=Dodaj poziom
+PlanController.undoDeleteSelectedLevel=Usu\u0144 poziom
+
+PlanController.levelName=Poziom %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=Orietnacja: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package.properties	2011-12-21 00:48:52.000000000 +0000
@@ -111,6 +111,10 @@
 LabelController.undoModifyLabelsName=Modify
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=Modify
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=Modify page setup
 
@@ -143,6 +147,10 @@
 PlanController.undoModifyTextStyleName=Modify style
 PlanController.undoCompassRotationName=Rotate compass
 PlanController.undoCompassResizeName=Resize compass
+PlanController.undoAddLevel=Add level
+PlanController.undoDeleteSelectedLevel=Delete level
+
+PlanController.levelName=Level %d
 
 # Tool tip feedback (\u00b0 is the degree sign)
 PlanController.rotationToolTipFeedback=Angle: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_pt.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_pt.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_pt.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_pt.properties	2011-12-21 00:48:52.000000000 +0000
@@ -110,6 +110,10 @@
 LabelController.undoModifyLabelsName=Modificar
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=Modificar
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=Modificar p�gina de configura��o
 
@@ -142,6 +146,10 @@
 PlanController.undoModifyTextStyleName=Modificar estilo
 PlanController.undoCompassRotationName=Rota��o b�ssola
 PlanController.undoCompassResizeName=Redimensionar b�ssola
+PlanController.undoAddLevel=Adicionar n�vel
+PlanController.undoDeleteSelectedLevel=Deletar n�vel
+
+PlanController.levelName=N�vel %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=�ngulo: %d�
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_ru.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_ru.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_ru.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_ru.properties	2011-12-21 00:48:52.000000000 +0000
@@ -110,6 +110,10 @@
 LabelController.undoModifyLabelsName=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
 
@@ -142,6 +146,10 @@
 PlanController.undoModifyTextStyleName=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0442\u0438\u043b\u044c
 PlanController.undoCompassRotationName=\u0412\u0440\u0430\u0449\u0430\u0442\u044c \u043a\u043e\u043c\u043f\u0430\u0441
 PlanController.undoCompassResizeName=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u0440\u0430\u0437\u043c\u0435\u0440\u043e\u0432 \u043a\u043e\u043c\u043f\u0430\u0441\u0430
+PlanController.undoAddLevel=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C
+PlanController.undoDeleteSelectedLevel=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C
+
+PlanController.levelName=\u0423\u0440\u043E\u0432\u0435\u043D\u044C %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=\u0423\u0433\u043e\u043b: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_sv.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_sv.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_sv.properties	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_sv.properties	2011-12-21 00:48:52.000000000 +0000
@@ -111,6 +111,10 @@
 LabelController.undoModifyLabelsName=�ndra text
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=�ndra
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=�ndra utskriftsinst�llningar
 
@@ -143,6 +147,10 @@
 PlanController.undoModifyTextStyleName=�ndra stil
 PlanController.undoCompassRotationName=Rotera kompass
 PlanController.undoCompassResizeName=Storleks�ndra kompass
+PlanController.undoAddLevel=L�gg till niv�
+PlanController.undoDeleteSelectedLevel=Ta bort niv�
+
+PlanController.levelName=Niv� %d
 
 # Tool tip feedback
 PlanController.rotationToolTipFeedback=Vinkel: %d�
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_vi.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_vi.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_vi.properties	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_vi.properties	2011-12-21 00:48:52.000000000 +0000
@@ -109,6 +109,10 @@
 LabelController.undoModifyLabelsName=S\u1eeda
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=S\u1eeda
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=S\u1eeda thi\u1ebft l\u1eadp trang
 
@@ -141,6 +145,10 @@
 PlanController.undoModifyTextStyleName=Thay \u0111\u1ed5i ki\u1ec3u
 PlanController.undoCompassRotationName=Quay v\u00f9ng
 PlanController.undoCompassResizeName=Ch\u1ec9nh k\u00edch th\u01b0\u1edbc v\u00f9ng
+PlanController.undoAddLevel=Th�m c\u1EA5p \u0111\u1ED9
+PlanController.undoDeleteSelectedLevel=X�a c\u1EA5p \u0111\u1ED9
+
+PlanController.levelName=C\u1EA5p \u0111\u1ED9 %d
 
 # Tool tip feedback (\u00b0 is the degree sign)
 PlanController.rotationToolTipFeedback=G\u00f3c: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_zh_CN.properties sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_zh_CN.properties
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_zh_CN.properties	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/package_zh_CN.properties	2011-12-21 00:48:52.000000000 +0000
@@ -108,6 +108,10 @@
 LabelController.undoModifyLabelsName=\u66f4\u6539
 
 
+# Undo/Redo presentation names for LevelController class
+LevelController.undoModifyLevelName=\u66f4\u6539
+
+
 # Undo/Redo presentation names for PageSetupController class
 PageSetupController.undoPageSetupName=\u66f4\u6539\u9875\u9762\u8bbe\u7f6e
 
@@ -140,6 +144,10 @@
 PlanController.undoModifyTextStyleName=\u66f4\u6539\u6837\u5f0f
 PlanController.undoCompassRotationName=\u8f6c\u52a8\u6b63\u5317\u65b9\u5411
 PlanController.undoCompassResizeName=\u8c03\u6574\u7f57\u76d8\u523b\u5ea6\u9762\u5927\u5c0f
+PlanController.undoAddLevel=\u6DFB\u52A0\u697C\u5C42
+PlanController.undoDeleteSelectedLevel=\u5220\u9664\u697C\u5C42
+
+PlanController.levelName=\u697C\u5C42 %d
 
 # Tool tip feedback (\u00b0 is the degree sign)
 PlanController.rotationToolTipFeedback=\u89d2\u5ea6: %d\u00b0
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/PhotoController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/PhotoController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/PhotoController.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/PhotoController.java	2011-12-21 00:48:52.000000000 +0000
@@ -68,6 +68,7 @@
     this.viewFactory = viewFactory;
     this.contentManager = contentManager;
     this.propertyChangeSupport = new PropertyChangeSupport(this);
+    this.view3DAspectRatio = 1;
     
     this.cameraChangeListener = new CameraChangeListener(this);
     home.getCamera().addPropertyChangeListener(this.cameraChangeListener);
@@ -196,7 +197,6 @@
     setTime(this.home.getCamera().getTime());
     setLens(this.home.getCamera().getLens());
     setCeilingLightColor(homeEnvironment.getCeillingLightColor());
-    this.view3DAspectRatio = 1;
   }
   
   /**
@@ -209,7 +209,9 @@
       this.propertyChangeSupport.firePropertyChange(Property.ASPECT_RATIO.name(), oldAspectRatio, aspectRatio);
       this.home.getEnvironment().setPhotoAspectRatio(this.aspectRatio);
       if (this.aspectRatio == AspectRatio.VIEW_3D_RATIO) {
-        setHeight(Math.round(width / this.view3DAspectRatio), false);
+        if (this.view3DAspectRatio != Float.POSITIVE_INFINITY) {
+          setHeight(Math.round(width / this.view3DAspectRatio), false);
+        }
       } else if (this.aspectRatio.getValue() != null) {
         setHeight(Math.round(width / this.aspectRatio.getValue()), false);
       }
@@ -237,7 +239,9 @@
       this.propertyChangeSupport.firePropertyChange(Property.WIDTH.name(), oldWidth, width);
       if (updateHeight) {
         if (this.aspectRatio == AspectRatio.VIEW_3D_RATIO) {
-          setHeight(Math.round(width / this.view3DAspectRatio), false);
+          if (this.view3DAspectRatio != Float.POSITIVE_INFINITY) {
+            setHeight(Math.round(width / this.view3DAspectRatio), false);
+          }
         } else if (this.aspectRatio.getValue() != null) {
           setHeight(Math.round(width / this.aspectRatio.getValue()), false);
         }
@@ -267,7 +271,9 @@
       this.propertyChangeSupport.firePropertyChange(Property.HEIGHT.name(), oldHeight, height);
       if (updateWidth) {
         if (this.aspectRatio == AspectRatio.VIEW_3D_RATIO) {
-          setWidth(Math.round(height * this.view3DAspectRatio), false);
+          if (this.view3DAspectRatio != Float.POSITIVE_INFINITY) {
+            setWidth(Math.round(height * this.view3DAspectRatio), false);
+          }
         } else if (this.aspectRatio.getValue() != null) {
           setWidth(Math.round(height * this.aspectRatio.getValue()), false);
         }
@@ -380,7 +386,8 @@
       float oldAspectRatio = this.view3DAspectRatio;
       this.view3DAspectRatio = view3DAspectRatio;
       this.propertyChangeSupport.firePropertyChange(Property.ASPECT_RATIO.name(), oldAspectRatio, view3DAspectRatio);
-      if (this.aspectRatio == AspectRatio.VIEW_3D_RATIO) {
+      if (this.aspectRatio == AspectRatio.VIEW_3D_RATIO
+          && this.view3DAspectRatio != Float.POSITIVE_INFINITY) {
         setHeight(Math.round(this.width / this.view3DAspectRatio), false);
       }
     }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/PlanController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/PlanController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/PlanController.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/PlanController.java	2011-12-21 00:48:52.000000000 +0000
@@ -34,6 +34,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -50,6 +51,7 @@
 import com.eteks.sweethome3d.model.CollectionListener;
 import com.eteks.sweethome3d.model.Compass;
 import com.eteks.sweethome3d.model.DimensionLine;
+import com.eteks.sweethome3d.model.Elevatable;
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomeDoorOrWindow;
 import com.eteks.sweethome3d.model.HomeFurnitureGroup;
@@ -58,6 +60,7 @@
 import com.eteks.sweethome3d.model.HomeTexture;
 import com.eteks.sweethome3d.model.Label;
 import com.eteks.sweethome3d.model.LengthUnit;
+import com.eteks.sweethome3d.model.Level;
 import com.eteks.sweethome3d.model.ObserverCamera;
 import com.eteks.sweethome3d.model.Room;
 import com.eteks.sweethome3d.model.Selectable;
@@ -109,8 +112,9 @@
 
   private static final String SCALE_VISUAL_PROPERTY = "com.eteks.sweethome3d.SweetHome3D.PlanScale";
   
-  private static final int PIXEL_MARGIN = 3;
-  private static final int PIXEL_WALL_MARGIN = 2;
+  private static final int PIXEL_MARGIN           = 4;
+  private static final int INDICATOR_PIXEL_MARGIN = 4;
+  private static final int WALL_ENDS_PIXEL_MARGIN = 2;
 
   private final Home                  home;
   private final UserPreferences       preferences;
@@ -931,8 +935,10 @@
       // Clone new walls to copy their characteristics 
       Wall firstWall = splitWall.clone();
       this.home.addWall(firstWall);
+      firstWall.setLevel(splitWall.getLevel());
       Wall secondWall = splitWall.clone();
       this.home.addWall(secondWall);
+      secondWall.setLevel(splitWall.getLevel());
       
       // Change split walls end and start point
       firstWall.setXEnd(xMiddle);
@@ -1019,7 +1025,7 @@
   }
   
   /**
-   * Controls the creation of new labels.
+   * Returns a new label. The new label isn't added to home.
    */
   private void createLabel(float x, float y) {
     new LabelController(this.home, x, y, this.preferences, this.viewFactory,
@@ -1332,7 +1338,7 @@
    * Returns the minimum scale of the plan view.
    */
   public float getMinimumScale() {
-    return 0.05f;
+    return 0.01f;
   }
   
   /**
@@ -1369,30 +1375,132 @@
   } 
   
   /**
-   * Selects all visible items in home.
+   * Sets the selected level in home.
+   */
+  public void setSelectedLevel(Level level) {
+    this.home.setSelectedLevel(level);
+  }
+
+  /**
+   * Selects all visible items in the selected level of home.
    */
   @Override
   public void selectAll() {
-    List<Selectable> all = new ArrayList<Selectable>(this.home.getWalls());
-    all.addAll(this.home.getRooms());
-    all.addAll(this.home.getDimensionLines());
-    all.addAll(this.home.getLabels());
+    List<Selectable> all = getVisibleItemsAtSelectedLevel();
+    if (this.home.isBasePlanLocked()) {
+      this.home.setSelectedItems(getItemsNotPartOfBasePlan(all));
+    } else {
+      this.home.setSelectedItems(all);
+    }
+  }
+
+  /**
+   * Returns the visible and selectable home items at the selected level, except camera. 
+   */
+  private List<Selectable> getVisibleItemsAtSelectedLevel() {
+    List<Selectable> selectableItems = new ArrayList<Selectable>();
+    Level selectedLevel = this.home.getSelectedLevel();
+    for (Wall wall : this.home.getWalls()) {
+      if (wall.isAtLevel(selectedLevel)) {
+        selectableItems.add(wall);
+      }
+    }
+    for (Room room : this.home.getRooms()) {
+      if (room.isAtLevel(selectedLevel)) {
+        selectableItems.add(room);
+      }
+    }
+    for (DimensionLine dimensionLine : this.home.getDimensionLines()) {
+      if (dimensionLine.isAtLevel(selectedLevel)) {
+        selectableItems.add(dimensionLine);
+      }
+    }
+    for (Label label : this.home.getLabels()) {
+      if (label.isAtLevel(selectedLevel)) {
+        selectableItems.add(label);
+      }
+    }
     for (HomePieceOfFurniture piece : this.home.getFurniture()) {
-      if (piece.isVisible()) {
-        all.add(piece);
+      if (isPieceOfFurnitureVisibleAtSelectedLevel(piece)) {
+        selectableItems.add(piece);
       }
     }
     if (this.home.getCompass().isVisible()) {
-      all.add(this.home.getCompass());
+      selectableItems.add(this.home.getCompass());
     }
-    if (this.home.isBasePlanLocked()) {
-      this.home.setSelectedItems(getItemsNotPartOfBasePlan(all));
+    return selectableItems;
+  }
+  
+  /**
+   * Returns <code>true</code> if the given piece is viewable and 
+   * its height and elevation make it viewable at the selected level in home.
+   */
+  private boolean isPieceOfFurnitureVisibleAtSelectedLevel(HomePieceOfFurniture piece) {
+    Level selectedLevel = this.home.getSelectedLevel();
+    return piece.isVisible() 
+        && (piece.getLevel() == selectedLevel
+            || piece.isAtLevel(selectedLevel));
+  }
+  
+  /**
+   * Returns the visible (fully or partially) rooms at the selected level in home.
+   */
+  private List<Room> getDetectableRoomsAtSelectedLevel() {
+    List<Room> rooms = this.home.getRooms();
+    Level selectedLevel = this.home.getSelectedLevel();
+    List<Level> levels = this.home.getLevels();
+    if (selectedLevel == null || levels.size() <= 1) {
+      return rooms; 
     } else {
-      this.home.setSelectedItems(all);
+      List<Room> visibleRooms = new ArrayList<Room>(rooms.size());
+      int selectedLevelIndex = levels.indexOf(selectedLevel);
+      boolean level0 = levels.get(0) == selectedLevel
+          || levels.get(selectedLevelIndex - 1).getElevation() == selectedLevel.getElevation();
+      Level otherLevel = levels.get(level0 && selectedLevelIndex < levels.size() - 1 
+          ? selectedLevelIndex + 1 
+          : selectedLevelIndex  - 1);
+      for (Room room : rooms) {
+        if (room.isAtLevel(selectedLevel)
+            || otherLevel != null 
+                && room.isAtLevel(otherLevel)
+                && (level0 && room.isFloorVisible()
+                    || !level0 && room.isCeilingVisible())) {
+          visibleRooms.add(room);
+        }
+      }      
+      return visibleRooms;
     }
   }
   
   /**
+   * Returns the visible (fully or partially) walls at the selected level in home.
+   */
+  private Collection<Wall> getDetectableWallsAtSelectedLevel() {
+    Collection<Wall> walls = this.home.getWalls();
+    Level selectedLevel = this.home.getSelectedLevel();
+    List<Level> levels = this.home.getLevels();
+    if (selectedLevel == null || levels.size() <= 1) {
+      return walls; 
+    } else {
+      Collection<Wall> visibleWalls = new ArrayList<Wall>(walls.size());
+      int selectedLevelIndex = levels.indexOf(selectedLevel);
+      boolean level0 = levels.get(0) == selectedLevel
+          || levels.get(selectedLevelIndex - 1).getElevation() == selectedLevel.getElevation();
+      Level otherLevel = levels.get(level0 && selectedLevelIndex < levels.size() - 1 
+          ? selectedLevelIndex + 1 
+          : selectedLevelIndex  - 1);
+      for (Wall wall : walls) {
+        if (wall.isAtLevel(selectedLevel)
+            || otherLevel != null 
+               && wall.isAtLevel(otherLevel)) {
+          visibleWalls.add(wall);
+        }
+      }
+      return visibleWalls;
+    }
+  }
+
+  /**
    * Returns the horizontal ruler of the plan view. 
    */
   public View getHorizontalRulerView() {
@@ -1409,13 +1517,14 @@
   private void addModelListeners() {
     this.selectionListener = new SelectionListener() {
         public void selectionChanged(SelectionEvent ev) {
+          selectLevelFromSelectedItems();
           if (getView() != null) {
             getView().makeSelectionVisible();
           }
         }
       };
     this.home.addSelectionListener(this.selectionListener);
-    // Ensure observer camera is visible when its location or angles change
+    // Ensure observer camera is visible when its size, location or angles change
     this.home.getObserverCamera().addPropertyChangeListener(new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent ev) {
           if (home.getSelectedItems().contains(ev.getSource())) {
@@ -1435,10 +1544,19 @@
               || Wall.Property.Y_END.name().equals(propertyName)
               || Wall.Property.WALL_AT_START.name().equals(propertyName)
               || Wall.Property.WALL_AT_END.name().equals(propertyName)
-              || Wall.Property.THICKNESS.name().equals(propertyName)) {
-            wallsAreaCache = null;
-            insideWallsAreaCache = null;
-            roomPathsCache = null;
+              || Wall.Property.THICKNESS.name().equals(propertyName)
+              || Wall.Property.LEVEL.name().equals(propertyName)
+              || Wall.Property.HEIGHT.name().equals(propertyName)
+              || Wall.Property.HEIGHT_AT_END.name().equals(propertyName)) {
+            resetAreaCache();
+            // Unselect unreachable wall
+            Wall wall = (Wall)ev.getSource();
+            if (!wall.isAtLevel(home.getSelectedLevel())) {
+              List<Selectable> selectedItems = new ArrayList<Selectable>(home.getSelectedItems());
+              if (selectedItems.remove(wall)) {
+                selectItems(selectedItems);
+              }
+            }
           }
         }
       };
@@ -1452,13 +1570,28 @@
           } else if (ev.getType() == CollectionEvent.Type.DELETE) {
             ev.getItem().removePropertyChangeListener(wallChangeListener);
           }
-          wallsAreaCache = null;
-          insideWallsAreaCache = null;
-          roomPathsCache = null;
+          resetAreaCache();
+        }
+      });
+    this.home.addPropertyChangeListener(Home.Property.SELECTED_LEVEL, new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent ev) {
+          resetAreaCache();
+        }
+      });
+    home.getObserverCamera().setFixedSize(home.getLevels().size() >= 2);
+    this.home.addLevelsListener(new CollectionListener<Level>() {
+        public void collectionChanged(CollectionEvent<Level> ev) {
+          home.getObserverCamera().setFixedSize(home.getLevels().size() >= 2);
         }
       });
   }
 
+  private void resetAreaCache() {
+    wallsAreaCache = null;
+    insideWallsAreaCache = null;
+    roomPathsCache = null;
+  }
+  
   /**
    * Displays in plan view the feedback of <code>draggedItems</code>,
    * during a drag and drop operation initiated from outside of plan view. 
@@ -1514,10 +1647,12 @@
    * @see #adjustMagnetizedPieceOfFurniture(HomePieceOfFurniture, float, float)
    */
   private Wall adjustPieceOfFurnitureOnWallAt(HomePieceOfFurniture piece, float x, float y) {
+    Level selectedLevel = this.home.getSelectedLevel();
     Wall wallAtPoint = null;
     // Search if point (x, y) is contained in home walls with no margin
     for (Wall wall : this.home.getWalls()) {
       if (wall.getArcExtent() == null
+          && wall.isAtLevel(selectedLevel)
           && wall.containsPoint(x, y, 0)
           && wall.getStartPointToEndPointDistance() > 0) {
         wallAtPoint = wall;
@@ -1529,6 +1664,7 @@
       // If not found search if point (x, y) is contained in home walls with a margin
       for (Wall wall : this.home.getWalls()) {
         if (wall.getArcExtent() == null
+            && wall.isAtLevel(selectedLevel)
             && wall.containsPoint(x, y, margin)
             && wall.getStartPointToEndPointDistance() > 0) {
           wallAtPoint = wall;
@@ -1563,8 +1699,8 @@
       double xPiece;
       double yPiece;
       float halfWidth = piece.getWidth() / 2;
-      final float thicknessEpsilon = 0.0002f;
       if (piece.isDoorOrWindow()) {
+        final float thicknessEpsilon = 0.00025f;
         float wallDistance = thicknessEpsilon / 2;
         if (piece instanceof HomeDoorOrWindow) {
           HomeDoorOrWindow doorOrWindow = (HomeDoorOrWindow) piece;
@@ -1802,7 +1938,7 @@
       for (HomePieceOfFurniture homePiece : this.home.getFurniture()) {
         if (homePiece != piece 
             && !homePiece.isDoorOrWindow()
-            && homePiece.isVisible()) {
+            && isPieceOfFurnitureVisibleAtSelectedLevel(homePiece)) {
           Shape shape = getPath(homePiece.getPoints());
           boolean surroundingPieceContainsPiece = true;
           for (float [] point : piecePoints) {
@@ -1836,25 +1972,30 @@
    */
   private DimensionLine getMeasuringDimensionLineAt(float x, float y, 
                                                     boolean magnetismEnabled) {
-    for (HomePieceOfFurniture piece : home.getFurniture()) {
-      DimensionLine dimensionLine = getDimensionLineBetweenPointsAt(piece.getPoints(), x, y, magnetismEnabled);
-      if (dimensionLine != null) {
-        return dimensionLine;
+    float margin = PIXEL_MARGIN / getScale();
+    for (HomePieceOfFurniture piece : this.home.getFurniture()) {
+      if (isPieceOfFurnitureVisibleAtSelectedLevel(piece)) {
+        DimensionLine dimensionLine = getDimensionLineBetweenPointsAt(piece.getPoints(), x, y, margin, magnetismEnabled);
+        if (dimensionLine != null) {
+          return dimensionLine;
+        }
       }
     }
     for (GeneralPath roomPath : getRoomPathsFromWalls()) {
-      if (roomPath.intersects(x - PIXEL_MARGIN, y - PIXEL_MARGIN, 2 * PIXEL_MARGIN, 2 * PIXEL_MARGIN)) {
+      if (roomPath.intersects(x - margin, y - margin, 2 * margin, 2 * margin)) {
         DimensionLine dimensionLine = getDimensionLineBetweenPointsAt(
-            getPathPoints(roomPath, true), x, y, magnetismEnabled);
+            getPathPoints(roomPath, true), x, y, margin, magnetismEnabled);
         if (dimensionLine != null) {
           return dimensionLine;
         }
       }
     }
-    for (Room room : home.getRooms()) {
-      DimensionLine dimensionLine = getDimensionLineBetweenPointsAt(room.getPoints(), x, y, magnetismEnabled);
-      if (dimensionLine != null) {
-        return dimensionLine;
+    for (Room room : this.home.getRooms()) {
+      if (room.isAtLevel(this.home.getSelectedLevel())) {
+        DimensionLine dimensionLine = getDimensionLineBetweenPointsAt(room.getPoints(), x, y, margin, magnetismEnabled);
+        if (dimensionLine != null) {
+          return dimensionLine;
+        }
       }
     }
     return null;
@@ -1865,7 +2006,7 @@
    * or <code>null</code> if it doesn't exist. 
    */
   private DimensionLine getDimensionLineBetweenPointsAt(float [][] points, float x, float y, 
-                                                        boolean magnetismEnabled) {
+                                                        float margin, boolean magnetismEnabled) {
     for (int i = 0; i < points.length; i++) {
       int nextPointIndex = (i + 1) % points.length;
       // Ignore sides with a length smaller than 0.1 cm
@@ -1874,7 +2015,7 @@
       if (distanceBetweenPointsSq > 0.01
           && Line2D.ptSegDistSq(points [i][0], points [i][1], 
               points [nextPointIndex][0], points [nextPointIndex][1], 
-              x, y) <= PIXEL_MARGIN * PIXEL_MARGIN) {
+              x, y) <= margin * margin) {
         double angle = Math.atan2(points [i][1] - points [nextPointIndex][1], 
             points [nextPointIndex][0] - points [i][0]);
         boolean reverse = angle < -Math.PI / 2 || angle > Math.PI / 2;
@@ -1914,6 +2055,185 @@
   }
 
   /**
+   * Controls the creation of a new level.
+   */
+  public void addLevel() {
+    List<Selectable> oldSelection = this.home.getSelectedItems();
+    final Selectable [] oldSelectedItems = 
+        oldSelection.toArray(new Selectable [oldSelection.size()]);
+    final Level oldSelectedLevel = this.home.getSelectedLevel();
+    List<Level> levels = this.home.getLevels();
+    float newWallHeight = this.preferences.getNewWallHeight();
+    float newFloorThickness = this.preferences.getNewFloorThickness();
+    final Level level0;
+    if (levels.isEmpty()) {
+      // Create level 0
+      String level0Name = this.preferences.getLocalizedString(PlanController.class, "levelName", 0);
+      level0 = createLevel(level0Name, 0, newFloorThickness, newWallHeight);
+      level0.setBackgroundImage(this.home.getBackgroundImage());
+      moveHomeItemsToLevel(level0);
+      levels = this.home.getLevels();
+    } else {
+      level0 = null;
+    }
+    String newLevelName = this.preferences.getLocalizedString(PlanController.class, "levelName", levels.size());
+    float newLevelElevation = levels.get(levels.size() - 1).getElevation() 
+        + newWallHeight + newFloorThickness;
+    final Level newLevel = createLevel(newLevelName, newLevelElevation, newFloorThickness, newWallHeight);
+    setSelectedLevel(newLevel);
+    UndoableEdit undoableEdit = new AbstractUndoableEdit() {      
+      @Override
+      public void undo() throws CannotUndoException {
+        super.undo();
+        setSelectedLevel(oldSelectedLevel);
+        home.deleteLevel(newLevel);
+        if (level0 != null) {
+          home.setBackgroundImage(level0.getBackgroundImage());
+          moveHomeItemsToLevel(oldSelectedLevel);
+          home.deleteLevel(level0);
+        }
+        selectAndShowItems(Arrays.asList(oldSelectedItems));        
+      }
+      
+      @Override
+      public void redo() throws CannotRedoException {
+        super.redo();
+        if (level0 != null) {
+          home.addLevel(level0);
+          moveHomeItemsToLevel(level0);
+          level0.setBackgroundImage(home.getBackgroundImage());
+        }
+        home.addLevel(newLevel);
+        setSelectedLevel(newLevel);
+      }      
+
+      @Override
+      public String getPresentationName() {
+        return preferences.getLocalizedString(PlanController.class, "undoAddLevel");
+      }      
+    };
+    this.undoSupport.postEdit(undoableEdit);
+  }
+
+  /**
+   * Returns a new level added to home.  
+   */
+  protected Level createLevel(String name, float elevation, float floorThickness, float height) {
+    Level newLevel = new Level(name, elevation, floorThickness, height);
+    this.home.addLevel(newLevel);
+    return newLevel;
+  }
+
+  /**
+   * Moves to the given level all existing furniture, walls, rooms, dimension lines 
+   * and labels. 
+   */
+  private void moveHomeItemsToLevel(Level level) {
+    for (HomePieceOfFurniture piece : this.home.getFurniture()) {
+      piece.setLevel(level);
+    }
+    for (Wall wall : this.home.getWalls()) {
+      wall.setLevel(level);
+    }
+    for (Room room : this.home.getRooms()) {
+      room.setLevel(level);
+    }
+    for (DimensionLine dimensionLine : this.home.getDimensionLines()) {
+      dimensionLine.setLevel(level);
+    }
+    for (Label label : this.home.getLabels()) {
+      label.setLevel(level);
+    }
+  }
+
+  public void modifySelectedLevel() {
+    if (this.home.getSelectedLevel() != null) {
+      new LevelController(this.home, this.preferences, this.viewFactory,
+          this.undoSupport).displayView(getView());
+    }
+  }
+  
+  /**
+   * Deletes the selected level and the items that belongs to it.
+   */
+  public void deleteSelectedLevel() {
+    // Start a compound edit that delete walls, furniture, rooms, dimension lines and labels from home
+    undoSupport.beginUpdate();
+    List<HomePieceOfFurniture> levelFurniture = new ArrayList<HomePieceOfFurniture>();
+    final Level oldSelectedLevel = this.home.getSelectedLevel();
+    for (HomePieceOfFurniture piece : this.home.getFurniture()) {
+      if (piece.getLevel() == oldSelectedLevel) {
+        levelFurniture.add(piece);
+      }
+    }
+    // Delete furniture with inherited method
+    deleteFurniture(levelFurniture);      
+    
+    List<Selectable> levelOtherItems = new ArrayList<Selectable>();
+    addLevelItemsAtSelectedLevel(this.home.getWalls(), levelOtherItems);
+    addLevelItemsAtSelectedLevel(this.home.getRooms(), levelOtherItems);
+    addLevelItemsAtSelectedLevel(this.home.getDimensionLines(), levelOtherItems);
+    addLevelItemsAtSelectedLevel(this.home.getLabels(), levelOtherItems);
+    // First post to undo support that walls, rooms and dimension lines are deleted, 
+    // otherwise data about joined walls and rooms index can't be stored       
+    postDeleteItems(levelOtherItems, this.home.isBasePlanLocked());
+    // Then delete items from plan
+    doDeleteItems(levelOtherItems);
+
+    this.home.deleteLevel(oldSelectedLevel);
+    List<Level> levels = this.home.getLevels();
+    final Level remainingLevel;
+    final Float remainingLevelElevation;
+    if (levels.size() == 1) {
+      remainingLevel = levels.get(0);
+      remainingLevelElevation = remainingLevel.getElevation();
+      remainingLevel.setElevation(0);
+    } else {
+      remainingLevel = null;
+      remainingLevelElevation = null;
+    }    
+    undoSupport.postEdit(new AbstractUndoableEdit() {
+        @Override
+        public void undo() throws CannotUndoException {
+          super.undo();
+          if (remainingLevel != null) {
+            remainingLevel.setElevation(remainingLevelElevation);
+          }
+          home.addLevel(oldSelectedLevel);
+          setSelectedLevel(oldSelectedLevel);
+        }
+        
+        @Override
+        public void redo() throws CannotRedoException {
+          super.redo();
+          home.deleteLevel(oldSelectedLevel);
+          if (remainingLevel != null) {
+            remainingLevel.setElevation(0);
+          }
+        }
+
+        @Override
+        public String getPresentationName() {
+          return preferences.getLocalizedString(PlanController.class, "undoDeleteSelectedLevel");
+        }      
+      });
+   
+    // End compound edit
+    undoSupport.endUpdate();
+  }
+
+  private void addLevelItemsAtSelectedLevel(Collection<? extends Selectable> items, 
+                                            List<Selectable> levelItems) {
+    Level selectedLevel = this.home.getSelectedLevel();
+    for (Selectable item : items) {
+      if (item instanceof Elevatable
+          && ((Elevatable)item).getLevel() == selectedLevel) {
+        levelItems.add(item);
+      }
+    }
+  }
+  
+  /**
    * Returns a new wall instance between (<code>xStart</code>,
    * <code>yStart</code>) and (<code>xEnd</code>, <code>yEnd</code>)
    * end points. The new wall is added to home and its start point is joined 
@@ -1965,9 +2285,10 @@
    * which has a start point not joined to any wall. 
    */
   private Wall getWallStartAt(float x, float y, Wall ignoredWall) {
-    float margin = PIXEL_WALL_MARGIN / getScale();
+    float margin = WALL_ENDS_PIXEL_MARGIN / getScale();
     for (Wall wall : this.home.getWalls()) {
       if (wall != ignoredWall
+          && wall.isAtLevel(this.home.getSelectedLevel())
           && wall.getWallAtStart() == null
           && wall.containsWallStartAt(x, y, margin)) 
         return wall;
@@ -1980,9 +2301,10 @@
    * which has a end point not joined to any wall. 
    */
   private Wall getWallEndAt(float x, float y, Wall ignoredWall) {
-    float margin = PIXEL_WALL_MARGIN / getScale();
+    float margin = WALL_ENDS_PIXEL_MARGIN / getScale();
     for (Wall wall : this.home.getWalls()) {
       if (wall != ignoredWall
+          && wall.isAtLevel(this.home.getSelectedLevel())
           && wall.getWallAtEnd() == null
           && wall.containsWallEndAt(x, y, margin)) 
         return wall;
@@ -2000,8 +2322,9 @@
         && selectedItems.get(0) instanceof Wall
         && isItemResizable(selectedItems.get(0))) {
       Wall wall = (Wall)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
-      if (wall.containsWallStartAt(x, y, margin)) {
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
+      if (wall.isAtLevel(this.home.getSelectedLevel())
+          && wall.containsWallStartAt(x, y, margin)) {
         return wall;
       }
     } 
@@ -2017,8 +2340,9 @@
         && selectedItems.get(0) instanceof Wall
         && isItemResizable(selectedItems.get(0))) {
       Wall wall = (Wall)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
-      if (wall.containsWallEndAt(x, y, margin)) {
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
+      if (wall.isAtLevel(this.home.getSelectedLevel())
+          && wall.containsWallEndAt(x, y, margin)) {
         return wall;
       }
     } 
@@ -2043,8 +2367,9 @@
     if (selectedItems.size() == 1
         && selectedItems.get(0) instanceof Room) {
       Room room = (Room)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
-      if (room.getPointIndexAt(x, y, margin) != -1) {
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
+      if (room.isAtLevel(this.home.getSelectedLevel())
+          && room.getPointIndexAt(x, y, margin) != -1) {
         return room;
       }
     } 
@@ -2060,8 +2385,9 @@
         && selectedItems.get(0) instanceof Room
         && isItemMovable(selectedItems.get(0))) {
       Room room = (Room)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
-      if (room.getName() != null
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
+      if (room.isAtLevel(this.home.getSelectedLevel())
+          && room.getName() != null
           && room.getName().trim().length() > 0
           && room.isNameCenterPointAt(x, y, margin)) {
         return room;
@@ -2079,8 +2405,9 @@
         && selectedItems.get(0) instanceof Room
         && isItemMovable(selectedItems.get(0))) {
       Room room = (Room)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
-      if (room.isAreaVisible() 
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
+      if (room.isAtLevel(this.home.getSelectedLevel())
+          && room.isAreaVisible() 
           && room.isAreaCenterPointAt(x, y, margin)) {
         return room;
       }
@@ -2111,8 +2438,9 @@
         && selectedItems.get(0) instanceof DimensionLine
         && isItemResizable(selectedItems.get(0))) {
       DimensionLine dimensionLine = (DimensionLine)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
-      if (dimensionLine.containsStartExtensionLinetAt(x, y, margin)) {
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
+      if (dimensionLine.isAtLevel(this.home.getSelectedLevel())
+          && dimensionLine.containsStartExtensionLinetAt(x, y, margin)) {
         return dimensionLine;
       }
     } 
@@ -2129,8 +2457,9 @@
         && selectedItems.get(0) instanceof DimensionLine
         && isItemResizable(selectedItems.get(0))) {
       DimensionLine dimensionLine = (DimensionLine)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
-      if (dimensionLine.containsEndExtensionLineAt(x, y, margin)) {
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
+      if (dimensionLine.isAtLevel(this.home.getSelectedLevel())
+          && dimensionLine.containsEndExtensionLineAt(x, y, margin)) {
         return dimensionLine;
       }
     } 
@@ -2147,8 +2476,9 @@
         && selectedItems.get(0) instanceof DimensionLine
         && isItemResizable(selectedItems.get(0))) {
       DimensionLine dimensionLine = (DimensionLine)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
-      if (dimensionLine.isMiddlePointAt(x, y, margin)) {
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
+      if (dimensionLine.isAtLevel(this.home.getSelectedLevel())
+          && dimensionLine.isMiddlePointAt(x, y, margin)) {
         return dimensionLine;
       }
     } 
@@ -2156,9 +2486,9 @@
   }
   
   /**
-   * Returns the item that will be selected by a click at (<code>x</code>, <code>y</code>) point.
+   * Returns the selectable item at (<code>x</code>, <code>y</code>) point.
    */
-  protected Selectable getSelectableItemAt(float x, float y) {
+  public Selectable getSelectableItemAt(float x, float y) {
     List<Selectable> selectableItems = getSelectableItemsAt(x, y, true);
     if (selectableItems.size() != 0) {
       return selectableItems.get(0);
@@ -2170,7 +2500,7 @@
   /**
    * Returns the selectable items at (<code>x</code>, <code>y</code>) point.
    */
-  protected List<Selectable> getSelectableItemsAt(float x, float y) {
+  public List<Selectable> getSelectableItemsAt(float x, float y) {
     return getSelectableItemsAt(x, y, false);
   }
   
@@ -2193,10 +2523,12 @@
     }
     
     boolean basePlanLocked = this.home.isBasePlanLocked();
+    Level selectedLevel = this.home.getSelectedLevel();
     for (Label label : this.home.getLabels()) {
       if (!basePlanLocked 
           || !isItemPartOfBasePlan(label)) {
-        if (label.containsPoint(x, y, margin)) {
+        if (label.isAtLevel(selectedLevel)
+            && label.containsPoint(x, y, margin)) {
           items.add(label);
           if (stopAtFirstItem) {
             return items;
@@ -2214,6 +2546,7 @@
     for (DimensionLine dimensionLine : this.home.getDimensionLines()) {
       if ((!basePlanLocked 
             || !isItemPartOfBasePlan(dimensionLine))
+          && dimensionLine.isAtLevel(selectedLevel)
           && dimensionLine.containsPoint(x, y, margin)) {
         items.add(dimensionLine);
         if (stopAtFirstItem) {
@@ -2225,16 +2558,17 @@
     List<HomePieceOfFurniture> furniture = this.home.getFurniture();
     // Search in home furniture in reverse order to give priority to last drawn piece
     // at highest elevation in case it covers an other piece
+    List<HomePieceOfFurniture> foundFurniture = new ArrayList<HomePieceOfFurniture>();
     HomePieceOfFurniture foundPiece = null;
     for (int i = furniture.size() - 1; i >= 0; i--) {
       HomePieceOfFurniture piece = furniture.get(i);
       if ((!basePlanLocked 
             || !isItemPartOfBasePlan(piece))
-          && piece.isVisible()) {
+          && isPieceOfFurnitureVisibleAtSelectedLevel(piece)) {
         if (piece.containsPoint(x, y, margin)) {
-          items.add(piece);
+          foundFurniture.add(piece);
           if (foundPiece == null
-              || piece.getElevation() > foundPiece.getElevation()) {
+              || piece.getGroundElevation() > foundPiece.getGroundElevation()) {
             foundPiece = piece;
           }
         } else if (foundPiece == null) { 
@@ -2245,7 +2579,7 @@
               && isItemTextAt(piece, pieceName, piece.getNameStyle(), 
                   piece.getX() + piece.getNameXOffset(), 
                   piece.getY() + piece.getNameYOffset(), x, y, textMargin)) {
-            items.add(piece);
+            foundFurniture.add(piece);
             foundPiece = piece;
           }
         }
@@ -2255,9 +2589,16 @@
         && stopAtFirstItem) {
       return Arrays.asList(new Selectable [] {foundPiece});
     } else {
+      Collections.sort(foundFurniture, new Comparator<HomePieceOfFurniture>() {
+          public int compare(HomePieceOfFurniture p1, HomePieceOfFurniture p2) {
+            return -Float.compare(p1.getGroundElevation(), p2.getGroundElevation());
+          }
+        });
+      items.addAll(foundFurniture);
       for (Wall wall : this.home.getWalls()) {
         if ((!basePlanLocked 
               || !isItemPartOfBasePlan(wall))
+            && wall.isAtLevel(selectedLevel)
             && wall.containsPoint(x, y, margin)) {
           items.add(wall);
           if (stopAtFirstItem) {
@@ -2274,31 +2615,33 @@
         Room room = rooms.get(i);
         if (!basePlanLocked 
             || !isItemPartOfBasePlan(room)) {
-          if (room.containsPoint(x, y, margin)) {
-            items.add(room);
-             if (foundRoom == null
-                 || room.isCeilingVisible() && !foundRoom.isCeilingVisible()) {
-               foundRoom = room;
-             }
-          } else { 
-            // Search if room name contains point in case it is drawn outside of the room
-            String roomName = room.getName();
-            if (roomName != null 
-                && isItemTextAt(room, roomName, room.getNameStyle(), 
-                  room.getXCenter() + room.getNameXOffset(), 
-                  room.getYCenter() + room.getNameYOffset(), x, y, textMargin)) {
+          if (room.isAtLevel(selectedLevel)) {
+            if (room.containsPoint(x, y, margin)) {
               items.add(room);
-              foundRoom = room;
-            }
-            // Search if room area contains point in case its text is drawn outside of the room 
-            if (room.isAreaVisible()) {
-              String areaText = this.preferences.getLengthUnit().getAreaFormatWithUnit().format(room.getArea());
-              if (isItemTextAt(room, areaText, room.getAreaStyle(), 
-                  room.getXCenter() + room.getAreaXOffset(), 
-                  room.getYCenter() + room.getAreaYOffset(), x, y, textMargin)) {
+               if (foundRoom == null
+                   || room.isCeilingVisible() && !foundRoom.isCeilingVisible()) {
+                 foundRoom = room;
+               }
+            } else { 
+              // Search if room name contains point in case it is drawn outside of the room
+              String roomName = room.getName();
+              if (roomName != null 
+                  && isItemTextAt(room, roomName, room.getNameStyle(), 
+                    room.getXCenter() + room.getNameXOffset(), 
+                    room.getYCenter() + room.getNameYOffset(), x, y, textMargin)) {
                 items.add(room);
                 foundRoom = room;
               }
+              // Search if room area contains point in case its text is drawn outside of the room 
+              if (room.isAreaVisible()) {
+                String areaText = this.preferences.getLengthUnit().getAreaFormatWithUnit().format(room.getArea());
+                if (isItemTextAt(room, areaText, room.getAreaStyle(), 
+                    room.getXCenter() + room.getAreaXOffset(), 
+                    room.getYCenter() + room.getAreaYOffset(), x, y, textMargin)) {
+                  items.add(room);
+                  foundRoom = room;
+                }
+              }
             }
           }
         }
@@ -2337,45 +2680,21 @@
    */
   protected List<Selectable> getSelectableItemsIntersectingRectangle(float x0, float y0, float x1, float y1) {
     List<Selectable> items = new ArrayList<Selectable>();
-    updateRectangleItems(items, this.home.getDimensionLines(), x0, y0, x1, y1);
-    updateRectangleItems(items, this.home.getRooms(), x0, y0, x1, y1);
-    updateRectangleItems(items, this.home.getWalls(), x0, y0, x1, y1);
-    updateRectangleItems(items, this.home.getLabels(), x0, y0, x1, y1);
-    updateRectangleItems(items, Arrays.asList(new Selectable [] {this.home.getCompass()}), x0, y0, x1, y1);
-    ObserverCamera camera = this.home.getObserverCamera();
-    if (camera != null && camera.intersectsRectangle(x0, y0, x1, y1)) {
-      items.add(camera);
-    }
     boolean basePlanLocked = this.home.isBasePlanLocked();
-    for (HomePieceOfFurniture piece : this.home.getFurniture()) {
-      if ((!basePlanLocked 
-            || !isItemPartOfBasePlan(piece))
-          && piece.isVisible() 
-          && piece.intersectsRectangle(x0, y0, x1, y1)) {
-        items.add(piece);
-      }
-    }
-    return items;
-  }
-
-  /**
-   * Adds to <code>rectangleItems</code> every item of <code>selectableItems</code>
-   * that intersects with the rectangle of (<code>x0</code>, <code>y0</code>), 
-   * (<code>x1</code>, <code>y1</code>) opposite corners.
-   */
-  private void updateRectangleItems(List<Selectable> rectangleItems,
-                                    Collection<? extends Selectable> selectableItems,
-                                    float x0, float y0, float x1, float y1) {
-    boolean basePlanLocked = this.home.isBasePlanLocked();
-    for (Selectable item : selectableItems) {
+    for (Selectable item : getVisibleItemsAtSelectedLevel()) {
       if ((!basePlanLocked 
             || !isItemPartOfBasePlan(item))
           && item.intersectsRectangle(x0, y0, x1, y1)) {
-        rectangleItems.add(item);
+        items.add(item);
       }
     }
+    ObserverCamera camera = this.home.getObserverCamera();
+    if (camera != null && camera.intersectsRectangle(x0, y0, x1, y1)) {
+      items.add(camera);
+    }
+    return items;
   }
-  
+
   /**
    * Returns the selected piece of furniture with a point 
    * at (<code>x</code>, <code>y</code>) that can be used to rotate the piece.
@@ -2387,8 +2706,9 @@
         && isItemMovable(selectedItems.get(0))) {
       HomePieceOfFurniture piece = (HomePieceOfFurniture)selectedItems.get(0);
       float scaleInverse = 1 / getScale();
-      float margin = PIXEL_MARGIN * scaleInverse;
-      if (piece.isTopLeftPointAt(x, y, margin)
+      float margin = INDICATOR_PIXEL_MARGIN * scaleInverse;
+      if (isPieceOfFurnitureVisibleAtSelectedLevel(piece)
+          && piece.isTopLeftPointAt(x, y, margin)
           // Keep a free zone around piece center
           && Math.abs(x - piece.getX()) > scaleInverse
           && Math.abs(y - piece.getY()) > scaleInverse) {
@@ -2409,8 +2729,9 @@
         && isItemMovable(selectedItems.get(0))) {
       HomePieceOfFurniture piece = (HomePieceOfFurniture)selectedItems.get(0);
       float scaleInverse = 1 / getScale();
-      float margin = PIXEL_MARGIN * scaleInverse;
-      if (piece.isTopRightPointAt(x, y, margin)
+      float margin = INDICATOR_PIXEL_MARGIN * scaleInverse;
+      if (isPieceOfFurnitureVisibleAtSelectedLevel(piece)
+          && piece.isTopRightPointAt(x, y, margin)
           // Keep a free zone around piece center
           && Math.abs(x - piece.getX()) > scaleInverse
           && Math.abs(y - piece.getY()) > scaleInverse) {
@@ -2431,8 +2752,9 @@
         && selectedItems.get(0) instanceof HomePieceOfFurniture) {
       HomePieceOfFurniture piece = (HomePieceOfFurniture)selectedItems.get(0);
       float scaleInverse = 1 / getScale();
-      float margin = PIXEL_MARGIN * scaleInverse;
-      if (piece.isResizable()
+      float margin = INDICATOR_PIXEL_MARGIN * scaleInverse;
+      if (isPieceOfFurnitureVisibleAtSelectedLevel(piece)
+          && piece.isResizable()
           && isItemResizable(piece) 
           && piece.isBottomLeftPointAt(x, y, margin)
           // Keep a free zone around piece center
@@ -2456,8 +2778,9 @@
         && isItemResizable(selectedItems.get(0))) {
       HomePieceOfFurniture piece = (HomePieceOfFurniture)selectedItems.get(0);
       float scaleInverse = 1 / getScale();
-      float margin = PIXEL_MARGIN * scaleInverse;
-      if (piece.isResizable()
+      float margin = INDICATOR_PIXEL_MARGIN * scaleInverse;
+      if (isPieceOfFurnitureVisibleAtSelectedLevel(piece)
+          && piece.isResizable()
           && isItemResizable(piece) 
           && piece.isBottomRightPointAt(x, y, margin)
           // Keep a free zone around piece center
@@ -2479,8 +2802,9 @@
         && selectedItems.get(0) instanceof HomeLight) {
       HomeLight light = (HomeLight)selectedItems.get(0);
       float scaleInverse = 1 / getScale();
-      float margin = PIXEL_MARGIN * scaleInverse;
-      if (light.isBottomLeftPointAt(x, y, margin)
+      float margin = INDICATOR_PIXEL_MARGIN * scaleInverse;
+      if (isPieceOfFurnitureVisibleAtSelectedLevel(light)
+          && light.isBottomLeftPointAt(x, y, margin)
           // Keep a free zone around piece center
           && Math.abs(x - light.getX()) > scaleInverse
           && Math.abs(y - light.getY()) > scaleInverse) {
@@ -2501,8 +2825,9 @@
         && isItemMovable(selectedItems.get(0))) {
       HomePieceOfFurniture piece = (HomePieceOfFurniture)selectedItems.get(0);
       float scaleInverse = 1 / getScale();
-      float margin = PIXEL_MARGIN * scaleInverse;
-      if (piece.isNameVisible()
+      float margin = INDICATOR_PIXEL_MARGIN * scaleInverse;
+      if (isPieceOfFurnitureVisibleAtSelectedLevel(piece)
+          && piece.isNameVisible()
           && piece.getName().trim().length() > 0
           && piece.isNameCenterPointAt(x, y, margin)) {
         return piece;
@@ -2521,7 +2846,7 @@
         && selectedItems.get(0) instanceof Camera
         && isItemResizable(selectedItems.get(0))) {
       ObserverCamera camera = (ObserverCamera)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
       float [][] cameraPoints = camera.getPoints();
       // Check if (x,y) matches the point between the first and the last points 
       // of the rectangle surrounding camera
@@ -2545,7 +2870,7 @@
         && selectedItems.get(0) instanceof Camera
         && isItemResizable(selectedItems.get(0))) {
       ObserverCamera camera = (ObserverCamera)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
       float [][] cameraPoints = camera.getPoints();
       // Check if (x,y) matches the point between the second and the third points
       // of the rectangle surrounding camera
@@ -2569,7 +2894,7 @@
         && selectedItems.get(0) instanceof Camera
         && isItemResizable(selectedItems.get(0))) {
       ObserverCamera camera = (ObserverCamera)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
       float [][] cameraPoints = camera.getPoints();
       // Check if (x,y) matches the point between the first and the second points 
       // of the rectangle surrounding camera
@@ -2593,7 +2918,7 @@
         && selectedItems.get(0) instanceof Compass
         && isItemMovable(selectedItems.get(0))) {
       Compass compass = (Compass)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
       float [][] compassPoints = compass.getPoints();
       // Check if (x,y) matches the point between the third and the fourth points (South point) 
       // of the rectangle surrounding compass
@@ -2617,7 +2942,7 @@
         && selectedItems.get(0) instanceof Compass
         && isItemMovable(selectedItems.get(0))) {
       Compass compass = (Compass)selectedItems.get(0);
-      float margin = PIXEL_MARGIN / getScale();
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
       float [][] compassPoints = compass.getPoints();
       // Check if (x,y) matches the point between the second and the third points (East point) 
       // of the rectangle surrounding compass
@@ -2656,6 +2981,7 @@
           }
         });
 
+      // Delete furniture with inherited method
       deleteFurniture(Home.getFurnitureSubList(deletedItems));      
 
       List<Selectable> deletedOtherItems = 
@@ -2682,8 +3008,7 @@
     // Manage walls
     List<Wall> deletedWalls = Home.getWallsSubList(deletedItems);
     // Get joined walls data for undo operation
-    final JoinedWall [] joinedDeletedWalls = 
-      JoinedWall.getJoinedWalls(deletedWalls);
+    final JoinedWall [] joinedDeletedWalls = JoinedWall.getJoinedWalls(deletedWalls);
 
     // Manage rooms and their index
     List<Room> deletedRooms = Home.getRoomsSubList(deletedItems);
@@ -2709,14 +3034,15 @@
     List<Label> deletedLabels = Home.getLabelsSubList(deletedItems);
     final Label [] labels = deletedLabels.toArray(new Label [deletedLabels.size()]);
     
+    final Level level = this.home.getSelectedLevel();
     UndoableEdit undoableEdit = new AbstractUndoableEdit() {      
       @Override
       public void undo() throws CannotUndoException {
         super.undo();
         doAddWalls(joinedDeletedWalls, basePlanLocked);       
-        doAddRooms(rooms, roomsIndex, basePlanLocked);
-        doAddDimensionLines(dimensionLines, basePlanLocked);
-        doAddLabels(labels, basePlanLocked);
+        doAddRooms(rooms, roomsIndex, level, basePlanLocked);
+        doAddDimensionLines(dimensionLines, level, basePlanLocked);
+        doAddLabels(labels, level, basePlanLocked);
         selectAndShowItems(deletedItems);
       }
       
@@ -2920,6 +3246,7 @@
    */
   protected void selectAndShowItems(List<? extends Selectable> items) {
     selectItems(items);
+    selectLevelFromSelectedItems();
     getView().makeSelectionVisible();
   }
   
@@ -2935,9 +3262,9 @@
   }
   
   /**
-   * Selects only a given <code>item</code>.
+   * Selects the given <code>item</code>.
    */
-  private void selectItem(Selectable item) {
+  public void selectItem(Selectable item) {
     selectItems(Arrays.asList(new Selectable [] {item}));
   }
 
@@ -2948,9 +3275,31 @@
     List<Selectable> emptyList = Collections.emptyList(); 
     selectItems(emptyList);
   }
-
+  
+  /**
+   * Adds furniture to home and updates door and window flags if they intersect with walls and magnestism is enabled. 
+   */
+  @Override
+  public void addFurniture(List<HomePieceOfFurniture> furniture) {
+    super.addFurniture(furniture);
+    if (this.preferences.isMagnetismEnabled()) {
+      Area wallsArea = getWallsArea();
+      for (HomePieceOfFurniture piece : furniture) {
+        if (piece instanceof HomeDoorOrWindow) {
+          float [][] piecePoints = piece.getPoints();
+          Area pieceAreaIntersection = new Area(getPath(piecePoints));
+          pieceAreaIntersection.intersect(wallsArea);
+          if (!pieceAreaIntersection.isEmpty()
+              && new Room(piecePoints).getArea() / new Room(getPathPoints(getPath(pieceAreaIntersection), false)).getArea() > 0.999) {
+            ((HomeDoorOrWindow) piece).setBoundToWall(true);
+          }
+        }
+      }
+    }
+  }
+  
   /**
-   * Add <code>walls</code> to home and post an undoable new wall operation.
+   * Adds <code>walls</code> to home and post an undoable new wall operation.
    */
   public void addWalls(List<Wall> walls) {
     for (Wall wall : walls) {
@@ -2977,10 +3326,7 @@
       final boolean newBasePlanLocked = basePlanLocked;
       
       // Retrieve data about joined walls to newWalls
-      final JoinedWall [] joinedNewWalls = new JoinedWall [newWalls.size()];
-      for (int i = 0; i < joinedNewWalls.length; i++) {
-         joinedNewWalls [i] = new JoinedWall(newWalls.get(i));
-      }
+      final JoinedWall [] joinedNewWalls = JoinedWall.getJoinedWalls(newWalls);
       final Selectable [] oldSelectedItems = 
         oldSelection.toArray(new Selectable [oldSelection.size()]);
       UndoableEdit undoableEdit = new AbstractUndoableEdit() {      
@@ -3017,6 +3363,7 @@
     for (JoinedWall joinedNewWall : joinedWalls) {
       Wall wall = joinedNewWall.getWall();
       this.home.addWall(wall);
+      wall.setLevel(joinedNewWall.getLevel());
     }
     this.home.setBasePlanLocked(basePlanLocked);
     
@@ -3090,6 +3437,7 @@
 
       final Selectable [] oldSelectedItems = 
           oldSelection.toArray(new Selectable [oldSelection.size()]);
+      final Level roomsLevel = this.home.getSelectedLevel();
       UndoableEdit undoableEdit = new AbstractUndoableEdit() {      
         @Override
         public void undo() throws CannotUndoException {
@@ -3101,7 +3449,7 @@
         @Override
         public void redo() throws CannotRedoException {
           super.redo();
-          doAddRooms(newRooms, roomsIndex, newBasePlanLocked);       
+          doAddRooms(newRooms, roomsIndex, roomsLevel,  newBasePlanLocked);       
           selectAndShowItems(Arrays.asList(newRooms));
         }      
   
@@ -3133,13 +3481,14 @@
 
   /**
    * Adds the <code>rooms</code> to plan component.
-   * @param oldBasePlanLocked 
    */
   private void doAddRooms(Room [] rooms,
                           int [] roomsIndex, 
+                          Level roomsLevel, 
                           boolean basePlanLocked) {
     for (int i = 0; i < roomsIndex.length; i++) {
       this.home.addRoom (rooms [i], roomsIndex [i]);
+      rooms [i].setLevel(roomsLevel);
     }
     this.home.setBasePlanLocked(basePlanLocked);
   }
@@ -3187,6 +3536,7 @@
           new DimensionLine [newDimensionLines.size()]);
       final Selectable [] oldSelectedItems = 
           oldSelection.toArray(new Selectable [oldSelection.size()]);
+      final Level dimensionLinesLevel = this.home.getSelectedLevel();
       UndoableEdit undoableEdit = new AbstractUndoableEdit() {      
         @Override
         public void undo() throws CannotUndoException {
@@ -3198,7 +3548,7 @@
         @Override
         public void redo() throws CannotRedoException {
           super.redo();
-          doAddDimensionLines(dimensionLines, newBasePlanLocked);       
+          doAddDimensionLines(dimensionLines, dimensionLinesLevel, newBasePlanLocked);       
           selectAndShowItems(Arrays.asList(dimensionLines));
         }      
   
@@ -3216,9 +3566,10 @@
    * Adds the dimension lines in <code>dimensionLines</code> to plan component.
    */
   private void doAddDimensionLines(DimensionLine [] dimensionLines, 
-                                   boolean basePlanLocked) {
+                                   Level dimensionLinesLevel, boolean basePlanLocked) {
     for (DimensionLine dimensionLine : dimensionLines) {
       this.home.addDimensionLine(dimensionLine);
+      dimensionLine.setLevel(dimensionLinesLevel);
     }
     this.home.setBasePlanLocked(basePlanLocked);
   }
@@ -3264,6 +3615,7 @@
       final Label [] labels = newLabels.toArray(new Label [newLabels.size()]);
       final Selectable [] oldSelectedItems = 
           oldSelection.toArray(new Selectable [oldSelection.size()]);
+      final Level labelsLevel = this.home.getSelectedLevel();
       UndoableEdit undoableEdit = new AbstractUndoableEdit() {      
         @Override
         public void undo() throws CannotUndoException {
@@ -3275,7 +3627,7 @@
         @Override
         public void redo() throws CannotRedoException {
           super.redo();
-          doAddLabels(labels, newBasePlanLocked);       
+          doAddLabels(labels, labelsLevel, newBasePlanLocked);       
           selectAndShowItems(Arrays.asList(labels));
         }      
   
@@ -3292,9 +3644,10 @@
   /**
    * Adds the labels in <code>labels</code> to plan component.
    */
-  private void doAddLabels(Label [] labels, boolean basePlanLocked) {
+  private void doAddLabels(Label [] labels, Level labelsLevel, boolean basePlanLocked) {
     for (Label label : labels) {
       this.home.addLabel(label);
+      label.setLevel(labelsLevel);
     }
     this.home.setBasePlanLocked(basePlanLocked);
   }
@@ -4049,8 +4402,11 @@
     if (this.wallsAreaCache == null) {
       // Compute walls area
       Area wallsArea = new Area();
+      Level selectedLevel = this.home.getSelectedLevel();
       for (Wall wall : home.getWalls()) {
-        wallsArea.add(new Area(getPath(wall.getPoints())));
+        if (wall.isAtLevel(selectedLevel)) {
+          wallsArea.add(new Area(getPath(wall.getPoints())));
+        }
       }
       this.wallsAreaCache = wallsArea;
     }
@@ -4091,6 +4447,28 @@
   }
 
   /**
+   * Selects the level of the first elevatable item in the current selection 
+   * if no selected item is visible at the selected level.
+   */
+  private void selectLevelFromSelectedItems() {
+    Level selectedLevel = this.home.getSelectedLevel();
+    List<Selectable> selectedItems = this.home.getSelectedItems();
+    for (Object item : selectedItems) {
+      if (item instanceof Elevatable
+          && ((Elevatable)item).isAtLevel(selectedLevel)) {
+        return;
+      }
+    }
+    
+    for (Object item : selectedItems) {
+      if (item instanceof Elevatable) {
+        setSelectedLevel(((Elevatable)item).getLevel());
+        break;
+      }
+    }
+  }
+
+  /**
    * Stores the size of a resized piece of furniture.
    */
   private static class ResizedPieceOfFurniture {
@@ -4205,16 +4583,18 @@
    * to add a collection of walls after an undo/redo delete operation.
    */
   private static final class JoinedWall {
-    private final Wall wall;
-    private final Wall wallAtStart;
-    private final Wall wallAtEnd;
+    private final Wall    wall;
+    private final Wall    wallAtStart;
+    private final Wall    wallAtEnd;
+    private final Level   level;
     private final boolean joinedAtStartOfWallAtStart;
-    private final boolean joinedAtEndOfWallAtStart; 
+    private final boolean joinedAtEndOfWallAtStart;
     private final boolean joinedAtStartOfWallAtEnd;
     private final boolean joinedAtEndOfWallAtEnd;
     
     public JoinedWall(Wall wall) {
       this.wall = wall;
+      this.level = wall.getLevel();
       this.wallAtStart = wall.getWallAtStart();
       this.joinedAtEndOfWallAtStart =
           this.wallAtStart != null
@@ -4235,6 +4615,10 @@
       return this.wall;
     }
 
+    public Level getLevel() {
+      return this.level;
+    }
+
     public Wall getWallAtEnd() {
       return this.wallAtEnd;
     }
@@ -4291,6 +4675,7 @@
     private static final int STEP_COUNT = 24; // 15 degrees step 
     private float x;
     private float y;
+    private float angle;
     
     /**
      * Create a point that applies angle magnetism to point (<code>x</code>,
@@ -4374,47 +4759,251 @@
             this.x, this.y), maxLengthDelta);
         this.x = xStart + (float)(magnetizedLength * Math.cos(magnetismAngle));            
         this.y = yStart - (float)(magnetizedLength * Math.sin(magnetismAngle));
+        this.angle = (float)magnetismAngle;
       }       
     }
 
     /**
      * Returns the abscissa of end point computed with magnetism.
      */
-    float getX() {
+    public float getX() {
       return this.x;
     }
+    
+    /**
+     * Sets the abscissa of end point computed with magnetism
+     */
+    protected void setX(float x) {
+      this.x = x;
+    }
 
     /**
      * Returns the ordinate of end point computed with magnetism.
      */
-    float getY() {
+    public float getY() {
       return this.y;
     }
+    
+    /**
+     * Sets the ordinate of end point computed with magnetism.
+     */
+    protected void setY(float y) {
+      this.y = y;
+    }
+    
+    protected float getAngle() {
+      return this.angle;
+    }
   }
  
   /**
+   * A point with coordinates computed with angle and wall points magnetism. 
+   */
+  private class WallPointWithAngleMagnetism extends PointWithAngleMagnetism {
+    public WallPointWithAngleMagnetism(float x, float y) {
+      this(null, x, y, x, y);
+    }
+
+    public WallPointWithAngleMagnetism(Wall editedWall, float xWall, float yWall, float x, float y) {
+      super(xWall, yWall, x, y, preferences.getLengthUnit(), planView.getPixelLength());
+      float margin = PIXEL_MARGIN / getScale();
+      // Search which wall start or end point is close to (x, y)
+      // ignoring the start and end point of alignedWall
+      float deltaXToClosestWall = Float.POSITIVE_INFINITY;
+      float deltaYToClosestWall = Float.POSITIVE_INFINITY;
+      float xClosestWall = 0;
+      float yClosestWall = 0;
+      for (Wall wall : getDetectableWallsAtSelectedLevel()) {
+        if (wall != editedWall) {
+          if (Math.abs(getX() - wall.getXStart()) < margin
+              && (editedWall == null
+                  || !equalsWallPoint(wall.getXStart(), wall.getYStart(), editedWall))) {
+            if (Math.abs(deltaYToClosestWall) > Math.abs(getY() - wall.getYStart())) {
+              xClosestWall = wall.getXStart();
+              deltaYToClosestWall = getY() - yClosestWall;
+            }
+          } else if (Math.abs(getX() - wall.getXEnd()) < margin
+                    && (editedWall == null
+                        || !equalsWallPoint(wall.getXEnd(), wall.getYEnd(), editedWall))) {
+            if (Math.abs(deltaYToClosestWall) > Math.abs(getY() - wall.getYEnd())) {
+              xClosestWall = wall.getXEnd();
+              deltaYToClosestWall = getY() - yClosestWall;
+            }                
+          }
+          
+          if (Math.abs(getY() - wall.getYStart()) < margin
+              && (editedWall == null
+                  || !equalsWallPoint(wall.getXStart(), wall.getYStart(), editedWall))) {
+            if (Math.abs(deltaXToClosestWall) > Math.abs(getX() - wall.getXStart())) {
+              yClosestWall = wall.getYStart();
+              deltaXToClosestWall = getX() - xClosestWall;
+            }
+          } else if (Math.abs(getY() - wall.getYEnd()) < margin
+                    && (editedWall == null
+                        || !equalsWallPoint(wall.getXEnd(), wall.getYEnd(), editedWall))) {
+            if (Math.abs(deltaXToClosestWall) > Math.abs(getX() - wall.getXEnd())) {
+              yClosestWall = wall.getYEnd();
+              deltaXToClosestWall = getX() - xClosestWall;
+            }                
+          }
+        }
+      }
+
+      if (editedWall != null) {
+        double alpha = -Math.tan(getAngle());
+        double beta = Math.abs(alpha) < 1E10 
+            ? yWall - alpha * xWall 
+            : Double.POSITIVE_INFINITY;  
+        if (deltaXToClosestWall != Float.POSITIVE_INFINITY && Math.abs(alpha) > 1E-10) {
+          float newX = (float)((yClosestWall - beta) / alpha);
+          if (Point2D.distanceSq(getX(), getY(), newX, yClosestWall) <= margin * margin) {
+            setX(newX);
+            setY(yClosestWall);
+            return;
+          }
+        }
+        if (deltaYToClosestWall != Float.POSITIVE_INFINITY 
+            && beta != Double.POSITIVE_INFINITY) {
+          float newY = (float)(alpha * xClosestWall + beta);
+          if (Point2D.distanceSq(getX(), getY(), xClosestWall, newY) <= margin * margin) {
+            setX(xClosestWall);
+            setY(newY);
+          }
+        }
+      } else {
+        if (deltaXToClosestWall != Float.POSITIVE_INFINITY) {
+          setY(yClosestWall);
+        }
+        if (deltaYToClosestWall != Float.POSITIVE_INFINITY) {
+          setX(xClosestWall);
+        }
+      }
+    }
+
+    /**
+     * Returns <code>true</code> if <code>wall</code> start or end point 
+     * equals the point (<code>x</code>, <code>y</code>).
+     */
+    private boolean equalsWallPoint(float x, float y, Wall wall) {
+      return x == wall.getXStart() && y == wall.getYStart()
+             || x == wall.getXEnd() && y == wall.getYEnd();
+    }
+  }
+  
+  /**
+   * A point with coordinates computed with angle and room points magnetism. 
+   */
+  private class RoomPointWithAngleMagnetism extends PointWithAngleMagnetism {
+    public RoomPointWithAngleMagnetism(float x, float y) {
+      this(null, -1, x, y, x, y);
+    }
+
+    public RoomPointWithAngleMagnetism(Room editedRoom, int editedPointIndex, float xRoom, float yRoom, float x, float y) {
+      super(xRoom, yRoom, x, y, preferences.getLengthUnit(), planView.getPixelLength());
+      float planScale = getScale();
+      float margin = PIXEL_MARGIN / planScale;
+      // Search which room points are close to (x, y)
+      // ignoring the start and end point of alignedRoom
+      float deltaXToClosestObject = Float.POSITIVE_INFINITY;
+      float deltaYToClosestObject = Float.POSITIVE_INFINITY;
+      float xClosestObject = 0;
+      float yClosestObject = 0;
+      for (Room room : getDetectableRoomsAtSelectedLevel()) {
+        float [][] roomPoints = room.getPoints();
+        for (int i = 0; i < roomPoints.length; i++) {
+          if (editedPointIndex == -1 || (i != editedPointIndex && roomPoints.length > 2)) {
+            if (Math.abs(getX() - roomPoints [i][0]) < margin
+                && Math.abs(deltaYToClosestObject) > Math.abs(getY() - roomPoints [i][1])) {
+              xClosestObject = roomPoints [i][0];
+              deltaYToClosestObject = getY() - roomPoints [i][1];
+            }
+            if (Math.abs(getY() - roomPoints [i][1]) < margin
+                && Math.abs(deltaXToClosestObject) > Math.abs(getX() - roomPoints [i][0])) {
+              yClosestObject = roomPoints [i][1];
+              deltaXToClosestObject = getX() - roomPoints [i][0];
+            }
+          }
+        }
+      }
+      // Search which wall points are close to (x, y)
+      for (Wall wall : getDetectableWallsAtSelectedLevel()) {
+        float [][] wallPoints = wall.getPoints();
+        // Take into account only points at start and end of the wall
+        wallPoints = new float [][] {wallPoints [0], wallPoints [wallPoints.length / 2 - 1], 
+                                     wallPoints [wallPoints.length / 2], wallPoints [wallPoints.length - 1]}; 
+        for (int i = 0; i < wallPoints.length; i++) {
+          if (Math.abs(getX() - wallPoints [i][0]) < margin
+              && Math.abs(deltaYToClosestObject) > Math.abs(getY() - wallPoints [i][1])) {
+            xClosestObject = wallPoints [i][0];
+            deltaYToClosestObject = getY() - wallPoints [i][1];
+          }
+          if (Math.abs(getY() - wallPoints [i][1]) < margin
+              && Math.abs(deltaXToClosestObject) > Math.abs(getX() - wallPoints [i][0])) {
+            yClosestObject = wallPoints [i][1];
+            deltaXToClosestObject = getX() - wallPoints [i][0];
+          }
+        }
+      }
+
+      if (editedRoom != null) {
+        double alpha = -Math.tan(getAngle());
+        double beta = Math.abs(alpha) < 1E10 
+            ? yRoom - alpha * xRoom 
+            : Double.POSITIVE_INFINITY;  
+        if (deltaXToClosestObject != Float.POSITIVE_INFINITY && Math.abs(alpha) > 1E-10) {
+          float newX = (float)((yClosestObject - beta) / alpha);
+          if (Point2D.distanceSq(getX(), getY(), newX, yClosestObject) <= margin * margin) {
+            setX(newX);
+            setY(yClosestObject);
+            return;
+          }
+        }
+        if (deltaYToClosestObject != Float.POSITIVE_INFINITY 
+            && beta != Double.POSITIVE_INFINITY) {
+          float newY = (float)(alpha * xClosestObject + beta);
+          if (Point2D.distanceSq(getX(), getY(), xClosestObject, newY) <= margin * margin) {
+            setX(xClosestObject);
+            setY(newY);
+          }
+        }
+      } else {
+        if (deltaXToClosestObject != Float.POSITIVE_INFINITY) {
+          setY(yClosestObject);
+        }
+        if (deltaYToClosestObject != Float.POSITIVE_INFINITY) {
+          setX(xClosestObject);
+        }
+      }
+    }
+  }
+  
+  /**
    * A point which coordinates are equal to the closest point of a wall or a room.
    */
   private class PointMagnetizedToClosestWallOrRoomPoint {
     private float   x;
     private float   y;
     private boolean magnetized;
-    
+
     /**
-     * Create a point that applies magnetism to point (<code>x</code>, <code>y</code>).
-     * If this point point is close to a point of a wall corner or of a room 
-     * within the given <code>margin</code>, the magnetized point will be the closest one.
+     * Creates a point that applies magnetism to point (<code>x</code>, <code>y</code>).
+     * If this point is close to a point of a wall corner or of a room, it will be initialiazed to its coordinates.
      */
-    public PointMagnetizedToClosestWallOrRoomPoint(Collection<Room> rooms, float x, float y, float margin) {
+    public PointMagnetizedToClosestWallOrRoomPoint(float x, float y) {
+      this(null, -1, x, y);
+    }
+
+    public PointMagnetizedToClosestWallOrRoomPoint(Room editedRoom, int editedPointIndex, float x, float y) {
+      float margin = PIXEL_MARGIN / getScale();
       // Find the closest wall point to (x,y)
       double smallestDistance = Double.MAX_VALUE;
       for (GeneralPath roomPath : getRoomPathsFromWalls()) {
-        smallestDistance = updateMagnetizedPoint(x, y,
+        smallestDistance = updateMagnetizedPoint(-1, x, y,
             smallestDistance, getPathPoints(roomPath, false));
       }      
-      for (Room room : rooms) {
-        smallestDistance = updateMagnetizedPoint(x, y,
-            smallestDistance, room.getPoints());
+      for (Room room : getDetectableRoomsAtSelectedLevel()) {
+        smallestDistance = updateMagnetizedPoint(room == editedRoom ? editedPointIndex : - 1, 
+            x, y, smallestDistance, room.getPoints());
       }      
       this.magnetized = smallestDistance <= margin * margin;
       if (!this.magnetized) {
@@ -4424,15 +5013,18 @@
       }
     }
 
-    private double updateMagnetizedPoint(float x, float y,
+    private double updateMagnetizedPoint(int editedPointIndex,
+                                         float x, float y,
                                          double smallestDistance,
-                                         float [][] roomPoints) {
-      for (int i = 0; i < roomPoints.length; i++) {
-        double distance = Point2D.distanceSq(roomPoints [i][0], roomPoints [i][1], x, y);
-        if (distance < smallestDistance) {
-          this.x = roomPoints [i][0];
-          this.y = roomPoints [i][1];
-          smallestDistance = distance;
+                                         float [][] points) {
+      for (int i = 0; i < points.length; i++) {
+        if (i != editedPointIndex) {
+          double distance = Point2D.distanceSq(points [i][0], points [i][1], x, y);
+          if (distance < smallestDistance) {
+            this.x = points [i][0];
+            this.y = points [i][1];
+            smallestDistance = distance;
+          }
         }
       }
       return smallestDistance;
@@ -5250,6 +5842,8 @@
    * and initial wall creation.
    */
   private class WallCreationState extends AbstractModeChangeState {
+    private boolean magnetismEnabled;
+    
     @Override
     public Mode getMode() {
       return Mode.WALL_CREATION;
@@ -5258,10 +5852,16 @@
     @Override
     public void enter() {
       getView().setCursor(PlanView.CursorType.DRAW);
+      toggleMagnetism(wasShiftDownLastMousePress());
     }
     
     @Override
     public void moveMouse(float x, float y) {
+      if (this.magnetismEnabled) {
+        WallPointWithAngleMagnetism point = new WallPointWithAngleMagnetism(x, y);
+        x = point.getX();
+        y = point.getY();
+      }
       getView().setAlignmentFeedback(Wall.class, null, x, y, false);
     }
 
@@ -5281,6 +5881,14 @@
     }
     
     @Override
+    public void toggleMagnetism(boolean magnetismToggled) {
+      // Compute active magnetism
+      this.magnetismEnabled = preferences.isMagnetismEnabled()
+                              ^ magnetismToggled;
+      moveMouse(getXLastMouseMove(), getYLastMouseMove());
+    }
+    
+    @Override
     public void exit() {
       getView().deleteFeedback();
     }  
@@ -5451,8 +6059,9 @@
       super.enter();
       this.oldSelection = home.getSelectedItems();
       this.oldBasePlanLocked = home.isBasePlanLocked();
-      this.xStart = getXLastMousePress();
-      this.yStart = getYLastMousePress();
+      toggleMagnetism(wasShiftDownLastMousePress());
+      this.xStart = getXLastMouseMove();
+      this.yStart = getYLastMouseMove();
       // If the start or end line of a wall close to (xStart, yStart) is
       // free, it will the wall at start of the new wall
       this.wallEndAtStart = getWallEndAt(this.xStart, this.yStart, null);
@@ -5466,6 +6075,10 @@
         if (this.wallStartAtStart != null) {
           this.xStart = this.wallStartAtStart.getXStart();
           this.yStart = this.wallStartAtStart.getYStart();        
+        } else if (this.magnetismEnabled) {          
+          WallPointWithAngleMagnetism point = new WallPointWithAngleMagnetism(this.xStart, this.yStart);
+          this.xStart = point.getX();
+          this.yStart = point.getY();        
         }
       }
       this.newWall = null;
@@ -5475,7 +6088,6 @@
       this.newWalls = new ArrayList<Wall>();
       this.lastWallCreationTime = -1;
       deselectAll();
-      toggleMagnetism(wasShiftDownLastMousePress());
       setDuplicationActivated(wasDuplicationActivatedLastMousePress());
       PlanView planView = getView();
       planView.setAlignmentFeedback(Wall.class, null, this.xStart, this.yStart, false);
@@ -5488,8 +6100,7 @@
       float xEnd;
       float yEnd;
       if (this.magnetismEnabled) {
-        PointWithAngleMagnetism point = new PointWithAngleMagnetism(
-            this.xStart, this.yStart, x, y, preferences.getLengthUnit(), planView.getPixelLength());
+        WallPointWithAngleMagnetism point = new WallPointWithAngleMagnetism(this.newWall, this.xStart, this.yStart, x, y);
         xEnd = point.getX();
         yEnd = point.getY();
       } else {
@@ -5806,15 +6417,16 @@
     public void updateEditableProperty(EditableProperty editableProperty, Object value) {
       PlanView planView = getView();
       if (this.newWall == null) {
+        float maximumLength = preferences.getLengthUnit().getMaximumLength();
         // Update start point of the first wall
         switch (editableProperty) {
           case X : 
             this.xStart = value != null ? ((Number)value).floatValue() : 0;
-            this.xStart = Math.max(-100000f, Math.min(this.xStart, 100000f));
+            this.xStart = Math.max(-maximumLength, Math.min(this.xStart, maximumLength));
             break;      
           case Y : 
             this.yStart = value != null ? ((Number)value).floatValue() : 0;
-            this.yStart = Math.max(-100000f, Math.min(this.yStart, 100000f));
+            this.yStart = Math.max(-maximumLength, Math.min(this.yStart, maximumLength));
             break;      
         }
         planView.setAlignmentFeedback(Wall.class, null, this.xStart, this.yStart, true);
@@ -5834,7 +6446,7 @@
           switch (editableProperty) {
             case LENGTH : 
               float length = value != null ? ((Number)value).floatValue() : 0;
-              length = Math.max(0.001f, Math.min(length, 100000f));
+              length = Math.max(0.001f, Math.min(length, preferences.getLengthUnit().getMaximumLength()));
               double wallAngle = Math.PI - Math.atan2(this.yStart - this.yLastEnd, this.xStart - this.xLastEnd);
               this.xLastEnd = (float)(this.xStart + length * Math.cos(wallAngle));
               this.yLastEnd = (float)(this.yStart - length * Math.sin(wallAngle));
@@ -5973,14 +6585,13 @@
       float newX = x - this.deltaXToResizePoint;
       float newY = y - this.deltaYToResizePoint;
       if (this.magnetismEnabled) {
-        PointWithAngleMagnetism point = new PointWithAngleMagnetism(
+        WallPointWithAngleMagnetism point = new WallPointWithAngleMagnetism(this.selectedWall,
             this.startPoint 
                 ? this.selectedWall.getXEnd()
                 : this.selectedWall.getXStart(), 
             this.startPoint 
                 ? this.selectedWall.getYEnd()
-                : this.selectedWall.getYStart(), newX, newY, 
-            preferences.getLengthUnit(), planView.getPixelLength());
+                : this.selectedWall.getYStart(), newX, newY);
         newX = point.getX();
         newY = point.getY();
       } 
@@ -6162,12 +6773,12 @@
     
     @Override
     public void moveMouse(float x, float y) {
-      // Compute the new height of the piece 
+      // Compute the new elevation of the piece 
       PlanView planView = getView();
       float [] topRightPoint = this.selectedPiece.getPoints() [1];
       float deltaY = y - this.deltaYToElevationPoint - topRightPoint[1];
       float newElevation = this.oldElevation - deltaY;
-      newElevation = Math.max(newElevation, 0f);
+      newElevation = Math.min(Math.max(newElevation, 0f), preferences.getLengthUnit().getMaximumElevation());
       if (this.magnetismEnabled) {
         newElevation = preferences.getLengthUnit().getMagnetizedLength(newElevation, planView.getPixelLength());
       }
@@ -6265,7 +6876,8 @@
       if (this.magnetismEnabled) {
         newHeight = preferences.getLengthUnit().getMagnetizedLength(newHeight, planView.getPixelLength());
       }
-      newHeight = Math.max(newHeight, preferences.getLengthUnit().getMinimumLength());
+      newHeight = Math.min(Math.max(newHeight, preferences.getLengthUnit().getMinimumLength()), 
+          preferences.getLengthUnit().getMaximumLength());
 
       // Update piece new dimension
       selectedPiece.setHeight(newHeight);
@@ -6385,7 +6997,8 @@
       if (this.magnetismEnabled) {
         newWidth = preferences.getLengthUnit().getMagnetizedLength(newWidth, planView.getPixelLength());
       }
-      newWidth = Math.max(newWidth, preferences.getLengthUnit().getMinimumLength());
+      newWidth = Math.min(Math.max(newWidth, preferences.getLengthUnit().getMinimumLength()), 
+          preferences.getLengthUnit().getMaximumLength());
       
       float newDepth;
       if (!this.resizedPiece.isDoorOrWindowBoundToWall()
@@ -6397,7 +7010,8 @@
         if (this.magnetismEnabled) {
           newDepth = preferences.getLengthUnit().getMagnetizedLength(newDepth, planView.getPixelLength());
         }
-        newDepth = Math.max(newDepth, preferences.getLengthUnit().getMinimumLength());
+        newDepth = Math.min(Math.max(newDepth, preferences.getLengthUnit().getMinimumLength()), 
+            preferences.getLengthUnit().getMaximumLength());
       } else {
         newDepth = this.resizedPiece.getDepth();
       }
@@ -6811,15 +7425,15 @@
     
     @Override
     public void moveMouse(float x, float y) {      
-      // Compute the new angle of the camera
+      // Compute the new elevation of the camera
       float newElevation = (float)(this.oldElevation - (y - getYLastMousePress()));
-      // Check new angle is between -60� and 90�  
-      newElevation = Math.max(newElevation, 10 * 14 / 15);
-      newElevation = Math.min(newElevation, 2500);
+      List<Level> levels = home.getLevels();
+      float minimumElevation = levels.size() == 0  ? 10  : 10 + levels.get(0).getElevation();
+      // Check new elevation is between min and max  
+      newElevation = Math.min(Math.max(newElevation, minimumElevation), preferences.getLengthUnit().getMaximumElevation());
       
       // Update camera elevation
       this.selectedCamera.setZ(newElevation);
-      
       getView().setToolTipFeedback(getToolTipFeedbackText(newElevation), x, y);
     }
 
@@ -6845,7 +7459,7 @@
     private String getToolTipFeedbackText(float elevation) {
       String toolTipFeedbackText = "<html>" + String.format(this.cameraElevationToolTipFeedback,  
           preferences.getLengthUnit().getFormatWithUnit().format(elevation));
-      if (elevation >= 70 && elevation <= 218.75f) {
+      if (!this.selectedCamera.isFixedSize() && elevation >= 70 && elevation <= 218.75f) {
         toolTipFeedbackText += "<br>" + String.format(this.observerHeightToolTipFeedback,
             preferences.getLengthUnit().getFormatWithUnit().format(elevation * 15 / 14));
       }
@@ -6958,8 +7572,8 @@
     public void enter() {
       this.oldSelection = home.getSelectedItems();
       this.oldBasePlanLocked = home.isBasePlanLocked();
-      this.xStart = getXLastMousePress();
-      this.yStart = getYLastMousePress();
+      this.xStart = getXLastMouseMove();
+      this.yStart = getYLastMouseMove();
       this.editingStartPoint = false;
       this.offsetChoice = false;
       this.newDimensionLine = null;
@@ -7139,16 +7753,17 @@
     @Override
     public void updateEditableProperty(EditableProperty editableProperty, Object value) {
       PlanView planView = getView();
+      float maximumLength = preferences.getLengthUnit().getMaximumLength();
       if (this.newDimensionLine == null) {
         // Update start point of the dimension line
         switch (editableProperty) {
           case X : 
             this.xStart = value != null ? ((Number)value).floatValue() : 0;
-            this.xStart = Math.max(-100000f, Math.min(this.xStart, 100000f));
+            this.xStart = Math.max(-maximumLength, Math.min(this.xStart, maximumLength));
             break;      
           case Y : 
             this.yStart = value != null ? ((Number)value).floatValue() : 0;
-            this.yStart = Math.max(-100000f, Math.min(this.yStart, 100000f));
+            this.yStart = Math.max(-maximumLength, Math.min(this.yStart, maximumLength));
             break;      
         }
         planView.setAlignmentFeedback(DimensionLine.class, null, this.xStart, this.yStart, true);
@@ -7157,7 +7772,7 @@
         if (editableProperty == EditableProperty.OFFSET) {
           // Update new dimension line offset 
           float offset = value != null ? ((Number)value).floatValue() : 0;
-          offset = Math.max(-100000f, Math.min(offset, 100000f));
+          offset = Math.max(-maximumLength, Math.min(offset, maximumLength));
           this.newDimensionLine.setOffset(offset);
         }
       } else {
@@ -7167,7 +7782,7 @@
         switch (editableProperty) {
           case LENGTH : 
             float length = value != null ? ((Number)value).floatValue() : 0;
-            length = Math.max(0.001f, Math.min(length, 100000f));
+            length = Math.max(0.001f, Math.min(length, maximumLength));
             double dimensionLineAngle = getDimensionLineAngle();
             newX = (float)(this.xStart + length * Math.cos(dimensionLineAngle));
             newY = (float)(this.yStart - length * Math.sin(dimensionLineAngle));
@@ -7552,17 +8167,22 @@
     public void enter() {
       getView().setCursor(PlanView.CursorType.DRAW);
       toggleMagnetism(wasShiftDownLastMousePress());
-      moveMouse(getXLastMouseMove(), getYLastMouseMove());
     }
 
     @Override
     public void moveMouse(float x, float y) {
       if (this.magnetismEnabled) {
         // Find the closest wall or room point to current mouse location
-        PointMagnetizedToClosestWallOrRoomPoint point = new PointMagnetizedToClosestWallOrRoomPoint(
-            home.getRooms(), x, y, PIXEL_WALL_MARGIN / getScale());
-        getView().setAlignmentFeedback(Room.class, null, point.getX(), 
-            point.getY(), point.isMagnetized());
+        PointMagnetizedToClosestWallOrRoomPoint point = new PointMagnetizedToClosestWallOrRoomPoint(x, y);
+        if (point.isMagnetized()) {
+          getView().setAlignmentFeedback(Room.class, null, point.getX(), 
+              point.getY(), point.isMagnetized());
+        } else { 
+          RoomPointWithAngleMagnetism pointWithAngleMagnetism = new RoomPointWithAngleMagnetism(
+              getXLastMouseMove(), getYLastMouseMove());
+          getView().setAlignmentFeedback(Room.class, null, pointWithAngleMagnetism.getX(), 
+              pointWithAngleMagnetism.getY(), point.isMagnetized());
+        }
       } else {
         getView().setAlignmentFeedback(Room.class, null, x, y, false);
       } 
@@ -7689,7 +8309,6 @@
    * Room drawing state. This state manages room creation at mouse press. 
    */
   private class RoomDrawingState extends AbstractRoomState {
-    private Collection<Room>       rooms;
     private float                  xPreviousPoint;
     private float                  yPreviousPoint;
     private Room                   newRoom;
@@ -7731,19 +8350,23 @@
       super.enter();
       this.oldSelection = home.getSelectedItems();
       this.oldBasePlanLocked = home.isBasePlanLocked();
-      this.rooms = home.getRooms();
       this.newRoom = null;
       toggleMagnetism(wasShiftDownLastMousePress());
       if (this.magnetismEnabled) {
         // Find the closest wall or room point to current mouse location
         PointMagnetizedToClosestWallOrRoomPoint point = new PointMagnetizedToClosestWallOrRoomPoint(
-            this.rooms, getXLastMouseMove(), getYLastMouseMove(), 
-            PIXEL_WALL_MARGIN / getScale());
-        this.xPreviousPoint = point.getX();
-        this.yPreviousPoint = point.getY();
+            getXLastMouseMove(), getYLastMouseMove());
+        if (point.isMagnetized()) {
+          this.xPreviousPoint = point.getX();
+          this.yPreviousPoint = point.getY();
+        } else {
+          RoomPointWithAngleMagnetism pointWithAngleMagnetism = new RoomPointWithAngleMagnetism(
+              getXLastMouseMove(), getYLastMouseMove());
+          this.xPreviousPoint = pointWithAngleMagnetism.getX();
+          this.yPreviousPoint = pointWithAngleMagnetism.getY();
+        }
         getView().setAlignmentFeedback(Room.class, null, 
-            point.getX(), point.getY(), point.isMagnetized());
-        
+            this.xPreviousPoint, this.yPreviousPoint, point.isMagnetized());
       } else {
         this.xPreviousPoint = getXLastMousePress();
         this.yPreviousPoint = getYLastMousePress();
@@ -7762,16 +8385,20 @@
       boolean magnetizedPoint = false;
       if (this.magnetismEnabled) {
         // Find the closest wall or room point to current mouse location
-        PointMagnetizedToClosestWallOrRoomPoint point = new PointMagnetizedToClosestWallOrRoomPoint(
-            this.rooms, x, y, PIXEL_WALL_MARGIN / getScale());
+        PointMagnetizedToClosestWallOrRoomPoint point = this.newRoom != null
+            ? new PointMagnetizedToClosestWallOrRoomPoint(this.newRoom, this.newRoom.getPointCount() - 1, x, y)
+            : new PointMagnetizedToClosestWallOrRoomPoint(x, y);
         magnetizedPoint = point.isMagnetized();
         if (magnetizedPoint) {
           xEnd = point.getX();
           yEnd = point.getY();
         } else {
           // Use magnetism if closest wall point is too far
-          PointWithAngleMagnetism pointWithAngleMagnetism = new PointWithAngleMagnetism(
-              this.xPreviousPoint, this.yPreviousPoint, x, y, preferences.getLengthUnit(), planView.getPixelLength());
+          int editedPointIndex = this.newRoom != null 
+              ? this.newRoom.getPointCount() - 1 
+              : -1;
+          RoomPointWithAngleMagnetism pointWithAngleMagnetism = new RoomPointWithAngleMagnetism(
+              this.newRoom, editedPointIndex, this.xPreviousPoint, this.yPreviousPoint, x, y);
           xEnd = pointWithAngleMagnetism.getX();
           yEnd = pointWithAngleMagnetism.getY();
         }
@@ -7956,7 +8583,7 @@
     private List<HomePieceOfFurniture> getVisibleDoorsAndWindowsAtGround(List<HomePieceOfFurniture> furniture) {
       List<HomePieceOfFurniture> doorsAndWindows = new ArrayList<HomePieceOfFurniture>(furniture.size());
       for (HomePieceOfFurniture piece : furniture) {
-        if (piece.isVisible()
+        if (isPieceOfFurnitureVisibleAtSelectedLevel(piece)
             && piece.getElevation() == 0) {
           if (piece instanceof HomeFurnitureGroup) {
             doorsAndWindows.addAll(getVisibleDoorsAndWindowsAtGround(((HomeFurnitureGroup)piece).getFurniture()));
@@ -7974,7 +8601,7 @@
       if (editionActivated) {
         planView.deleteFeedback();
         if (this.newRoom == null) {
-          // Edit xStart and yStart
+          // Edit previous point
           planView.setToolTipEditedProperties(new EditableProperty [] {EditableProperty.X,
                                                                        EditableProperty.Y},
               new Object [] {this.xPreviousPoint, this.yPreviousPoint},
@@ -8047,15 +8674,16 @@
     public void updateEditableProperty(EditableProperty editableProperty, Object value) {
       PlanView planView = getView();
       if (this.newRoom == null) {
+        float maximumLength = preferences.getLengthUnit().getMaximumLength();
         // Update start point of the first wall
         switch (editableProperty) {
           case X : 
             this.xPreviousPoint = value != null ? ((Number)value).floatValue() : 0;
-            this.xPreviousPoint = Math.max(-100000f, Math.min(this.xPreviousPoint, 100000f));
+            this.xPreviousPoint = Math.max(-maximumLength, Math.min(this.xPreviousPoint, maximumLength));
             break;      
           case Y : 
             this.yPreviousPoint = value != null ? ((Number)value).floatValue() : 0;
-            this.yPreviousPoint = Math.max(-100000f, Math.min(this.yPreviousPoint, 100000f));
+            this.yPreviousPoint = Math.max(-maximumLength, Math.min(this.yPreviousPoint, maximumLength));
             break;      
         }
         planView.setAlignmentFeedback(Room.class, null, this.xPreviousPoint, this.yPreviousPoint, true);
@@ -8070,7 +8698,7 @@
         switch (editableProperty) {
           case LENGTH : 
             float length = value != null ? ((Number)value).floatValue() : 0;
-            length = Math.max(0.001f, Math.min(length, 100000f));
+            length = Math.max(0.001f, Math.min(length, preferences.getLengthUnit().getMaximumLength()));
             double wallAngle = Math.PI - Math.atan2(previousPoint [1] - point [1], 
                 previousPoint [0] - point [0]);
             newX = (float)(previousPoint [0] + length * Math.cos(wallAngle));
@@ -8135,7 +8763,6 @@
    * Room resize state. This state manages room resizing. 
    */
   private class RoomResizeState extends AbstractRoomState {
-    private Collection<Room> rooms;
     private Room             selectedRoom;
     private int              roomPointIndex;
     private float            oldX;
@@ -8158,9 +8785,7 @@
     public void enter() {
       super.enter();
       this.selectedRoom = (Room)home.getSelectedItems().get(0);
-      this.rooms = new ArrayList<Room>(home.getRooms());
-      this.rooms.remove(this.selectedRoom);
-      float margin = PIXEL_MARGIN / getScale();
+      float margin = INDICATOR_PIXEL_MARGIN / getScale();
       this.roomPointIndex = this.selectedRoom.getPointIndexAt( 
           getXLastMousePress(), getYLastMousePress(), margin);
       float [][] roomPoints = this.selectedRoom.getPoints();
@@ -8185,7 +8810,7 @@
       if (this.magnetismEnabled) {
         // Find the closest wall or room point to current mouse location
         PointMagnetizedToClosestWallOrRoomPoint point = new PointMagnetizedToClosestWallOrRoomPoint(
-            this.rooms, newX, newY, PIXEL_WALL_MARGIN / getScale());
+            this.selectedRoom, this.roomPointIndex, newX, newY);
         magnetizedPoint = point.isMagnetized();
         if (magnetizedPoint) {
           newX = point.getX();
@@ -8198,8 +8823,8 @@
               : this.roomPointIndex - 1;
           float xPreviousPoint = roomPoints [previousPointIndex][0];
           float yPreviousPoint = roomPoints [previousPointIndex][1];
-          PointWithAngleMagnetism pointWithAngleMagnetism = new PointWithAngleMagnetism(
-              xPreviousPoint, yPreviousPoint, newX, newY, preferences.getLengthUnit(), planView.getPixelLength());
+          RoomPointWithAngleMagnetism pointWithAngleMagnetism = new RoomPointWithAngleMagnetism(
+              this.selectedRoom, this.roomPointIndex, xPreviousPoint, yPreviousPoint, newX, newY);
           newX = pointWithAngleMagnetism.getX();
           newY = pointWithAngleMagnetism.getY();
         }
@@ -8510,7 +9135,8 @@
       float newDiameter = (float)Point2D.distance(this.selectedCompass.getX(), this.selectedCompass.getY(), 
           x - this.deltaXToResizePoint, y - this.deltaYToResizePoint) * 2;
       newDiameter = preferences.getLengthUnit().getMagnetizedLength(newDiameter, planView.getPixelLength());
-      newDiameter = Math.max(newDiameter, preferences.getLengthUnit().getMinimumLength());
+      newDiameter = Math.min(Math.max(newDiameter, preferences.getLengthUnit().getMinimumLength()), 
+          preferences.getLengthUnit().getMaximumLength() / 10);
       // Update piece size
       this.selectedCompass.setDiameter(newDiameter);
       // Ensure point at (x,y) is visible
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/PlanView.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/PlanView.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/PlanView.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/PlanView.java	2011-12-21 00:48:52.000000000 +0000
@@ -174,4 +174,9 @@
    * Returns the component used as a vertical ruler for this plan.
    */
   public abstract View getVerticalRuler();
+
+  /**
+   * Returns <code>true</code> if this plan accepts to import dragged items at the given coordinates.
+   */
+  public abstract boolean canImportDraggedItems(List<Selectable> items, int x, int y);
 }
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/addingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/addingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/addingFurniture.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/addingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -88,7 +88,7 @@
 <td>
 <p>Обектите, категоризирани като врата или прозорец,
 карат Sweet Home 3D автоматично да направи подходящия отвор в стената,
-където са поставени. Такива изчисления не се правят за другите типове
+където са поставени. Подобно на тях, поставянето на стълбище, създава необходимия отвор в пода на горния етаж. Такива изчисления не се правят за другите типове
 обекти. </p>
 </td>
 </tr>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/addingLevels.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/addingLevels.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/addingLevels.html	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/addingLevels.html	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,162 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="bg"><head>
+<!-- saved from url=(0022)http://internet.e-mail -->
+<meta http-equiv="content-type" content="text/html;charset=UTF-8">
+<meta name="keywords" content="story, stories"><title>Добавяне на етажи</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet Home 3D Помощ - Начало</a> &gt;
+<a class="bread" href="tocCreating.html">Създаване
+на
+планове, стени, мебелировка</a></div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><font id="topic">Добавяне на етажи</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>Всеки дом се създава на едно основно ниво, но Sweet Home
+3D може да работи също и с няколко нива, с възможност за задаване на
+положително или отрицателно повдигане на нивата спрямо основното ниво.
+За да добавите ново ниво, изберете <i>План
+&gt; Добави етаж</i> от менюто. Веднага,
+след като добавите второ ниво на един дом, в горната част на полето с
+плана, ще се появят няколко таба, позволяващи Ви да изберете етажа, в
+който ще добавяте нови обекти. В края на редицата има таб със знак <font size="+1"><b>+</b></font> , с който можете
+да добавите нов етаж, ако е необходимо.
+</p>
+<table align="center" border="0" cellpadding="0" cellspacing="5">
+<tbody>
+<tr align="center">
+<td><img src="../images/addingLevel.png" alt="Adding furniture" height="234" width="416"></td>
+</tr>
+<tr>
+<td align="center" valign="top">Новият
+етаж с бледо очертаните стени и тавани на долния етаж </td>
+</tr>
+</tbody>
+</table>
+<p>За да може по-лесно да се ориентирате кое къде е, когато
+сте на по-горен етаж, в полето с плана ще виждате стените и таваните на
+по-долния етаж, очертани с бледи линии. Ако сте избрали по-долен етаж,
+стените и подовете на по-горния етаж ще бъдат очертани с бледи линии.
+Когато магнетизмът е активен, показалецът на мишката ще се привлича от
+тези стени и стаи, за да Ви улесни в ползването на инструментите за
+чертане на стени и стаи. Също така, ако е подходящо, Вие можете просто
+да копирате някои стени, стаи или мебелировка от един етаж и да ги
+поставите в друг (Copy-Paste).</p>
+<p>Всеки етаж има повдигане и други атрибути, които могат
+да бъдат <a href="editingLevels.html">променяни</a>.
+Ако стени или мебели, поставени на долен етаж, са по-високи от
+височината на етажа, горната им част ще се появи пълноцветно в избрания
+етаж, както овалните стени, спиралното стълбище и прозореца в дясно на
+следващата фигура.</p>
+<table align="center" border="0" cellpadding="0" cellspacing="5">
+<tbody>
+<tr align="center">
+<td><img src="../images/level1WithHighWalls.png" alt="Adding furniture" height="234" width="416"></td>
+</tr>
+<tr>
+<td align="center" valign="top">Новият
+етаж с показващите се пълноцветно високи стени и мебелировка,<br>
+поставени на долния етаж</td>
+</tr>
+</tbody>
+</table>
+<p>Добавянето на нов етаж няма пряк ефект в 3D
+изгледа и не се добавя автоматично под, отделящ го от долния етаж. Чак
+когато започнете да добавяте стени, стаи и някаква мебелировка, тогава
+ще видите тези обекти да се появяват на нивото на новия етаж.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Височината на новия етаж и дебелината на пода му
+могат да бъдат задавани в менюто <a href="editingPreferences.html">Предпочитания</a>.
+Повдигането на новия етаж се изчислява чрез събиране повдигането на
+предния етаж, височината му и дебелината на пода, зададена в
+предпочитаните настройки.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>След като създадете етажа, можете да <a href="editingLevels.html">промените</a> името
+му, повдигането и височината му като цъкнете двойно върху неговия таб,
+или като изберете в менюто <i>План
+&gt; Промени етажа</i>.</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td> Табовете в горната част на плана показват
+етажите по реда на повдигането им, после тези на едно и също повдигане,
+в обратен на височината им ред.</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td> Избирането на обект в списъка с мебелировка
+автоматично избира и етажа, на който този обект е поставен, ако този
+обект не е видим на избрания в момента етаж.</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Всеки етаж на жилището може да има свое собствено
+изображение за фон&nbsp;<a href="importingBackground.html">изображение
+за фон</a>, върху което да бъдат начертани стените и стаите му.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Стените и таваните на другия етаж, изчертани с
+блед цвят не се отпечатват и копират в клипборда. Те са само за Ваш
+ориентир за по-лесно чертане на текущия етаж.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+</body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/creatingHome.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/creatingHome.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/creatingHome.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/creatingHome.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,104 +1,106 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Създаване на план</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet
-Home 3D Помощ - Начало</a>
-&gt; <a class="bread" href="tocCreating.html">Създаване
-на планове, стени, мебелировка</a></div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr height="32" valign="bottom">
-<td height="32" width="3">&nbsp;</td>
-<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td height="32" width="8">&nbsp;&nbsp;</td>
-<td height="32" valign="bottom"><font id="topic">Създаване на план</font></td>
-</tr>
-<tr height="10">
-<td colspan="4" height="10">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>За да създадете план, използвайте плана по подразбиране,
-създаван при стартирането на Sweet Home 3D или от менюто <i>Файл
-&gt;&nbsp;Нов</i>.<br>
-След като планът е вече създаден, Вие можете да <a href="drawingWalls.html">начертаете
-стени</a>, <a href="addingFurniture.html">добавите
-врати, прозорци и
-мебелировка</a>
-в него, да <a href="drawingRooms.html">дефинирате
-стаите му</a>, да зададете <a href="editingCompass.html">географските
-координати</a>, да
-<a href="drawingDimensions.html">начертаете
-някои оразмерявания</a> и да <a href="addingTexts.html">добавите
-текстове</a>. Тъй като 3D изгледът постоянно се
-синхронизира с промените, които правите в плана, винаги можете да се <a href="editing3DView.html">"разходите"
-в жилището</a>
-от плана за да го видите от различни гледни точки.</p>
-<p>Можете да редактирате едновременно произволен брой
-планове, като единственото ограничение би могло да е недостатъчното
-количество памет.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Дебелината и височината на създаваните стени се
-задава в менюто <a href="editingPreferences.html">Предпочитания</a>
-<i>Дебелина на новите стени</i> и <i>Височина
-на новите стени</i>.
-След като сте създали която и да е стена, можете да цъкнете двойно
-върху нея и да промените дебелината и височината и от менюто <a href="editingWalls.html">Промяна
-характеристиките на стена</a>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Площта на новия план по подразбиране е 10 на 10
-метра. Ако някоя стена или друг обект излиза извън тези размери, площта
-автоматично ще се уголеми.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Когато в 3D изгледа е избран <a href="editing3DView.html">Изглед
-отгоре</a>, 3D изображението ще е центрирано в центъра на
-жилището. </p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Създаване на план</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet
+Home 3D Помощ - Начало</a>
+&gt; <a class="bread" href="tocCreating.html">Създаване
+на планове, стени, мебелировка</a></div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><font id="topic">Създаване на план</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>За да създадете план, използвайте плана по подразбиране,
+създаван при стартирането на Sweet Home 3D или от менюто <i>Файл
+&gt;&nbsp;Нов</i>.<br>
+След като планът е вече създаден, Вие можете да <a 
+href="drawingWalls.html">начертаете
+стени</a>, <a href="addingFurniture.html">добавите
+врати, прозорци и мебелировка</a>
+в него, да <a href="drawingRooms.html">дефинирате
+стаите му</a>, да добавите <a href="addingLevels.html">допълнителни 
+етаж</a>,
+да зададете <a href="editingCompass.html">географските
+координати</a>, да
+<a href="drawingDimensions.html">начертаете
+някои оразмерявания</a> и да <a href="addingTexts.html">добавите
+текстове</a>. Тъй като 3D изгледът постоянно се
+синхронизира с промените, които правите в плана, винаги можете да се <a href="editing3DView.html">"разходите"
+в жилището</a>
+от плана за да го видите от различни гледни точки.</p>
+<p>Можете да редактирате едновременно произволен брой
+планове, като единственото ограничение би могло да е недостатъчното
+количество памет.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Дебелината и височината на създаваните стени се
+задава в менюто <a href="editingPreferences.html">Предпочитания</a>
+<i>Дебелина на новите стени</i> и <i>Височина
+на новите стени</i>.
+След като сте създали която и да е стена, можете да цъкнете двойно
+върху нея и да промените дебелината и височината и от менюто <a href="editingWalls.html">Промяна
+характеристиките на стена</a>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Площта на новия план по подразбиране е 10 на 10
+метра. Ако някоя стена или друг обект излиза извън тези размери, площта
+автоматично ще се уголеми.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Когато в 3D изгледа е избран <a href="editing3DView.html">Изглед
+отгоре</a>, 3D изображението ще е центрирано в центъра на
+жилището. </p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editing3DView.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editing3DView.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editing3DView.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editing3DView.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,251 +1,254 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Настройки на 3D изгледа</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet
-Home 3D Помощ - Начало</a>
-&gt; <a class="bread" href="tocEditing.html">Промяна
-на предпочитанията, стените, мебелировката и 3D изгледа</a> </div>
-</div>
-<div id="mainbox" align="left">
-<table widproposedth="100%" border="0" cellpadding="0" cellspacing="0">
-<tbody>
-<tr height="32" valign="bottom">
-<td height="32" width="3">&nbsp;</td>
-<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td height="32" width="8">&nbsp;&nbsp;</td>
-<td height="32" valign="bottom"><font id="topic">Настройки на 3D изгледа</font></td>
-</tr>
-<tr height="10">
-<td colspan="4" height="10">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>Изберете <i>3D изглед &gt; Изглед отгоре</i>
-или <i>3D изглед &gt; Виртуална разходка</i> за да
-смените гледната точка в 3D изгледа.</p>
-<table align="center" border="0" cellpadding="0" cellspacing="5">
-<tbody>
-<tr>
-<td><img src="../images/aerialView.png" alt="Изглед отгоре" height="214" width="290"></td>
-<td><img src="../images/virtualVisit.png" alt="Виртуална разходка" height="214" width="290"></td>
-</tr>
-<tr align="center">
-<td>Изглед отгоре</td>
-<td>Виртуална разходка</td>
-</tr>
-</tbody>
-</table>
-<p>Когато е избрано <i>Изглед отгоре</i>, 3D
-изгледа изобразява Вашия план триизмерно, гледано отгоре. В този режим,
-местенето на мишката наляво или надясно с натиснат ляв бутон завърта
-изображението около вертикална ос, минаваща през центъра на плана;
-местенето на мишката нагоре или надолу с натиснат ляв бутон завърта
-плана около хоризонталната му ос; въртенето на скрол колелцето на
-мишката уголемява или смалява 3D изгледа. <br>
-Когато е избрано <i>Виртуална разходка</i>, 3D изгледа
-изобразява Вашия план триизмерно, гледано през очите на виртуален
-посетител. В този режим, местенето на мишката наляво или надясно с
-натиснат ляв бутон завърта тялото на посетителя наляво или надясно;
-местенето на мишката нагоре или надолу с натиснат ляв бутон премества
-погледа на посетителя нагоре или надолу; въртенето на скрол колелцето
-на мишката приближава и отдалечава посетителя. <br>
-И в двата режима, натискането на клавишите <i>стрелка наляво</i>
-и <i>стрелка надясно</i> водят до същия ефект както
-страничното движение на мишката; <i>page up</i> и <i>page
-down</i> както движението на мишката вертикално; клавишите <i>стрелка
-нагоре</i> и <i>стрелка надолу</i> - както скрол
-колелцето на мишката. В режим <i>Виртуална разходка</i>
-можете да местите гледната точка на посетителя нагоре и надолу с
-клавишите <i>home</i> и <i>end</i>.</p>
-<table align="center" border="0" cellpadding="0" cellspacing="5">
-<tbody>
-<tr>
-<td align="center"><img src="../images/3DNavigationPanel.png" alt="3D navigation arrows" height="61" width="58"></td>
-<td>От менюто <a href="editingPreferences.html">Предпочитания</a>
-можете да покажете или скриете 3D навигатора, изобразяван в горния ляв
-ъгъл на прозореца с 3D изгледа. Стрелките наляво, надясно, нагоре и
-надолу на навигатора имат същият ефект като съответните клавиши на
-клавиатурата, а двете малки стрелки в центъра му - като клавишите <i>page
-up</i> и <i>page down</i>.</td>
-</tr>
-</tbody>
-</table>
-<p>Когато е избрано <i>Виртуална разходка</i>,
-виртуалният посетител, гледан отгоре, също се изобразява в плана.
-Неговото място и завъртане се променя едновременно в плана и в 3D
-изгледа. Около виртуалния посетител има четири индикатора.</p>
-<p align="center"><img src="../images/virtualVisitorIndicators.png" height="80" width="80"></p>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>1.</p>
-</td>
-<td>
-<p>Чрез този до лявото му рамо можете да накарате
-посетителя да премести погледа си надолу или нагоре.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>2.</p>
-</td>
-<td>
-<p>Вторият е хоризонталният ъгъл, който посетителя
-вижда.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>3.</p>
-</td>
-<td>
-<p>Чрез този до дясното му рамо можете да завъртите
-тялото на посетителя наляво или надясно.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>4.</p>
-</td>
-<td>
-<p>Четвъртият индикатор е за промяна на височината на
-гледната точка на посетителя.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>Когато е над някое от рамената на посетителя или зад
-него, показалецът на мишката се променя за да Ви покаже, че ако
-натиснете левия бутон на мишката в тази точка и я движите, ще местите
-погледа на посетителя по хоризонтала или по вертикала, или ще променяте
-височината на неговата гледна точка.<br>
-Можете да променяте мястото на виртуалния посетител и в плана:
-завлечете го и го пуснете, или го маркирайте и го движете с клавишите
-от клавиатурата. </p>
-<p>Други параметри на 3D изгледа можете да променяте от
-менюто <i>3D изглед &gt; Настройки...</i>.</p>
-<p align="center"><img src="images/editing3DView.png" height="245" width="509"></p>
-<p>От менюто <i>Настройки на 3D изгледа</i>
-можете да променяте хоризонталния
-ъгъл, видим от посетителя, височината на посетителя, цвета и шарката на
-настилката
-и на небето, яркостта на осветлението и прозрачността на стените.<br>
-Височината на очите на виртуалния посетител е на 13/14 от неговия ръст,
-отговарящо на
-пропорциите на възрастен човек.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Натиснете клавиша <i>shift</i> за да
-намалите ефекта от движението на мишката или скрол колелцето в 3D
-изгледа.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Клавишите W, S, A и D действат както клавишите
-стрелки в 3D изгледа.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Движенията в 3D изгледа не са операции, които
-могат да бъдат отменени или повторени, но текущата позиция в 3D изгледа
-се <a href="savingHome.html">записва</a>
-в
-Sweet Home 3D файла, когато изберете <i>Файл
-&gt;&nbsp;Запиши</i> или <i>Файл
-&gt;&nbsp;Запиши като...</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Клавишите стрелки на клавиатурата нямат един и същ
-ефект върху виртуалния посетител, когато на фокус е планът или полето с
-3D изгледа. Когато планът е на фокус, клавишите стрелки местят
-виртуалния посетител както всеки друг обект в плана.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Местенето на мишката нагоре и надолу с натиснат
-ляв бутон и натиснат клавиш <i>alt</i> на клавиатурата има
-същия ефект както на скрол колелцето на мишката.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Няма пречки виртуалният посетител да е вътре в
-стена
-или да е твърде далеч от жилището. Ако се "изгубите" и не знаете къде
-се намира
-виртуалният посетител, завъртете скрол колелцето с показалец на мишката
-в 3D изгледа. Това автоматично ще маркира и покаже виртуалния посетител
-в плана.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Настройки на 3D изгледа</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet
+Home 3D Помощ - Начало</a>
+&gt; <a class="bread" href="tocEditing.html">Промяна
+на предпочитанията, стените, мебелировката и 3D изгледа</a> </div>
+</div>
+<div id="mainbox" align="left">
+<table widproposedth="100%" border="0" cellpadding="0" cellspacing="0">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><font id="topic">Настройки на 3D изгледа</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>Изберете <i>3D изглед &gt; Изглед отгоре</i>
+или <i>3D изглед &gt; Виртуална разходка</i> за да
+смените гледната точка в 3D изгледа.</p>
+<table align="center" border="0" cellpadding="0" cellspacing="5">
+<tbody>
+<tr>
+<td><img src="../images/aerialView.png" alt="Изглед отгоре" height="214" width="290"></td>
+<td><img src="../images/virtualVisit.png" alt="Виртуална разходка" height="214" width="290"></td>
+</tr>
+<tr align="center">
+<td>Изглед отгоре</td>
+<td>Виртуална разходка</td>
+</tr>
+</tbody>
+</table>
+<p>Когато е избрано <i>Изглед отгоре</i>, 3D
+изгледа изобразява Вашия план триизмерно, гледано отгоре. В този режим,
+местенето на мишката наляво или надясно с натиснат ляв бутон завърта
+изображението около вертикална ос, минаваща през центъра на плана;
+местенето на мишката нагоре или надолу с натиснат ляв бутон завърта
+плана около хоризонталната му ос; въртенето на скрол колелцето на
+мишката уголемява или смалява 3D изгледа. <br>
+Когато е избрано <i>Виртуална разходка</i>, 3D изгледа
+изобразява Вашия план триизмерно, гледано през очите на виртуален
+посетител. В този режим, местенето на мишката наляво или надясно с
+натиснат ляв бутон завърта тялото на посетителя наляво или надясно;
+местенето на мишката нагоре или надолу с натиснат ляв бутон премества
+погледа на посетителя нагоре или надолу; въртенето на скрол колелцето
+на мишката приближава и отдалечава посетителя. <br>
+И в двата режима, натискането на клавишите <i>стрелка наляво</i>
+и <i>стрелка надясно</i> водят до същия ефект както
+страничното движение на мишката; <i>page up</i> и <i>page
+down</i> както движението на мишката вертикално; клавишите <i>стрелка
+нагоре</i> и <i>стрелка надолу</i> - както скрол
+колелцето на мишката. В режим <i>Виртуална разходка</i>
+можете да местите гледната точка на посетителя нагоре и надолу с
+клавишите <i>home</i> и <i>end</i>.</p>
+<table align="center" border="0" cellpadding="0" cellspacing="5">
+<tbody>
+<tr>
+<td align="center"><img src="../images/3DNavigationPanel.png" alt="3D navigation arrows" height="61" width="58"></td>
+<td>От менюто <a href="editingPreferences.html">Предпочитания</a>
+можете да покажете или скриете 3D навигатора, изобразяван в горния ляв
+ъгъл на прозореца с 3D изгледа. Стрелките наляво, надясно, нагоре и
+надолу на навигатора имат същият ефект като съответните клавиши на
+клавиатурата, а двете малки стрелки в центъра му - като клавишите <i>page
+up</i> и <i>page down</i>.</td>
+</tr>
+</tbody>
+</table>
+<p>Когато е избрано <i>Виртуална разходка</i>,
+виртуалният посетител, гледан отгоре, също се изобразява в плана.
+Неговото място и завъртане се променя едновременно в плана и в 3D
+изгледа. Около виртуалния посетител има четири индикатора.</p>
+<p align="center"><img src="../images/virtualVisitorIndicators.png" height="80" width="80"></p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>1.</p>
+</td>
+<td>
+<p>Чрез този до лявото му рамо можете да накарате
+посетителя да премести погледа си надолу или нагоре.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>2.</p>
+</td>
+<td>
+<p>Вторият е хоризонталният ъгъл, който посетителя
+вижда.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>3.</p>
+</td>
+<td>
+<p>Чрез този до дясното му рамо можете да завъртите
+тялото на посетителя наляво или надясно.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>4.</p>
+</td>
+<td>
+<p>Четвъртият индикатор е за промяна на височината на
+гледната точка на посетителя.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>Когато е над някое от рамената на посетителя или зад
+него, показалецът на мишката се променя за да Ви покаже, че ако
+натиснете левия бутон на мишката в тази точка и я движите, ще местите
+погледа на посетителя по хоризонтала или по вертикала, или ще променяте
+височината на неговата гледна точка.<br>
+Можете да променяте мястото на виртуалния посетител и в плана:
+завлечете го и го пуснете, или го маркирайте и го движете с клавишите
+от клавиатурата. </p>
+<p>Други параметри на 3D изгледа можете да променяте от
+менюто <i>3D изглед &gt; Настройки...</i>.</p>
+<p align="center"><img src="images/editing3DView.png" height="245" width="509"></p>
+<p>От менюто <i>Настройки на 3D изгледа</i>
+можете да променяте хоризонталния
+ъгъл, видим от посетителя, височината на посетителя, цвета и шарката на
+настилката
+и на небето, яркостта на осветлението и прозрачността на стените.<br>
+Височината на очите на виртуалния посетител е на 13/14 от неговия ръст,
+отговарящо на
+пропорциите на възрастен човек.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Натиснете клавиша <i>shift</i> за да
+увеличите ефекта от движението на мишката или скрол колелцето в 3D
+изгледа.</p></td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Клавишите W, S, A и D действат както клавишите
+стрелки в 3D изгледа.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Движенията в 3D изгледа не са операции, които
+могат да бъдат отменени или повторени, но текущата позиция в 3D изгледа
+се <a href="savingHome.html">записва</a>
+в
+Sweet Home 3D файла, когато изберете <i>Файл
+&gt;&nbsp;Запиши</i> или <i>Файл
+&gt;&nbsp;Запиши като...</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Клавишите стрелки на клавиатурата нямат един и същ
+ефект върху виртуалния посетител, когато на фокус е планът или полето с
+3D изгледа. Когато планът е на фокус, клавишите стрелки местят
+виртуалния посетител както всеки друг обект в плана.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Местенето на мишката нагоре и надолу с натиснат
+ляв бутон и натиснат клавиш <i>alt</i> на клавиатурата има
+същия ефект както на скрол колелцето на мишката.</p>
+</td>
+</tr>
+<tr valign="top">
+  <td><p>•</p></td>
+  <td><p>Няма пречки виртуалният посетител да е вътре в
+    стена
+    или да е твърде далеч от жилището. Ако се "изгубите" и не знаете къде
+    се намира
+    виртуалният посетител, завъртете скрол колелцето с показалец на мишката
+    в 3D изгледа. Това автоматично ще маркира и покаже виртуалния посетител
+    в плана.</p></td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако желаете в 3D изгледа постоянно да виждате всички етажи, независимо кой  от тях е маркиран, изберете от менюто <i>3D Изглед &gt; Показвай всички етажи</i>. За  да бъде показван избрания етаж и тези под него, изберете <i>3D Изглед &gt;  Показвай избрания етаж</i>.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingFurniture.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,314 +1,322 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Редактиране на мебелировката</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet
-Home 3D Помощ - Начало</a>
-&gt; <a class="bread" href="tocEditing.html">Промяна
-на предпочитанията, стените, мебелировката и 3D изгледа
-</a> </div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr height="32" valign="bottom">
-<td height="32" width="3">&nbsp;</td>
-<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td height="32" width="8">&nbsp;&nbsp;</td>
-<td height="32" valign="bottom"><font id="topic">Редактиране на мебелировката</font></td>
-</tr>
-<tr height="10">
-<td colspan="4" height="10">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>Можете да промените мястото, големината, повдигането от
-пода и завъртането на всеки обект от мебелировката или чрез мишката,
-или от менюто <i>Мебелировка &gt;&nbsp;Промени...</i>.<br>
-За да промените характеристиките на обект от мебелировката с мишката,
-маркирайте обекта в плана или от списъка с обекти. За да маркирате един
-обект в плана, цъкнете върху него (трябва да сте в режим Маркиране). За
-да маркирате няколко обекта в плана, очертайте маркиращ правоъгълник
-около тях (натискате левия бутон на мишката някъде в плана, но не върху
-обект и местите мишката, така че в получения правоъгълник да попаднат
-желаните за маркиране обекти, след което пускате бутона на мишката),
-и/или цъкайте върху всеки от обектите докато държите натиснат клавиша <i>shift</i>.
-<br>
-За да избегнете маркирането на обекти, които не са мебелировка,
-заключете плана като цъкнете върху катинарчето в горния ляв ъгъл на
-плана или като изберете <i>План &gt;&nbsp;Заключи плана</i>
-от менюто. Това ще забрани маркирането на стени, стаи, оразмерителни
-линии, текстове, врати и прозорци, което ще Ви позволи да подредите
-мебелировката по-лесно. Повторното цъкване върху катинарчето или
-добавянето на обект в плана, който не е част от мебелировката ще
-отключи плана.<br>
-За да преместите маркираните обекти, поставете показалеца на мишката
-върху някой от маркираните обекти, след което завлечете с мишката и
-пуснете на новото място или ползвайте клавишите стрелки от
-клавиатурата. Когато местите един обект и показалецът на мишката е
-върху стена, този обект, ако е врата или прозорец автоматично ще се
-завърти и преоразмери според разположението и дебелината на стената, а
-ако е друг тип обект ще се завърти така, че гърбът му да е обърнат към
-стената.<br>
-Ако искате да обработвате няколко обекта като един (напр. маса и
-столовете около нея), маркирайте ги и изберете <i>Мебелировка
-&gt; Постави ги в група</i>. </p>
-<p> Когато е маркиран <b>един</b> обект в
-плана, Вие можете да промените размерите му, повдигането или
-завъртането чрез някой от четирите индикатора, разположени до всеки от
-ъглите на обекта.</p>
-<p align="center"><img src="../images/furnitureCorners.png" alt="Индикатори в ъглите" height="110" width="110"></p>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>1.</p>
-</td>
-<td>
-<p>Индикатор за завъртането. Показва ъгълът, който
-можете да "хванете", за да завъртите маркирания обект.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>2.</p>
-</td>
-<td>
-<p>Индикатор за повдигането. Показва ъгълът,
-който можете да "хванете", за да промените повдигането от пода.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>3.</p>
-</td>
-<td>
-<p>Индикатор за височината. Показва ъгълът,
-който можете да "хванете", за да промените височината на маркирания
-обект.<br>
-Ако обектът е от типа "Светлина" или е лампа,
-съдържаща източници на светлина, този индикатор променя силата на
-светлината. Ако искате да промените височината на такъв обект,
-направете го както е описано в следващия параграф.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>4.</p>
-</td>
-<td>
-<p>Индикатор за размерите. Показва ъгълът,
-който можете да "хванете", за да промените ширината и дълбочината.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>Когато попадне върху някой от тези ъгли, показалецът
-на мишката се променя за да покаже, че сте на мястото, което можете да
-"хванете". Когато хванете някой от индикаторите до него ще се появи
-подсказка с текущата стойност на параметъра, който променяте.<br>
-Обектът, който променяте с мишката, се променя едновременно в плана и в
-3D изгледа.</p>
-<p>Характеристиките на обект от мебелировката можете да
-променяте и чрез неговия панел с параметри, който ще се
-появи ако цъкнете двойно върху обекта в плана или в списъка с
-обекти, или като го маркирате и изберете менюто <i>Мебелировка
-&gt;&nbsp;Промени...</i> .</p>
-<p align="center"><img src="images/editingFurniture.png" alt="Промяна характеристиките на мебел" height="436" width="465"></p>
-<p>В появилия се панел, Вие можете да промените името на
-обекта, координатите на неговия център по X и Y в плана, повдигането на
-основата му от пода, ширината и дълбочината му, неговия цвят, шарка
-или блясък,
-дали да е видим, завъртането му, дали името му да се изобразява в плана
-и да го обърнете огледално, ако е необходимо.<br>
-Ако го направите невидим, той няма да се изобразява в плана и в 3D
-изгледа, но ще остане в списъка с обекти за да можете да го направите
-отново видим.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако искате да промените характеристики на няколко
-обекта, маркирайте ги и изберете от менюто <i>Мебелировка
-&gt;&nbsp;Промени...</i>. Ако стойностите на еднакви
-характеристики на маркираните обекти се различават, тези полета в
-менюто ще бъдат празни.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Изберете от менюто <i>План
-&gt;&nbsp;Промени стила на текста</i> за да промените
-големината или стила на шрифта, изобразяващ името на маркирания обект.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако искате да подравните няколко обекта,
-маркирайте ги и изберете необходимото от менюто <i>Мебелировка
-&gt;&nbsp;Подравни</i>. Обектите ще се подравнят според
-обекта, който сте маркирали първи.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Обектите, категоризирани като врата или прозорец,
-карат Sweet Home 3D автоматично да направи подходящия отвор в стената,
-където са поставени. Такива изчисления не се правят за другите типове
-обекти. За да сте сигурни, че са правилно оразмерени, проверявайте
-дълбочината на вратите и прозорците да е по-голяма от дебелината на
-стената, в която са поставени. </p>
-</td>
-</tr>
-<tr>
-<td>
-<p>•</p>
-</td>
-<td>Промяната в силата на светлината има ефект
-само върху изображенията, генерирани чрез инструментите
-<a href="creatingPhotos.html">Направи снимка...</a>
-и <a href="creatingVideos.html">Направи филм...</a>
-в двете нива с високо качество на генерираните изображения.
-Обектите от типа "Светлина" не се изобразяват като предмети в
-3D изгледа и разположението им може да бъде видяно в 3D изгледа
-само когато бъдат маркирани.</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако поставите един обект върху друг, той ще бъде
-повдигнат така, че да бъде поставен върху по-рано поставения, когато
-маркиращият го правоъгълник застъпва по-рано поставения и повдигането
-му по подразбиране е нула (на нивото на пода).</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако в маркираните в плана обекти се включват
-стени, стаи, мебелировка, оразмерителни линии и текстове, всички тези
-обекти ще се местят с влачене и пускане или с клавишите стрелки от
-клавиатурата. Ако натиснете и задържите клавиша <i>ctrl</i>
-(или
-<i>alt</i> за ползващите Mac OS X) докато
-влачите тези обекти, те ще бъдат копирани.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>По подразбиране ъгълът на завъртане на обектите е
-кратен на 15°, което улеснява поставянето им паралелно на стените.
-Вие можете да отмените този магнетизъм чрез задържане на клавиша <i>shift</i>
-докато въртите обекта, или като забраните магнетизма в менюто <a href="editingPreferences.html">Предпочитания</a>.
-По
-същия начин, когато магнетизмът е разрешен, дълбочината и повдигането
-на местения обект може да се променят автоматично.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Мярката на размерите, изписани в подсказките и в
-списъка с обекти е тази,
-която се ползва във Вашата страна. Вие можете да я
-промените на Инчове, Метри, Сантиметри или Милиметри от менюто <a href="editingPreferences.html">Предпочитания</a>.
-</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Изберете <i>План
-&gt;&nbsp;Уголеми</i> или <i>План
-&gt;&nbsp;Смали</i> за да уголемите или смалите
-плана.
-</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>За по-лесно поставяне на
-мебелировката, <a href="editing3DView.html">променете
-в 3D изгледа</a> гледната точка и/или прозрачността на стените.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Характеристиките на <a href="importingFurniture.html">импортираните</a>
-обекти
-също могат да бъдат редактирани.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Редактиране на мебелировката</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet
+Home 3D Помощ - Начало</a>
+&gt; <a class="bread" href="tocEditing.html">Промяна
+на предпочитанията, стените, мебелировката и 3D изгледа
+</a> </div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><font id="topic">Редактиране на мебелировката</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>Можете да промените мястото, големината, повдигането от
+пода и завъртането на всеки обект от мебелировката или чрез мишката,
+или от менюто <i>Мебелировка &gt;&nbsp;Промени...</i>.<br>
+За да промените характеристиките на обект от мебелировката с мишката,
+маркирайте обекта в плана или от списъка с обекти. За да маркирате един
+обект в плана, цъкнете върху него (трябва да сте в режим Маркиране). За
+да маркирате няколко обекта в плана, очертайте маркиращ правоъгълник
+около тях (натискате левия бутон на мишката някъде в плана, но не върху
+обект и местите мишката, така че в получения правоъгълник да попаднат
+желаните за маркиране обекти, след което пускате бутона на мишката),
+и/или цъкайте върху всеки от обектите докато държите натиснат клавиша <i>shift</i>.
+<br>
+За да избегнете маркирането на обекти, които не са мебелировка,
+заключете плана като цъкнете върху катинарчето в горния ляв ъгъл на
+плана или като изберете <i>План &gt;&nbsp;Заключи плана</i>
+от менюто. Това ще забрани маркирането на стени, стаи, оразмерителни
+линии, текстове, врати и прозорци, което ще Ви позволи да подредите
+мебелировката по-лесно. Повторното цъкване върху катинарчето или
+добавянето на обект в плана, който не е част от мебелировката ще
+отключи плана.<br>
+За да преместите маркираните обекти, поставете показалеца на мишката
+върху някой от маркираните обекти, след което завлечете с мишката и
+пуснете на новото място или ползвайте клавишите стрелки от
+клавиатурата. Когато местите един обект и показалецът на мишката е
+върху стена, този обект, ако е врата или прозорец автоматично ще се
+завърти и преоразмери според разположението и дебелината на стената, а
+ако е друг тип обект ще се завърти така, че гърбът му да е обърнат към
+стената.<br>
+Ако искате да обработвате няколко обекта като един (напр. маса и
+столовете около нея), маркирайте ги и изберете <i>Мебелировка
+&gt; Постави ги в група</i>. </p>
+<p> Когато е маркиран <b>един</b> обект в
+плана, Вие можете да промените размерите му, повдигането или
+завъртането чрез някой от четирите индикатора, разположени до всеки от
+ъглите на обекта.</p>
+<p align="center"><img src="../images/furnitureCorners.png" alt="Индикатори в ъглите" height="110" width="110"></p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>1.</p>
+</td>
+<td>
+<p>Индикатор за завъртането. Показва ъгълът, който
+можете да "хванете", за да завъртите маркирания обект.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>2.</p>
+</td>
+<td>
+<p>Индикатор за повдигането. Показва ъгълът,
+който можете да "хванете", за да промените повдигането от пода.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>3.</p>
+</td>
+<td>
+<p>Индикатор за височината. Показва ъгълът,
+който можете да "хванете", за да промените височината на маркирания
+обект.<br>
+Ако обектът е от типа "Светлина" или е лампа,
+съдържаща източници на светлина, този индикатор променя силата на
+светлината. Ако искате да промените височината на такъв обект,
+направете го както е описано в следващия параграф.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>4.</p>
+</td>
+<td>
+<p>Индикатор за размерите. Показва ъгълът,
+който можете да "хванете", за да промените ширината и дълбочината.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>Когато попадне върху някой от тези ъгли, показалецът
+на мишката се променя за да покаже, че сте на мястото, което можете да
+"хванете". Когато хванете някой от индикаторите до него ще се появи
+подсказка с текущата стойност на параметъра, който променяте.<br>
+Обектът, който променяте с мишката, се променя едновременно в плана и в
+3D изгледа.</p>
+<p>Характеристиките на обект от мебелировката можете да
+променяте и чрез неговия панел с параметри, който ще се
+появи ако цъкнете двойно върху обекта в плана или в списъка с
+обекти, или като го маркирате и изберете менюто <i>Мебелировка
+&gt;&nbsp;Промени...</i> .</p>
+<p align="center"><img src="images/editingFurniture.png" alt="Промяна характеристиките на мебел" height="436" width="465"></p>
+<p>В появилия се панел, Вие можете да промените името на
+обекта, координатите на неговия център по X и Y в плана, повдигането на
+основата му от пода, ширината и дълбочината му, неговия цвят, шарка
+или блясък,
+дали да е видим, завъртането му, дали името му да се изобразява в плана
+и да го обърнете огледално, ако е необходимо.<br>
+Ако го направите невидим, той няма да се изобразява в плана и в 3D
+изгледа, но ще остане в списъка с обекти за да можете да го направите
+отново видим.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+  <tr valign="top">
+    <td><p>•</p></td>
+    <td><p>Когато в списъка с обекти се изобразява колоната <i>Видим</i>, Вие можете да скривате и отново да показвате даден обект от  обзавеждането, като премахвате или поставяте отметка в полето за съответния обект в тази колона.</p></td>
+  </tr>
+<tbody>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако искате да промените характеристики на няколко
+обекта, маркирайте ги и изберете от менюто <i>Мебелировка
+&gt;&nbsp;Промени...</i>. Ако стойностите на еднакви
+характеристики на маркираните обекти се различават, тези полета в
+менюто ще бъдат празни.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Изберете от менюто <i>План
+&gt;&nbsp;Промени стила на текста</i> за да промените
+големината или стила на шрифта, изобразяващ името на маркирания обект.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако искате да подравните няколко обекта,
+маркирайте ги и изберете необходимото от менюто <i>Мебелировка
+&gt;&nbsp;Подравни</i>. Обектите ще се подравнят според
+обекта, който сте маркирали първи.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Обектите, категоризирани като врата или прозорец,
+карат Sweet Home 3D автоматично да направи подходящия отвор в стената,
+където са поставени. Такива изчисления не се правят за другите типове
+обекти. За да сте сигурни, че са правилно оразмерени, проверявайте
+дълбочината на вратите и прозорците да е по-голяма от дебелината на
+стената, в която са поставени. </p>
+</td>
+</tr>
+<tr valign="top">
+  <td><p>•</p></td>
+  <td><p>Когато Вашият план има повече от един етаж, поставянето на стълбище може автоматично да направи отвор в тавана (пода на горния  етаж), ако височината на стълбището е по-голяма от повдигането на горния етаж.</p></td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>Промяната в силата на светлината има ефект
+само върху изображенията, генерирани чрез инструментите
+<a href="creatingPhotos.html">Направи снимка...</a>
+и <a href="creatingVideos.html">Направи филм...</a>
+в двете нива с високо качество на генерираните изображения.
+Обектите от типа "Светлина" не се изобразяват като предмети в
+3D изгледа и разположението им може да бъде видяно в 3D изгледа
+само когато бъдат маркирани.</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако поставите един обект върху друг, той ще бъде
+повдигнат така, че да бъде поставен върху по-рано поставения, когато
+маркиращият го правоъгълник застъпва по-рано поставения и повдигането
+му по подразбиране е нула (на нивото на пода).</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако в маркираните в плана обекти се включват
+стени, стаи, мебелировка, оразмерителни линии и текстове, всички тези
+обекти ще се местят с влачене и пускане или с клавишите стрелки от
+клавиатурата. Ако натиснете и задържите клавиша <i>ctrl</i>
+(или
+<i>alt</i> за ползващите Mac OS X) докато
+влачите тези обекти, те ще бъдат копирани.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>По подразбиране ъгълът на завъртане на обектите е
+кратен на 15°, което улеснява поставянето им паралелно на стените.
+Вие можете да отмените този магнетизъм чрез задържане на клавиша <i>shift</i>
+докато въртите обекта, или като забраните магнетизма в менюто <a href="editingPreferences.html">Предпочитания</a>.
+По
+същия начин, когато магнетизмът е разрешен, дълбочината и повдигането
+на местения обект може да се променят автоматично.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Мярката на размерите, изписани в подсказките и в
+списъка с обекти е тази,
+която се ползва във Вашата страна. Вие можете да я
+промените на Инчове, Метри, Сантиметри или Милиметри от менюто <a href="editingPreferences.html">Предпочитания</a>.
+</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Изберете <i>План
+&gt;&nbsp;Уголеми</i> или <i>План
+&gt;&nbsp;Смали</i> за да уголемите или смалите
+плана.
+</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>За по-лесно поставяне на
+мебелировката, <a href="editing3DView.html">променете
+в 3D изгледа</a> гледната точка и/или прозрачността на стените.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Характеристиките на <a href="importingFurniture.html">импортираните</a>
+обекти
+също могат да бъдат редактирани.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingLevels.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingLevels.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingLevels.html	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingLevels.html	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="bg"><head>
+<!-- saved from url=(0022)http://internet.e-mail -->
+<meta http-equiv="content-type" content="text/html;charset=UTF-8"><title>Промяна на етажи</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet Home 3D Помощ - Начало</a>
+&gt;&nbsp;<a class="bread" href="tocEditing.html">Промяна
+на предпочитанията, стените, мебелировката и 3D изгледа</a>
+</div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><font id="topic">Промяна на етажи</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>Можете
+да променяте името, повдигането и височината на етаж, като цъкнете
+двойно върху неговия таб или като изберете от менюто <i>План
+&gt; Промени етажа</i>.<br>
+Менюто
+за модифициране на етажи дава възможност за промяна атрибутите на
+етажа, но също показва таблица с описание на всички етажи на дома с
+маркиран етажа, който в момента редактирате.</p>
+<p align="center"><img src="images/editingLevels.png" alt="Modify furniture" height="287" width="284"></p>
+<p>Дебелината
+на пода на етажа се използва за изчисляване на вертикалната ивица около
+пода в 3D изгледа. Тази повърхност е видима в отворите в пода, по края
+на етажа-мецанин и на балконите.<br>
+Повдигането на нивото може да е положително или отрицателно. Във втория
+случай в земята автоматично ще бъде направен изкоп
+в 3D изгледа всеки път, когато бъде добавен обект, стая или
+затворена поредица от стени в приземното ниво. Тази функционалност може
+да се използва за поставяне на плувен басейн в терена или за създаване
+на мазе от един или повече етажи.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>Не е задължително да въведете стойности, за да
+напаснете точно нивото
+на всеки следващ етаж. Можете да използвате тази функционалност, за да
+направите междинни етажи, повдигнати подове и фалшиви тавани. Може да
+използвате също и нива с еднакво повдигане като слоеве, за да отделите
+някои обекти, <a href="drawingDimensions.html">оразмерителни
+линии</a> или <a href="addingTexts.html">текстове</a>.</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Табовете
+в горната част на полето с плана изобразяват имената на етажите по реда
+на тяхното повдигане и след това тези с еднакво повдигане, в
+обратен
+на тяхната височина ред. Промяната на повдигането и/или височината на
+етажа може автоматично да промени реда на табовете.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+</body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingPreferences.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,178 +1,180 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Промяна на предпочитанията</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet
-Home 3D Помощ - Начало</a>
-&gt; <a class="bread" href="tocEditing.html">Промяна
-на предпочитанията, стените, мебелировката и 3D изгледа
-</a> </div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr height="32" valign="bottom">
-<td height="32" width="3">&nbsp;</td>
-<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td height="32" width="8">&nbsp;&nbsp;</td>
-<td height="32" valign="bottom"><font id="topic">Промяна на предпочитанията</font></td>
-</tr>
-<tr height="10">
-<td colspan="4" height="10">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>За да промените предпочитаните настройки на Sweet Home
-3D, изберете <i>Файл &gt; Предпочитания...</i> (<i>Sweet
-Home 3D &gt;&nbsp;Предпочитания...</i> за Mac OS X).</p>
-<p align="center"><img src="images/editingPreferences.png" alt="Предпочитани настройки" height="428" width="480"></p>
-<p>В менюто Предпочитания, можете да промените
-ползвания <i>Език</i> в потребителския интерфейс
-на Sweet Home 3D и <i>Мярката</i>, използвана в
-размерите и площите.</p>
-<p>Отметката <i>Магнетизъм</i> разрешава или
-забранява магнетизма, използван за <a href="drawingWalls.html">чертането
-на стени</a>, <a href="editingFurniture.html">поставянето
-на мебелировката</a> и др.<br>
-Бутончетата <i>Папки по категории</i> и <i>Списък с
-търсене</i> задават начина на изобразяване на каталога с мебели и
-аксесоари в <a href="ui.html">прозореца
-на Sweet Home 3D</a>. <br>
-Отметката <i>3D навигатор</i> показва или скрива бутона
-със стрелки, улесняващ <a href="editing3DView.html">навигирането
-в 3D изгледа</a>. <br>
-Отметката <i>Линийки в плана</i> показва или скрива
-помощните линии отгоре и отляво на плана.<br>
-Отметката <i>Мрежа</i> показва или скрива помощната мрежа
-в плана.<br>
-С радиобутоните <i>С иконата от каталога</i> и <i>Гледани
-отгоре</i> можете да изберете как да се изобразяват обектите в
-плана (вижте изображенията по-долу).<br>
-С радиобутоните <i>Едноцветно</i> и <i>Цвета или
-шарката на пода</i> можете да изберете дали стаите да бъдат
-показвани в плана запълнени с цвета или шарката, която сте поставили на
-пода или в сиво (отпечатва се в бяло).<br>
-От падащия списък <i>Вид на стените в плана</i> можете да
-изберете как да бъдат запълнени стените в плана.</p>
-<p> От <i>Дебелина на новите стени</i> можете
-да зададете дебелината на стените, създавани от този момент нататък.<br>
-От <i>Височина на новите стени</i> можете
-да зададете височината на стените, създавани от този момент нататък. </p>
-<p>Стойността в полето, свързано със записването на резервно копие
-на плана с цел възстановяване, задава интервал в минути между записите.
-Това са автоматично записани планове, които могат да се използват
-за възстановяване при следващото стартиране на Sweet Home 3D, след
-аварийно спиране на програмата.<br>
-И последно, бутонът <i>Върни показването на съвети</i>
-прекратява забраната на отметките <i>Не показвай това занапред</i>
-в съветите, показвани при избирането на някои инструменти. Това
-означава, че всички съвети, на които сте маркирали тази отметка, отново
-ще бъдат показвани.</p>
-<table align="center" border="0" cellpadding="0" cellspacing="5">
-<tbody>
-<tr align="center">
-<td><img src="../images/defaultRendering.png" height="296" width="332"></td>
-<td rowspan="2">&nbsp;&nbsp;&nbsp;</td>
-<td><img src="../images/coloredRendering.png" height="296" width="332"></td>
-</tr>
-<tr>
-<td align="center" valign="top">Показване
-на плана по подразбиране с иконите от каталога,<br>
-едноцветен под и стени, запълнени с наклонени линии</td>
-<td align="center" valign="top">Показване
-на плана с обекти гледани отгоре,<br>
-цвят на пода и стени, запълнени с черно</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Предпочитаните настройки важат за всички Sweet
-Home 3D прозорци. Поради това, промяната им ще има ефект върху всички
-прозорци.</p>
-</td>
-</tr>
-</tbody><tbody>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Когато имате много богат каталог с мебелировка,
-изобразете го като списък с търсене. Падащият списък за избор на
-категория и полето за въвеждане на текст за търсене ще Ви помагат в
-откриването на желания обект.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>3D навигаторът не може да се ползва под Mac OS X
-10.4 и може да не се показва коректно под някои Линукс дистрибуции.
-Мястото му е в горния ляв ъгъл на 3D изгледа. Скрийте го като махнете
-отметката в менюто Предпочитания ако не работи коректно или Ви пречи.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Поради ограничения в конфигурацията Ви, би могло
-показването на плана с обекти, гледани отгоре да не е възможно. В този
-случай, радиобутоните <i>С иконата от каталога</i> и <i>Гледани
-отгоре</i> ще бъдат недостъпни.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>По врене на работа, включеният Магнетизъм може
-временно да бъде изключван с натискането и задържането на клавиша <i>shift</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>След като създадете стена, Вие можете <a href="editingWalls.html">да
-промените</a> дебелината и височината и на различни от зададените
-в Предпочитания настройки.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Промяна на предпочитанията</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet
+Home 3D Помощ - Начало</a>
+&gt; <a class="bread" href="tocEditing.html">Промяна
+на предпочитанията, стените, мебелировката и 3D изгледа
+</a> </div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><font id="topic">Промяна на предпочитанията</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>За да промените предпочитаните настройки на Sweet Home
+3D, изберете <i>Файл &gt; Предпочитания...</i> (<i>Sweet
+Home 3D &gt;&nbsp;Предпочитания...</i> за Mac OS X).</p>
+<p align="center"><img src="images/editingPreferences.png" alt="Предпочитани настройки" height="400" width="461"></p>
+<p>В менюто Предпочитания, можете да промените
+ползвания <i>Език</i> в потребителския интерфейс
+на Sweet Home 3D и <i>Мярката</i>, използвана в
+размерите и площите.<br>
+Бутонът в дясно от падащото меню Език, позволява да импортирате допълнителни  езици, съдържащи се в библиотечни файлове с разширение SH3L.</p>
+<p>Отметката <i>Магнетизъм</i> разрешава или
+забранява магнетизма, използван за <a href="drawingWalls.html">чертането
+на стени</a>, <a href="editingFurniture.html">поставянето
+на мебелировката</a> и др.<br>
+Бутончетата <i>Папки по категории</i> и <i>Списък с
+търсене</i> задават начина на изобразяване на каталога с мебели и
+аксесоари в <a href="ui.html">прозореца
+на Sweet Home 3D</a>. <br>
+Отметката <i>3D навигатор</i> показва или скрива бутона
+със стрелки, улесняващ <a href="editing3DView.html">навигирането
+в 3D изгледа</a>. <br>
+Отметката <i>Линийки в плана</i> показва или скрива
+помощните линии отгоре и отляво на плана.<br>
+Отметката <i>Мрежа</i> показва или скрива помощната мрежа
+в плана.<br>
+С радиобутоните <i>С иконата от каталога</i> и <i>Гледани
+отгоре</i> можете да изберете как да се изобразяват обектите в
+плана (вижте изображенията по-долу).<br>
+С радиобутоните <i>Едноцветно</i> и <i>Цвета или
+шарката на пода</i> можете да изберете дали стаите да бъдат
+показвани в плана запълнени с цвета или шарката, която сте поставили на
+пода или в сиво (отпечатва се в бяло).<br>
+От падащия списък <i>Вид на стените в плана</i> можете да
+изберете как да бъдат запълнени стените в плана.</p>
+<p> От <i>Дебелина на новите стени</i> можете
+да зададете дебелината на стените, създавани от този момент нататък.<br>
+От <i>Височина на новите стени</i> можете
+да зададете височината на стените, създавани от този момент нататък.<br>
+Новата дебелина на пода задава дебелината на пода на създаваните след това  етажи.</p>
+<p>Стойността в полето, свързано със записването на резервно копие
+  на плана с цел възстановяване, задава интервал в минути между записите.
+  Това са автоматично записани планове, които могат да се използват
+  за възстановяване при следващото стартиране на Sweet Home 3D, след
+  аварийно спиране на програмата.<br>
+И последно, бутонът <i>Върни показването на съвети</i>
+прекратява забраната на отметките <i>Не показвай това занапред</i>
+в съветите, показвани при избирането на някои инструменти. Това
+означава, че всички съвети, на които сте маркирали тази отметка, отново
+ще бъдат показвани.</p>
+<table align="center" border="0" cellpadding="0" cellspacing="5">
+<tbody>
+<tr align="center">
+<td><img src="../images/defaultRendering.png" height="296" width="332"></td>
+<td rowspan="2">&nbsp;&nbsp;&nbsp;</td>
+<td><img src="../images/coloredRendering.png" height="296" width="332"></td>
+</tr>
+<tr>
+<td align="center" valign="top">Показване
+на плана по подразбиране с иконите от каталога,<br>
+едноцветен под и стени, запълнени с наклонени линии</td>
+<td align="center" valign="top">Показване
+на плана с обекти гледани отгоре,<br>
+цвят на пода и стени, запълнени с черно</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Предпочитаните настройки важат за всички Sweet
+Home 3D прозорци. Поради това, промяната им ще има ефект върху всички
+прозорци.</p>
+</td>
+</tr>
+</tbody><tbody>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Когато имате много богат каталог с мебелировка,
+изобразете го като списък с търсене. Падащият списък за избор на
+категория и полето за въвеждане на текст за търсене ще Ви помагат в
+откриването на желания обект.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>3D навигаторът не може да се ползва под Mac OS X
+10.4 и може да не се показва коректно под някои Линукс дистрибуции.
+Мястото му е в горния ляв ъгъл на 3D изгледа. Скрийте го като махнете
+отметката в менюто Предпочитания ако не работи коректно или Ви пречи.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Поради ограничения в конфигурацията Ви, би могло
+показването на плана с обекти, гледани отгоре да не е възможно. В този
+случай, радиобутоните <i>С иконата от каталога</i> и <i>Гледани
+отгоре</i> ще бъдат недостъпни.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>По врене на работа, включеният Магнетизъм може
+временно да бъде изключван с натискането и задържането на клавиша <i>shift</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>След като създадете стена, Вие можете <a href="editingWalls.html">да
+промените</a> дебелината и височината и на различни от зададените
+в Предпочитания настройки.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingRooms.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingRooms.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingRooms.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/editingRooms.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,248 +1,251 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Промяна на стаите</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet
-Home 3D Помощ - Начало</a>
-&gt; <a class="bread" href="tocEditing.html">Промяна
-на предпочитанията, стените, мебелировката и 3D изгледа
-</a></div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr height="32" valign="bottom">
-<td height="32" width="3">&nbsp;</td>
-<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td height="32" width="8">&nbsp;&nbsp;</td>
-<td height="32" valign="bottom"><font id="topic">Промяна на стаите</font></td>
-</tr>
-<tr height="10">
-<td colspan="4" height="10">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>Можете да променяте мястото на стая в плана с мишката,
-след като я маркирате.<br>
-За да маркирате една стая в плана, цъкнете върху нея. За да маркирате
-няколко стаи или обекти в плана, очертайте маркиращ правоъгълник около
-тях
-(натискате левия бутон на мишката някъде в плана, но не върху обект и
-местите мишката, така че в получения правоъгълник да попаднат желаните
-за маркиране обекти, след което пускате бутона на мишката), и/или
-цъкайте
-върху всеки от обектите докато държите натиснат клавиша <i>shift</i>.<br>
-За да преместите маркираните обекти, поставете показалеца на мишката
-върху някой от маркираните обекти, след което завлечете с мишката и
-пуснете на новото място или ползвайте клавишите стрелки от
-клавиатурата. Забележете, че стаите не са прикрепени към стените,
-прозорците и вратите, които ги заобикалят, така че ще трябва да
-маркирате и тях ако искате да ги местите заедно със стаята.</p>
-<p>Когато е маркирана <b>една</b> стая
-в плана, ще се появят индикатори на местата, които можете да "хванете"
-и местите. Можете също да местите текстовете с името и площта на
-стаята,
-ако са видими.</p>
-<p align="center"><img src="../images/roomPoints.png" alt="Индикатори в стаята" height="378" width="306"></p>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>1. 2...</p>
-</td>
-<td>
-<p>Индикаторите точки показват местата, които можете
-да "хванете"
-и местите за да промените формата/размера на стаята.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>3.</p>
-</td>
-<td>
-<p>Индикатора на името можете да "хванете"
-и да преместите името на стаята на по-подходящо място.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>4.</p>
-</td>
-<td>
-<p>Индикатора на площта можете да "хванете"
-и да преместите подобно на името на стаята.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>Когато попадне върху някой от тези индикатори,
-показалецът
-на мишката се променя за да покаже, че сте на мястото, което можете да
-"хванете". Когато натиснете бутона на мишката ще се появят подравняващи
-линии и ще се активира
-магнетизма към местата на пресичане на стените за да ви улесни в
-намирането на ъглите на стаята
-или други ориентири.<br>
-Стаите, променяни с мишката се изобразяват едновременно в плана
-и в 3D изгледа. </p>
-<p>Името и 3D атрибутите на една стая могат да бъдат
-променяни и от нейното меню, появяващо се с двойно цъкане върху стаята
-в плана, или чрез избирането на <i>План
-&gt;&nbsp;Промени стая...</i> след като я маркирате.</p>
-<p align="center"><img src="images/editingRooms.png" height="284" width="362"></p>
-<p>В менюто на стаята Вие можете да промените името на
-маркираната стая и дали площта и да се изобразява в плана.<br>
-Може да изберете също дали пода и тавана да се изобразяват в 3D
-изгледа, и ако да, с какъв цвят и шарка.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Ако искате да промените името и 3D атрибутите на
-няколко стаи, маркирайте ги и изберете от менюто <i>План
-&gt;&nbsp;</i><i>Промени стая...</i>. Ако
-стойностите на еднакви атрибути на маркираните стаи се различават, тези
-полета в менюто ще бъдат празни.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Изберете от менюто <i>План &gt; Промени
-стила на текста </i> за да промените големината или шрифта на
-името и площта на стаята.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако искате да зададете цвят или шарка на отделни
-части от една стая, <a href="drawingRooms.html">създайте
-стая</a> за всяка отделна част и задайте техните цвят и шарка.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Повдигането на пода на стаята е винаги 0.
-Височината на тавана на стаята се изчислява за всяка точка на стаята и
-височината на всяка точка в ъглите е равна на височината на
-най-близката начална или крайна точка на стена. Това позволява да
-направите таванска стая с наклонен таван като <a href="editingWalls.html">зададете
-на стените</a> различна височина в началната и крайната точки.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Таванът на стаята е видим само отдолу. Това
-означава, че Вие ще можете да го видите в 3D изгледа само в режим <a href="editing3DView.html">Виртуална
-разходка</a>. Това позволява, когато е избран <a href="editing3DView.html">Изглед
-отгоре</a> да виждате винаги интериора, независимо дали отметката
-<i>Покажи тавана</i> в менюто <i>Характеристики
-на стаята</i> е маркирана или не.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако искате, можете да отмените магнетизма към
-местата на пресичане на стените и на ъглите на линиите, които чертаете,
-като задържите клавиша <i>shift</i> докато чертаете, или
-като забраните магнетизма в менюто <a href="editingPreferences.html">Предпочитания</a>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако в маркираните в плана обекти се включват
-стени, стаи, мебелировка, оразмерителни линии и текстове, всички тези
-обекти ще се местят с влачене и пускане или с клавишите стрелки от
-клавиатурата. Ако натиснете и задържите клавиша <i>ctrl</i>
-(или <i>alt</i> за ползващите Mac OS X) докато влачите
-тези обекти, те ще бъдат копирани.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Мярката на размерите по подразбиране в стаите,
-мрежата на плана и линиите в ляво и отгоре на плана (rulers) са тези,
-които се ползват във Вашата страна. Можете да ги промените на Инчове,
-Метри, Сантиметри или Милиметри от менюто <a href="editingPreferences.html">Предпочитания</a>.
-Ако сте избрали Инчове, площта на стаите ще се изобразява в квадратни
-футове, а в останалите случаи тя ще се изобразява в квадратни метри.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Можете да уголемявате или смалявате плана от
-менюто <i>План &gt;&nbsp;Уголеми</i> или <i>План
-&gt;&nbsp;Смали</i>. </p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Промяна на стаите</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet
+Home 3D Помощ - Начало</a>
+&gt; <a class="bread" href="tocEditing.html">Промяна
+на предпочитанията, стените, мебелировката и 3D изгледа
+</a></div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><font id="topic">Промяна на стаите</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>Можете да променяте мястото на стая в плана с мишката,
+след като я маркирате.<br>
+За да маркирате една стая в плана, цъкнете върху нея. За да маркирате
+няколко стаи или обекти в плана, очертайте маркиращ правоъгълник около
+тях
+(натискате левия бутон на мишката някъде в плана, но не върху обект и
+местите мишката, така че в получения правоъгълник да попаднат желаните
+за маркиране обекти, след което пускате бутона на мишката), и/или
+цъкайте
+върху всеки от обектите докато държите натиснат клавиша <i>shift</i>.<br>
+За да преместите маркираните обекти, поставете показалеца на мишката
+върху някой от маркираните обекти, след което завлечете с мишката и
+пуснете на новото място или ползвайте клавишите стрелки от
+клавиатурата. Забележете, че стаите не са прикрепени към стените,
+прозорците и вратите, които ги заобикалят, така че ще трябва да
+маркирате и тях ако искате да ги местите заедно със стаята.</p>
+<p>Когато е маркирана <b>една</b> стая
+в плана, ще се появят индикатори на местата, които можете да "хванете"
+и местите. Можете също да местите текстовете с името и площта на
+стаята,
+ако са видими.</p>
+<p align="center"><img src="../images/roomPoints.png" alt="Индикатори в стаята" height="378" width="306"></p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>1. 2...</p>
+</td>
+<td>
+<p>Индикаторите точки показват местата, които можете
+да "хванете"
+и местите за да промените формата/размера на стаята.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>3.</p>
+</td>
+<td>
+<p>Индикатора на името можете да "хванете"
+и да преместите името на стаята на по-подходящо място.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>4.</p>
+</td>
+<td>
+<p>Индикатора на площта можете да "хванете"
+и да преместите подобно на името на стаята.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>Когато попадне върху някой от тези индикатори,
+показалецът
+на мишката се променя за да покаже, че сте на мястото, което можете да
+"хванете". Когато натиснете бутона на мишката ще се появят подравняващи
+линии и ще се активира
+магнетизма към местата на пресичане на стените за да ви улесни в
+намирането на ъглите на стаята
+или други ориентири.<br>
+Стаите, променяни с мишката се изобразяват едновременно в плана
+и в 3D изгледа. </p>
+<p>Името и 3D атрибутите на една стая могат да бъдат
+променяни и от нейното меню, появяващо се с двойно цъкане върху стаята
+в плана, или чрез избирането на <i>План
+&gt;&nbsp;Промени стая...</i> след като я маркирате.</p>
+<p align="center"><img src="images/editingRooms.png" height="284" width="362"></p>
+<p>В менюто на стаята Вие можете да промените името на
+маркираната стая и дали площта и да се изобразява в плана.<br>
+Може да изберете също дали пода и тавана да се изобразяват в 3D
+изгледа, и ако да, с какъв цвят и шарка.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Ако искате да промените името и 3D атрибутите на
+няколко стаи, маркирайте ги и изберете от менюто <i>План
+&gt;&nbsp;</i><i>Промени стая...</i>. Ако
+стойностите на еднакви атрибути на маркираните стаи се различават, тези
+полета в менюто ще бъдат празни.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Изберете от менюто <i>План &gt; Промени
+стила на текста </i> за да промените големината или шрифта на
+името и площта на стаята.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако искате да зададете цвят или шарка на отделни
+части от една стая, <a href="drawingRooms.html">създайте
+стая</a> за всяка отделна част и задайте техните цвят и шарка.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Повдигането на пода на стаята е винаги равно на повдигането на нивото на 
+етажа, към който принадлежи ( и е 0 ако не са добавени етажи в плана). Ако 
+стаята не е на <b>последния етаж</b>, височината на тавана на стаята е равна 
+на повдигането + височината на етажа, към който принадлежи.Ако е на 
+последния етаж, височината на тавана се изчислява за всяка точка на стаята и
+височината на всяка точка в ъглите е равна на височината на
+най-близката начална или крайна точка на стена. Това позволява да
+направите таванска стая с наклонен таван като <a 
+href="editingWalls.html">зададете
+на стените</a> различна височина в началната и крайната точки.</p></td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Таванът на стаята е видим само отдолу. Това
+означава, че Вие ще можете да го видите в 3D изгледа само в режим <a href="editing3DView.html">Виртуална
+разходка</a>. Това позволява, когато е избран <a href="editing3DView.html">Изглед
+отгоре</a> да виждате винаги интериора, независимо дали отметката
+<i>Покажи тавана</i> в менюто <i>Характеристики
+на стаята</i> е маркирана или не.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако искате, можете да отмените магнетизма към
+местата на пресичане на стените и на ъглите на линиите, които чертаете,
+като задържите клавиша <i>shift</i> докато чертаете, или
+като забраните магнетизма в менюто <a href="editingPreferences.html">Предпочитания</a>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако в маркираните в плана обекти се включват
+стени, стаи, мебелировка, оразмерителни линии и текстове, всички тези
+обекти ще се местят с влачене и пускане или с клавишите стрелки от
+клавиатурата. Ако натиснете и задържите клавиша <i>ctrl</i>
+(или <i>alt</i> за ползващите Mac OS X) докато влачите
+тези обекти, те ще бъдат копирани.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Мярката на размерите по подразбиране в стаите,
+мрежата на плана и линиите в ляво и отгоре на плана (rulers) са тези,
+които се ползват във Вашата страна. Можете да ги промените на Инчове,
+Метри, Сантиметри или Милиметри от менюто <a href="editingPreferences.html">Предпочитания</a>.
+Ако сте избрали Инчове, площта на стаите ще се изобразява в квадратни
+футове, а в останалите случаи тя ще се изобразява в квадратни метри.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Можете да уголемявате или смалявате плана от
+менюто <i>План &gt;&nbsp;Уголеми</i> или <i>План
+&gt;&nbsp;Смали</i>. </p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </body></html>
\ No newline at end of file
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/images/editingLevels.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/images/editingLevels.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/importingBackground.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/importingBackground.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/importingBackground.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/importingBackground.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,193 +1,202 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Импортиране на изображение за фон</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet
-Home 3D Помощ - Начало</a>
-&gt; <a class="bread" href="tocImporting.html">Импортиране
-на изображение за фон и на мебелировка</a> </div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr height="32" valign="bottom">
-<td height="32" width="3">&nbsp;</td>
-<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td height="32" width="8">&nbsp;&nbsp;</td>
-<td height="32" valign="bottom"><span style="font-weight: bold;">Импортиране на изображение за фон</span></td>
-</tr>
-<tr height="10">
-<td colspan="4" height="10">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>За да импортирате
-изображение за фон в плана, улесняващо <a href="drawingWalls.html">създаването
-на стените</a>, изберете <i>План &gt;
-Импортирай изображение за фон...</i>.<br>
-Така ще стартирате помощник и с няколко стъпки ще импортирате желаното
-изображение.</p>
-<table align="center" border="0" cellpadding="0" cellspacing="5">
-<tbody>
-<tr>
-<td><img src="../images/importingBackgroundStep1.png" alt="Стъпка 1" height="174" width="250"></td>
-<td><img src="../images/importingBackgroundStep2.png" alt="Стъпка 2" height="173" width="250"></td>
-</tr>
-<tr align="center">
-<td><img src="../images/importingBackgroundStep3.png" alt="Стъпка 3" height="174" width="250"></td>
-<td><img src="../images/importingBackgroundStep4.png" alt="Стъпка 4" height="174" width="250"></td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>1.</p>
-</td>
-<td>
-<p>Завлечете и пуснете файла с изображението в
-рамката
-показана в помощника, или цъкнете <i>Избор на изображение</i>
-и
-посочете BMP, JPEG, GIF или PNG файл.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>2.</p>
-</td>
-<td>
-<p>След като изображението се зареди, цъкнете <i>Продължи</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>3.</p>
-</td>
-<td>
-<p>Определете мащаба на изображението като преместите
-крайните точки на начертаната линия върху изображението по такъв
-начин, че тази линия да съвпадне с размер, който Ви е известен. След
-това напишете реалната дължина в полето <i>Дължина на размера</i>
-и цъкнете <i>Продължи</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>4.</p>
-</td>
-<td>
-<p>Задайте разположението на точката с координати (0,
-0) на нашия план като цъкнете в изображението или като зададете
-стойностите по X и Y. След това цъкнете <i>Край</i>.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>След като помощникът се затвори, изображението ще се
-появи като фон на нашия план и можете да започнете <a href="drawingWalls.html">създаването
-на стените</a>.</p>
-<table align="center" border="0" cellpadding="0" cellspacing="5">
-<tbody>
-<tr align="center">
-<td><img src="../images/importingBackgroundStep5.png" height="270" width="200"></td>
-<td rowspan="2">&nbsp;&nbsp;&nbsp;</td>
-<td><img src="../images/importingBackgroundStep6.png" height="270" width="200"></td>
-</tr>
-<tr>
-<td align="center" valign="top">Преди
-начертаването на стените</td>
-<td align="center" valign="top">След
-поставянето на стените,<br>
-вратите и прозорците</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За по-прецизното определяне на мащаба на
-изображението в стъпка 3, можете да уголемите изображението
-като уголемите прозореца на помощника.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Избягвайте да импортирате твърде големи файлове.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Когато импортирате сканирано изображение на Вашия
-план, убедете се, че изображението не е завъртяно при сканирането. При
-наличие на завъртане, стените от изображението и тези, които Вие
-създавате няма да са успоредни.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Мярката на размерите, изписани в панела на
-помощника
-е тази,
-която се ползва във Вашата страна. Вие можете да я
-промените на Инчове, Метри, Сантиметри или Милиметри от менюто <a href="editingPreferences.html">Предпочитания</a>.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Импортиране на изображение за фон</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet
+Home 3D Помощ - Начало</a>
+&gt; <a class="bread" href="tocImporting.html">Импортиране
+на изображение за фон и на мебелировка</a> </div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><span style="font-weight: bold;">Импортиране на изображение за фон</span></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>За да импортирате
+изображение за фон в плана, улесняващо <a href="drawingWalls.html">създаването
+на стените</a>, изберете <i>План &gt;
+Импортирай изображение за фон...</i>.<br>
+Така ще стартирате помощник и с няколко стъпки ще импортирате желаното
+изображение.</p>
+<table align="center" border="0" cellpadding="0" cellspacing="5">
+<tbody>
+<tr>
+<td><img src="../images/importingBackgroundStep1.png" alt="Стъпка 1" height="174" width="250"></td>
+<td><img src="../images/importingBackgroundStep2.png" alt="Стъпка 2" height="173" width="250"></td>
+</tr>
+<tr align="center">
+<td><img src="../images/importingBackgroundStep3.png" alt="Стъпка 3" height="174" width="250"></td>
+<td><img src="../images/importingBackgroundStep4.png" alt="Стъпка 4" height="174" width="250"></td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>1.</p>
+</td>
+<td>
+<p>Завлечете и пуснете файла с изображението в
+рамката
+показана в помощника, или цъкнете <i>Избор на изображение</i>
+и
+посочете BMP, JPEG, GIF или PNG файл.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>2.</p>
+</td>
+<td>
+<p>След като изображението се зареди, цъкнете <i>Продължи</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>3.</p>
+</td>
+<td>
+<p>Определете мащаба на изображението като преместите
+крайните точки на начертаната линия върху изображението по такъв
+начин, че тази линия да съвпадне с размер, който Ви е известен. След
+това напишете реалната дължина в полето <i>Дължина на размера</i>
+и цъкнете <i>Продължи</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>4.</p>
+</td>
+<td>
+<p>Задайте разположението на точката с координати (0,
+0) на нашия план като цъкнете в изображението или като зададете
+стойностите по X и Y. След това цъкнете <i>Край</i>.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>След като помощникът се затвори, изображението ще се
+появи като фон на нашия план и можете да започнете <a href="drawingWalls.html">създаването
+на стените</a>.</p>
+<table align="center" border="0" cellpadding="0" cellspacing="5">
+<tbody>
+<tr align="center">
+<td><img src="../images/importingBackgroundStep5.png" height="270" width="200"></td>
+<td rowspan="2">&nbsp;&nbsp;&nbsp;</td>
+<td><img src="../images/importingBackgroundStep6.png" height="270" width="200"></td>
+</tr>
+<tr>
+<td align="center" valign="top">Преди
+начертаването на стените</td>
+<td align="center" valign="top">След
+поставянето на стените,<br>
+вратите и прозорците</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За по-прецизното определяне на мащаба на
+изображението в стъпка 3, можете да уголемите изображението
+като уголемите прозореца на помощника.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Избягвайте да импортирате твърде големи файлове.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Когато импортирате сканирано изображение на Вашия
+план, убедете се, че изображението не е завъртяно при сканирането. При
+наличие на завъртане, стените от изображението и тези, които Вие
+създавате няма да са успоредни.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Всеки <a href="addingLevels.html">етаж</a> от дома може да има свое 
+собствено изображение за фон.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Мярката на размерите, изписани в панела на
+помощника
+е тази,
+която се ползва във Вашата страна. Вие можете да я
+промените на Инчове, Метри, Сантиметри или Милиметри от менюто <a href="editingPreferences.html">Предпочитания</a>.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/importingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/importingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/importingFurniture.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/importingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,239 +1,251 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html;charset=utf-8"><title>Импортиране на мебелировка</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet Home 3D Помощ - Начало</a>
-&gt; <a class="bread" href="tocImporting.html">Импортиране
-на изображение за фон и на мебелировка
-</a> </div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr height="32" valign="bottom">
-<td height="32" width="3">&nbsp;</td>
-<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td height="32" width="8">&nbsp;&nbsp;</td>
-<td height="32" valign="bottom"><font id="topic">Импортиране на мебелировка</font></td>
-</tr>
-<tr height="10">
-<td colspan="4" height="10">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>За да импортирате съществуващ 3D модел в каталога с
-мебелировка и/или в плана, изберете менюто <i>Мебелировка
-&gt;&nbsp;Импортиране на мебелировка...,</i> цъкнете
-върху инструмента <i>Импортиране на мебелировка</i>
-или довлечете и пуснете файл с 3D модел в прозореца на Sweet Home 3D.</p>
-<blockquote>
-<p><img src="../images/importFurnitureTool.png" alt="Инструмент Импортиране на мебелировка" align="middle" height="24" width="24">&nbsp;Инструмент <i>Импортиране
-на мебелировка</i></p>
-</blockquote>
-<p>
-Така ще стартирате помощник и с няколко стъпки ще импортирате желания
-3D модел. </p>
-<table align="center" border="0" cellpadding="0" cellspacing="5">
-<tbody>
-<tr>
-<td><img src="../images/importingFurnitureStep1.png" alt="Стъпка 1" height="199" width="250"></td>
-<td><img src="../images/importingFurnitureStep2.png" alt="Стъпка 2" height="200" width="250"></td>
-</tr>
-<tr>
-<td><img src="../images/importingFurnitureStep3.png" alt="Стъпка 3" height="200" width="250"></td>
-<td><img src="../images/importingFurnitureStep4.png" alt="Стъпка 4" height="200" width="250"></td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>1.</p>
-</td>
-<td>
-<p>Цъкнете върху <i>Избор на модел</i>
-и изберете файл във формат OBJ, DAE, 3DS, LWS или ZIP файл, съдържащ файл от
-посочения тип. След като моделът се зареди, цъкнете <i>Продължи</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>2.</p>
-</td>
-<td>
-<p>Със стрелките ориентирайте модела по такъв начин,
-че да виждате лицето му в съответното поле. Понякога се случва лицето и
-гърба на модела да са разменени. В такъв случай цъкнете отметката
-<i>Размени лицето и гърба</i>.<br>
-Когато сте готови, цъкнете <i>Продължи</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>3.</p>
-</td>
-<td>
-<p>Ако е необходимо, сменете името, размерите,
-повдигането, или цвета на импортирания модел, дали ще е подвижен и дали
-е врата или прозорец.<br>
-Ако желаете 3D модела да бъде импортиран и в някой от каталозите,
-маркирайте <i>Постави в каталог</i> и изберете
-името на каталога, в който да бъде импортиран.<br>
-Махнете отметката на <i>Спази пропорциите</i> ако
-искате да променяте размерите на модела независимо един от друг.<br>
-Цъкнете върху <i>Премахни цвета</i> ако
-предпочитате да запазите оригиналните цветове на модела.<br>
-Когато сте готови, цъкнете <i>Продължи</i>. </p>
-</td>
-</tr>
-<tr valign="top">
-<td nowrap="nowrap">
-<p>4.</p>
-</td>
-<td>
-<p>Завъртете 3D модела с мишката така, че да си
-харесате изображение, което ще се използва като икона в каталога и в
-плана. След това цъкнете върху <i>Край</i>.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>След като помощникът се затвори, импортираният модел ще
-се появи в каталога и/или в плана и списъка с поставени в плана обекти,
-в зависимост от това, което сте избрали.<br>
-Вие можете да <a href="editingFurniture.html">променяте</a>
-импортираните модели, поставени в плана, по същия начин, както и тези
-от вградения каталог.<br>
-В каталозите, имената на импортираните обекти се
-изписват с курсив. За да редактирате характеристиките на импортиран
-модел чрез помощника за импортиране, цъкнете двойно върху него, или го
-маркирайте и изберете <i>Мебелировка
-&gt;&nbsp;Промени...</i>.<br>
-</p>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Импортирането на 3D модел с влачене и пускане на
-файла
-в прозореца на Sweet Home 3D може да не работи в Linux.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>В дадена категория на каталога с мебелировка не
-може да има два обекта с еднакви имена. Бутонът <i>Продължи</i>
-в третата
-стъпка на помощника за импортиране ще бъде забранен ако в каталога вече
-има обект с име, като това на импортирания в момента. Задайте друго име
-на импортирания обект.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>В текстовото поле <i> Име на каталога:</i>
-можете да напишете ново име, с което ще създадете нов каталог
-с мебелировка.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Импортирането на 3D модел в каталог <b>или</b>
-в плана зависи от това, дали когато сте избрали <i>Мебелировка
-&gt;&nbsp;Импортиране на мебелировка...</i> на фокус е
-бил каталог или не. Ако на фокус е бил списъка с поставени в плана
-обекти, плана или 3D изгледа, импортираният модел ще се появи в каталог
-само ако маркирате отметката <i>Постави в каталог</i> в
-третата стъпка на помощника.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Мярката на размерите, изписани в панела на
-помощника
-е тази,
-която се ползва във Вашата страна. Вие можете да я
-промените на Инчове, Метри, Сантиметри или Милиметри от менюто <a href="editingPreferences.html">Предпочитания</a>. </p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Тъй като каталогът с мебелировка е общ за всички
+<html><head>
+<meta http-equiv="content-type" content="text/html;charset=utf-8"><title>Импортиране на мебелировка</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet Home 3D Помощ - Начало</a>
+&gt; <a class="bread" href="tocImporting.html">Импортиране
+на изображение за фон и на мебелировка
+</a> </div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><font id="topic">Импортиране на мебелировка</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>За да импортирате съществуващ 3D модел в каталога с
+мебелировка и/или в плана, изберете менюто <i>Мебелировка
+&gt;&nbsp;Импортиране на мебелировка...,</i> цъкнете
+върху инструмента <i>Импортиране на мебелировка</i>
+или довлечете и пуснете файл с 3D модел в прозореца на Sweet Home 3D.</p>
+<blockquote>
+<p><img src="../images/importFurnitureTool.png" alt="Инструмент Импортиране на мебелировка" align="middle" height="24" width="24">&nbsp;Инструмент <i>Импортиране
+на мебелировка</i></p>
+</blockquote>
+<p>
+Така ще стартирате помощник и с няколко стъпки ще импортирате желания
+3D модел. </p>
+<table align="center" border="0" cellpadding="0" cellspacing="5">
+<tbody>
+<tr>
+<td><img src="../images/importingFurnitureStep1.png" alt="Стъпка 1" height="199" width="250"></td>
+<td><img src="../images/importingFurnitureStep2.png" alt="Стъпка 2" height="200" width="250"></td>
+</tr>
+<tr>
+<td><img src="../images/importingFurnitureStep3.png" alt="Стъпка 3" height="200" width="250"></td>
+<td><img src="../images/importingFurnitureStep4.png" alt="Стъпка 4" height="200" width="250"></td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>1.</p>
+</td>
+<td>
+<p>Цъкнете върху <i>Избор на модел</i>
+и изберете файл във формат OBJ, DAE, 3DS, LWS или ZIP файл, съдържащ файл от
+посочения тип. След като моделът се зареди, цъкнете <i>Продължи</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>2.</p>
+</td>
+<td>
+<p>Със стрелките ориентирайте модела по такъв начин,
+че да виждате лицето му в съответното поле. Понякога се случва лицето и
+гърба на модела да са разменени. В такъв случай цъкнете отметката
+<i>Размени лицето и гърба</i>.<br>
+Когато сте готови, цъкнете <i>Продължи</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>3.</p>
+</td>
+<td>
+<p>Ако е необходимо, сменете името, размерите,
+повдигането, или цвета на импортирания модел, дали ще е подвижен и дали
+е врата или прозорец.<br>
+Ако желаете 3D модела да бъде импортиран и в някой от каталозите,
+маркирайте <i>Постави в каталог</i> и изберете
+името на каталога, в който да бъде импортиран.<br>
+Махнете отметката на <i>Спази пропорциите</i> ако
+искате да променяте размерите на модела независимо един от друг.<br>
+Цъкнете върху <i>Премахни цвета</i> ако
+предпочитате да запазите оригиналните цветове на модела.<br>
+Когато сте готови, цъкнете <i>Продължи</i>. </p>
+</td>
+</tr>
+<tr valign="top">
+<td nowrap="nowrap">
+<p>4.</p>
+</td>
+<td>
+<p>Завъртете 3D модела с мишката така, че да си
+харесате изображение, което ще се използва като икона в каталога и в
+плана. След това цъкнете върху <i>Край</i>.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>След като помощникът се затвори, импортираният модел ще
+се появи в каталога и/или в плана и списъка с поставени в плана обекти,
+в зависимост от това, което сте избрали.<br>
+Вие можете да <a href="editingFurniture.html">променяте</a>
+импортираните модели, поставени в плана, по същия начин, както и тези
+от вградения каталог.<br>
+В каталозите, имената на импортираните обекти се
+изписват с курсив. За да редактирате характеристиките на импортиран
+модел чрез помощника за импортиране, цъкнете двойно върху него, или го
+маркирайте и изберете <i>Мебелировка
+&gt;&nbsp;Промени...</i>.<br>
+</p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Импортирането на 3D модел с влачене и пускане на
+файла
+в прозореца на Sweet Home 3D може да не работи в Linux.</p>
+</td>
+</tr>
+<tr valign="top">
+  <td><p>•</p></td>
+  <td><p>Ако желаете да въртите модела на стъпки от по 1° вместо по 90°, дръжте  натиснат клавиша shift докато цъкате с мишката върху бутоните-стрелки в  стъпка 2.</p></td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>В дадена категория на каталога с мебелировка не
+може да има два обекта с еднакви имена. Бутонът <i>Продължи</i>
+в третата
+стъпка на помощника за импортиране ще бъде забранен ако в каталога вече
+има обект с име, като това на импортирания в момента. Задайте друго име
+на импортирания обект.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>В текстовото поле <i> Име на каталога:</i>
+можете да напишете ново име, с което ще създадете нов каталог
+с мебелировка.</p>
+</td>
+</tr>
+<tr valign="top">
+  <td><p>•</p></td>
+  <td><p>Когато магнетизмът е активен, само вратите и прозорците могат да бъдат поставяни в стените с мишката и само за тях в стените  автоматично се правят отвори. Поради това, не забравяйте да маркирате отметката <i>Врата или прозорец</i> при импортирането на  обект, ако желаете той да има това свойство.</p></td>
+</tr>
+<tr valign="top">
+  <td><p>•</p></td>
+  <td><p>Само за стълбищата може автоматично да се създава отвор в тавана (пода на горния етаж). Затова, не забравяйте да поставяте отметката  <i>Стълбище</i> при импортирането на такъв обект, за да има той това свойство.</p></td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Импортирането на 3D модел в каталог <b>или</b>
+в плана зависи от това, дали когато сте избрали <i>Мебелировка
+&gt;&nbsp;Импортиране на мебелировка...</i> на фокус е
+бил каталог или не. Ако на фокус е бил списъка с поставени в плана
+обекти, плана или 3D изгледа, импортираният модел ще се появи в каталог
+само ако маркирате отметката <i>Постави в каталог</i> в
+третата стъпка на помощника.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Мярката на размерите, изписани в панела на
+помощника
+е тази,
+която се ползва във Вашата страна. Вие можете да я
+промените на Инчове, Метри, Сантиметри или Милиметри от менюто <a href="editingPreferences.html">Предпочитания</a>. </p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Тъй като каталогът с мебелировка е общ за всички
 прозорци на Sweet Home 3D, 
-операциите, направени в него (като импорт, промяна или изтриване)
-не могат да бъдат отказани. </p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Характеристиките на импортиран каталог с
-мебелировка автоматично се записват в предпочитанията и техните файлове
-с 3D модели и икони се записват в папки, специфични за Sweet Home 3D.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
+операциите, направени в него (като импорт, промяна или изтриване)
+не могат да бъдат отказани. </p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Характеристиките на импортиран каталог с
+мебелировка автоматично се записват в предпочитанията и техните файлове
+с 3D модели и икони се записват в папки, специфични за Sweet Home 3D.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/printingHome.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/printingHome.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/printingHome.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/printingHome.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,168 +1,175 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Отпечатване на план</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet
-Home 3D Помощ - Начало</a>
-&gt; <a class="bread" href="tocCreating.html">Създаване
-на планове, стени, мебелировка</a></div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr height="32" valign="bottom">
-<td height="32" width="3">&nbsp;</td>
-<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td height="32" width="8">&nbsp;&nbsp;</td>
-<td height="32" valign="bottom"><font id="topic">Отпечатване на план</font></td>
-</tr>
-<tr height="10">
-<td colspan="4" height="10">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>За да отпечатате плана, изберете <i>Файл
-&gt;&nbsp;Отпечатване...</i>.<br>
-От появилото се меню ще можете да изберете принтер, страниците, които
-да бъдат отпечатани и други.</p>
-<p>По подразбиране, Sweet Home 3D отпечатва списъка с
-поставените в плана обекти, плана и 3D изгледа в момента, ползвайки
-настройките по подразбиране за големината на страницата, границите и
-ориентацията на листа.<br>
-Ако искате да промените тези настройки, изберете <i>Файл
-&gt;&nbsp;Настройка на страниците...</i>.</p>
-<p align="center"><img src="images/pageSetup.png" alt="Настройки на листа за печат" height="263" width="255"></p>
-<p> В менюто <i>Настройки на листа за печат</i>,
-можете да промените големината на листа и
-ориентацията му като цъкнете върху <i>Формат на листа</i>.
-Можете да зададете поотделно да се печатат ли списъка с поставените
-обекти, плана и 3D изгледа, или не. Ако не искате мащабирането на плана
-да е автоматично с цел най-добро побиране в границите на листа, можете
-да зададете друг мащабиране от полето <i>Мащабиране 1:</i>.<br>
-Можете също да зададете поставянето на надписи отгоре (header) и/или
-отдолу (footer) на всеки от отпечатаните листове. В полетата <i>
-Header</i> и <i>Footer</i> можете да въведете
-свободен
-текст, а също и някои променливи, които ще бъдат заменяни от стойността
-им, по време на отпечатването. Към момента са налични следните седем
-променливи:</p>
-<ul>
-<li><i>$pageNumber</i> за номериране на
-страниците,</li>
-<li><i>$pageCount</i> за общия брой страници,</li>
-<li><i>$planScale</i> за мащабирането на
-плана
-(независимо дали е изчислено автоматично, или е зададено в
-полето <i>Мащабиране 1:</i>),</li>
-<li><i>$date</i> за датата, когато сте
-стартирали отпечатването,</li>
-<li><i>$time</i> за часа, в който сте
-стартирали отпечатването,</li>
-<li><i>$name</i> за името на плана,</li>
-<li><i>$file</i> за пътя до файла, съдържащ
-плана.</li>
-</ul>
-<p>За да избегнете писането на имената на променливите,
-ползвайте съответните бутони, изобразени под полетата <i>Header</i>
-и <i>Footer</i>. Тъй като знакът $ е специален за тези
-променливи, въведете <i>$$</i> ако искате да отпечатате
-един знак $.</p>
-<p>Преди да отпечатате плана, можете да видите как ще
-изглеждат отпечатаните страници,
-като изберете от менюто <i>Файл &gt; Преглед...</i>.</p>
-<p align="center"><img src="images/printPreview.png" alt="Изглед преди отпечатване" height="296" width="314"></p>
-<p>В панела <i>Изглед преди отпечатване</i>,
-ще видите как планът
-ще бъде отпечатан на листа. За да разгледате всички страници, цъкайте
-върху
-стрелките отгоре или ползвайте клавишите стрелки от клавиатурата.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<div id="taskbox">
-<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
-<tbody>
-<tr bgcolor="#eeeeee" valign="top">
-<td bgcolor="#eeeeee" width="98%">
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Функцията Отпечатване може да не е достъпна в
-Linux. В такъв случай, моля ползвайте <i>Файл
-&gt;&nbsp;Отпечатване в PDF...</i> , след което
-отпечатайте създадения PDF файл.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Отпечатването на 3D изгледа може да е недостъпно
-поради ограничения в конфигурацията на системата Ви. В този случай
-отметката <i>Печатай 3D изгледа</i> няма
-да е отбелязана и ще е недостъпна.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>3D изгледа на плана се отпечатва винаги с 150
-dpi (точки на инч) и по такъв начин, че да запълни една страница до
-границите на отпечатването.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Можете да отпечатате линеен мащаб като начертаете
-в плана <a href="drawingDimensions.html">Оразмерителна
-линия</a> със стандартна дължина (например 1 метър).</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Настройките на страниците, които сте
-променили, <a href="savingHome.html">се
-записват</a>
-във файла заедно с плана.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Панелът <i>Изглед преди отпечатване</i>
-може да бъде уголемяван.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Отпечатване на план</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet
+Home 3D Помощ - Начало</a>
+&gt; <a class="bread" href="tocCreating.html">Създаване
+на планове, стени, мебелировка</a></div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr height="32" valign="bottom">
+<td height="32" width="3">&nbsp;</td>
+<td height="32" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td height="32" width="8">&nbsp;&nbsp;</td>
+<td height="32" valign="bottom"><font id="topic">Отпечатване на план</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>За да отпечатате плана, изберете <i>Файл
+&gt;&nbsp;Отпечатване...</i>.<br>
+От появилото се меню ще можете да изберете принтер, страниците, които
+да бъдат отпечатани и други.</p>
+<p>По подразбиране, Sweet Home 3D отпечатва списъка с
+поставените в плана обекти, плана и 3D изгледа в момента, ползвайки
+настройките по подразбиране за големината на страницата, границите и
+ориентацията на листа.<br>
+Ако искате да промените тези настройки, изберете <i>Файл
+&gt;&nbsp;Настройка на страниците...</i>.</p>
+<p align="center"><img src="images/pageSetup.png" alt="Настройки на листа за печат" height="263" width="255"></p>
+<p> В менюто <i>Настройки на листа за печат</i>,
+можете да промените големината на листа и
+ориентацията му като цъкнете върху <i>Формат на листа</i>.
+Можете да зададете поотделно да се печатат ли списъка с поставените
+обекти, плана и 3D изгледа, или не. Ако не искате мащабирането на плана
+да е автоматично с цел най-добро побиране в границите на листа, можете
+да зададете друг мащабиране от полето <i>Мащабиране 1:</i>.<br>
+Можете също да зададете поставянето на надписи отгоре (header) и/или
+отдолу (footer) на всеки от отпечатаните листове. В полетата <i>
+Header</i> и <i>Footer</i> можете да въведете
+свободен
+текст, а също и някои променливи, които ще бъдат заменяни от стойността
+им, по време на отпечатването. Към момента са налични следните седем
+променливи:</p>
+<ul>
+<li><i>$pageNumber</i> за номериране на
+страниците,</li>
+<li><i>$pageCount</i> за общия брой страници,</li>
+<li><i>$planScale</i> за мащабирането на
+плана
+(независимо дали е изчислено автоматично, или е зададено в
+полето <i>Мащабиране 1:</i>),</li>
+<li><i>$date</i> за датата, когато сте
+стартирали отпечатването,</li>
+<li><i>$time</i> за часа, в който сте
+стартирали отпечатването,</li>
+<li><i>$name</i> за името на плана,</li>
+<li><i>$file</i> за пътя до файла, съдържащ
+плана.</li>
+</ul>
+<p>За да избегнете писането на имената на променливите,
+ползвайте съответните бутони, изобразени под полетата <i>Header</i>
+и <i>Footer</i>. Тъй като знакът $ е специален за тези
+променливи, въведете <i>$$</i> ако искате да отпечатате
+един знак $.</p>
+<p>Преди да отпечатате плана, можете да видите как ще
+изглеждат отпечатаните страници,
+като изберете от менюто <i>Файл &gt; Преглед...</i>.</p>
+<p align="center"><img src="images/printPreview.png" alt="Изглед преди отпечатване" height="296" width="314"></p>
+<p>В панела <i>Изглед преди отпечатване</i>,
+ще видите как планът
+ще бъде отпечатан на листа. За да разгледате всички страници, цъкайте
+върху
+стрелките отгоре или ползвайте клавишите стрелки от клавиатурата.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<div id="taskbox">
+<table bgcolor="#eeeeee" border="0" cellpadding="7" cellspacing="0" width="100%">
+<tbody>
+<tr bgcolor="#eeeeee" valign="top">
+<td bgcolor="#eeeeee" width="98%">
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Функцията Отпечатване може да не е достъпна в
+Linux. В такъв случай, моля ползвайте <i>Файл
+&gt;&nbsp;Отпечатване в PDF...</i> , след което
+отпечатайте създадения PDF файл.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Отпечатването на 3D изгледа може да е недостъпно
+поради ограничения в конфигурацията на системата Ви. В този случай
+отметката <i>Печатай 3D изгледа</i> няма
+да е отбелязана и ще е недостъпна.</p>
+</td>
+</tr>
+<tr valign="top">
+  <td><p>•</p></td>
+  <td><p>Ако планът, който ще отпечатвате, съдържа повече от един <a href="addingLevels.html">етаж</a>, списъкът с обекти, който ще бъде 
+отпечатан, ще съдържа само обектите, разположени на избрания в момента етаж, освен ако не поискате да отпечатате само този списък. 
+Тогава ще бъде отпечатан списък на цялото обзавеждане. Отпечатаният план и 3D изглед ще са на този етаж, който виждате в момента на 
+екрана. За да отпечатате план или 3D изглед на няколко от етажите, ще трябва да ги избирате и отпечатвате един по един.</p></td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>3D изгледа на плана се отпечатва винаги с 150
+dpi (точки на инч) и по такъв начин, че да запълни една страница до
+границите на отпечатването.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Можете да отпечатате линеен мащаб като начертаете
+в плана <a href="drawingDimensions.html">Оразмерителна
+линия</a> със стандартна дължина (например 1 метър).</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Настройките на страниците, които сте
+променили, <a href="savingHome.html">се
+записват</a>
+във файла заедно с плана.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Панелът <i>Изглед преди отпечатване</i>
+може да бъде уголемяван.</p>
+</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tips.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tips.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tips.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tips.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,448 +1,448 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Sweet Home 3D Съвети</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet
-Home 3D Помощ - начало</a> </div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr valign="bottom">
-<td width="3">&nbsp;</td>
-<td width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td width="8"><a name="anchor"></a></td>
-<td valign="bottom"><font id="topic">Съвети</font></td>
-</tr>
-<tr height="10">
-<td colspan="4" height="10">&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tbody>
-<tr>
-<td>
-<p>Тук ще намерите някои съвети, които могат да Ви помогнат
-да работите по-бързо и по-интелигентно
-със Sweet Home 3D. </p>
-<table border="0" cellpadding="4" cellspacing="0">
-<tbody>
-<tr valign="top">
-<td colspan="2">
-<p><b>Общи</b></p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ползвайте разделителите между полетата каталог,
-списък, план, 3D изглед, за да направите големината им удобна за работа.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Когато тествате рискови операции в Sweet Home 3D,
-имайте предвид, че можете да се откажете от всички с изключение на
-промените, свързани с <a href="importingFurniture.html">импортиран
-каталог</a>. </p>
-</td>
-</tr>
-<tr valign="top">
-<td colspan="2">
-<p><b>Каталог с мебелировка</b></p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За да <a href="addingFurniture.html">добавите</a>
-няколко обекта едновременно в плана, маркирайте повече обекти (с
-натиснат Shift или Ctrl) в каталога.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За да отворите категория в каталога, цъкнете
-двойно върху нея. </p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За да <a href="importingFurniture.html">промените</a>
-импортиран обект от мебелировката, цъкнете двойно върху него.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Ако имате много богат каталог с мебелировка,
-изобразяването му като <a href="editingPreferences.html">списък
-с търсене</a> може да е по-удобно за Вас. Падащият списък за
-избор на категория и полето за въвеждане на текст за търсене ще Ви
-помагат в откриването на желания обект.</p>
-</td>
-</tr>
-<tr valign="top">
-<td colspan="2">
-<p><b>Списък на поставените в плана обекти</b></p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За да сортирате обектите, цъкнете върху заглавието
-на колоната - критерий в списъка. С първото цъкване обектите ще се
-подредят във възходящ ред, с второто - в низходящ ред, а с третото
-цъкване - по реда на добавянето на обектите в плана.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За да промените подреждането на колоните в
-списъка, завлечете и пуснете заглавието на колоната.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За да откриете мястото на обект в плана,
-маркирайте обекта в списъка.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За да <a href="editingFurniture.html">промените</a>
-обект от мебелировката, цъкнете двойно върху него в списъка или в плана.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За да <a href="editingFurniture.html">промените</a>
-едновременно няколко обекта, маркирайте ги в списъка или в плана и
-изберете <i>Мебелировка &gt; Промени...</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Ако искате да променяте няколко обекта
-едновременно като един обект, маркирайте ги и изберете <i>Мебелировка
-&gt; Постави ги в група</i>. Групираните обекти може да бъдат
-местени, преоразмерявани и въртяни като един обект, който ще се появи и
-в списъка с поставени в плана обекти.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Когато работите с <i>Редактиране &gt;
-Копирай</i> или <i>Редактиране &gt; Изрежи</i>,
-маркираните обекти в списъка се копират в клипборда като текст в CSV
-формат (стойности, разделени със запетая), така че можете да ги
-поставите в текстов редактор или в електронна таблица (тази функция
-може да не работи в Linux).</p>
-</td>
-</tr>
-<tr valign="top">
-<td colspan="2">
-<p><b>План</b></p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Ако имате на разположение сканирано изображение на
-плана на жилището, започнете като го импортирате за <a href="importingBackground.html">фоново
-изображение на плана</a>. Това ускорява чертането на стените.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>За да дефинирате прецизно мащаба на импортираното
-фоново изображение, уголемете панела на помощника за импортиране.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Ако искате да зададете различни цветове от една
-страна на стена, обща за съседни стаи, разделете я на повече сегменти
-при <a href="drawingWalls.html">създаването
-и</a> или я разделете на две от менюто <i>План &gt;
-Раздели стената</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>За да начертаете трапецовидна стена на таванска
-стая с наклонен таван, <a href="editingWalls.html">задайте</a>
-различни височини на началната и на крайната точки на стената.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Когато работите с <i>Редактиране &gt;
-Копирай</i> или <i>Редактиране &gt; Изрежи</i>,
-маркираните обекти в плана се копират в клипборда като изображения,
-които можете да поставите в други приложения (тази функция може да не
-работи в Linux). Ако Ви е нужно изображение на плана във формат
-векторна графика, изберете от менюто <i>План &gt;
-Експортирай във формат SVG...</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За да преместите маркирания обект прецизно,
-ползвайте клавишите-стрелки от клавиатурата.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Заключете основния план, за да маркирате и
-променяте <a href="editingFurniture.html">мебелировката</a>
-без да се притеснявате, че ще промените елемент от друг тип в плана.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако искате да маркирате в плана обект, който е
-скрит от други обекти, маркирайте го в списъка с обекти. Може да го
-маркирате и с маркиращ правоъгълник, след което да отмаркирате видимите
-обекти (като държите натиснат <i>shift</i> и ги цъкате).</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Използвайте линийките за подравняване. Това помага
-за прецизното чертане на стени, стаи и оразмерителни линии.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>За да дублирате в плана маркирани обекти,
-натиснете и задръжте клавиша <i>ctrl</i> (или <i>alt</i>
-за ползващите Mac OS X) докато ги влачите.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Магнетизмът, включен в менюто <a href="editingPreferences.html">Предпочитания</a>,
-можете да отмените временно чрез задържане на клавиша <i>shift</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>За по-лесното чертане на стени и поставяне на
-мебелировка, <a href="editing3DView.html">променете
-в 3D изгледа</a> гледната точка и/или прозрачността на стените.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако искате да подравните няколко обекта,
-маркирайте ги и изберете необходимото от менюто <i>Мебелировка
-&gt; Подравни</i>. Обектите ще се подравнят според обекта,
-който сте маркирали първи.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>За да местите лесно видимата част на плана,
-изберете от менюто <i>План &gt; Местене с ръка</i> или
-цъкнете върху бутона <i>Местене с ръка</i> от лентата с
-инструменти. Когато сте в друг режим, можете да активирате временно
-този режим, чрез натискане и задържане на клавиша <i>space</i>.</p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Изберете <i>План &gt; Уголеми</i>
-или <i>План &gt; Смали</i> за да уголемите или смалите
-плана, или въртете колелцето на мишката с натиснат и задържан клавиш <i>ctrl</i>
-(или <i>cmd</i> под Mac OS X).</p>
-</td>
-</tr>
-<tr valign="top">
-<td colspan="2">
-<p><b>3D изглед</b></p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Изберете <i>3D изглед &gt; Покажи в
-отделен прозорец</i> за да изнесете 3D изображението в отделен
-прозорец на екрана или да го преместите на втори монитор. За да върнете
-3D изображението в основния прозорец, изберете <i>3D изглед
-&gt; Покажи в основния прозорец</i> или затворете прозореца с
-3D изображението.</p>
-</td>
-</tr>
-<tr>
-<td>
-<p>•</p>
-</td>
-<td>Натиснете клавиша <i>Shift</i> за да
-увеличите ефекта от
-движението на мишката и колелцето и, когато показалецът и е в
-полето с 3D изгледа.</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p> Ако не можете да видите някои от обектите в някои
-стаи, <a href="editing3DView.html">променете</a>
-прозрачността на стените. </p>
-</td>
-</tr>
-<tr valign="top">
-<td width="16">
-<p>•</p>
-</td>
-<td>
-<p>Ако някои стени, настилки или мебелировка са
-твърде ярки, <a href="editing3DView.html">променете</a>
-яркостта на осветлението. </p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>
-<p>Ако се "изгубите" и не знаете къде се намира
-виртуалният посетител, завъртете скрол колелцето с показалец на мишката
-в 3D изгледа. Това автоматично ще маркира и покаже виртуалния посетител
-в плана.</p>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>Записвайте основните гледни точки от менюто <i>3D
-изглед &gt; Запис на гледната точка...</i> и после ще можете
-бързо да се връщате в тях като ги избирате от менюто <i>3D
-изглед &gt; Избор на гледна точка</i>. Часът, датата и вида
-обектив, зададени в прозореца <i>Създаване на снимки</i>
-се записват заедно с координатите на гледната точка.<br>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>По подразбиране, изображенията, генерирани
-в двата режима с високо качество чрез <i>Създаване на снимки</i>
-и <i>Създаване на филми</i> са осветени от лампи,
-поставени в средата
-на тавана на всяка <a href="drawingRooms.html">стая</a>
-и от слънцето, ако зададения час е през деня.
-Можете да подобрите осветяването като демаркирате
-<i>Светнати лампи на тавана</i> в тези
-прозорци,
-като променяте часа или датата, като променяте
-ориентацията на компаса, като добавяте източници на светлина
-и като подбирате тяхната мощност.</td>
-</tr>
-<tr valign="top">
-<td>
-<p>•</p>
-</td>
-<td>Можете да <a href="savingHome.html">
-експортирате</a> 3D изображението във файл в OBJ формат
-и да импортирате получения файл в друга 3D програма като <a href="http://aoi.sourceforge.net">Art of Illusion</a>
-или в <a href="http://www.blender.org">Blender</a>.</td>
-</tr>
-</tbody>
-</table>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>Sweet Home 3D Съвети</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet
+Home 3D Помощ - начало</a> </div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr valign="bottom">
+<td width="3">&nbsp;</td>
+<td width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td width="8"><a name="anchor"></a></td>
+<td valign="bottom"><font id="topic">Съвети</font></td>
+</tr>
+<tr height="10">
+<td colspan="4" height="10">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<tbody>
+<tr>
+<td>
+<p>Тук ще намерите някои съвети, които могат да Ви помогнат
+да работите по-бързо и по-интелигентно
+със Sweet Home 3D. </p>
+<table border="0" cellpadding="4" cellspacing="0">
+<tbody>
+<tr valign="top">
+<td colspan="2">
+<p><b>Общи</b></p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ползвайте разделителите между полетата каталог,
+списък, план, 3D изглед, за да направите големината им удобна за работа.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Когато тествате рискови операции в Sweet Home 3D,
+имайте предвид, че можете да се откажете от всички с изключение на
+промените, свързани с <a href="importingFurniture.html">импортиран
+каталог</a>. </p>
+</td>
+</tr>
+<tr valign="top">
+<td colspan="2">
+<p><b>Каталог с мебелировка</b></p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За да <a href="addingFurniture.html">добавите</a>
+няколко обекта едновременно в плана, маркирайте повече обекти (с
+натиснат Shift или Ctrl) в каталога.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За да отворите категория в каталога, цъкнете
+двойно върху нея. </p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За да <a href="importingFurniture.html">промените</a>
+импортиран обект от мебелировката, цъкнете двойно върху него.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Ако имате много богат каталог с мебелировка,
+изобразяването му като <a href="editingPreferences.html">списък
+с търсене</a> може да е по-удобно за Вас. Падащият списък за
+избор на категория и полето за въвеждане на текст за търсене ще Ви
+помагат в откриването на желания обект.</p>
+</td>
+</tr>
+<tr valign="top">
+<td colspan="2">
+<p><b>Списък на поставените в плана обекти</b></p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За да сортирате обектите, цъкнете върху заглавието
+на колоната - критерий в списъка. С първото цъкване обектите ще се
+подредят във възходящ ред, с второто - в низходящ ред, а с третото
+цъкване - по реда на добавянето на обектите в плана.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За да промените подреждането на колоните в
+списъка, завлечете и пуснете заглавието на колоната.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За да откриете мястото на обект в плана,
+маркирайте обекта в списъка.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За да <a href="editingFurniture.html">промените</a>
+обект от мебелировката, цъкнете двойно върху него в списъка или в плана.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За да <a href="editingFurniture.html">промените</a>
+едновременно няколко обекта, маркирайте ги в списъка или в плана и
+изберете <i>Мебелировка &gt; Промени...</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Ако искате да променяте няколко обекта
+едновременно като един обект, маркирайте ги и изберете <i>Мебелировка
+&gt; Постави ги в група</i>. Групираните обекти може да бъдат
+местени, преоразмерявани и въртяни като един обект, който ще се появи и
+в списъка с поставени в плана обекти.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Когато работите с <i>Редактиране &gt;
+Копирай</i> или <i>Редактиране &gt; Изрежи</i>,
+маркираните обекти в списъка се копират в клипборда като текст в CSV
+формат (стойности, разделени със запетая), така че можете да ги
+поставите в текстов редактор или в електронна таблица (тази функция
+може да не работи в Linux).</p>
+</td>
+</tr>
+<tr valign="top">
+<td colspan="2">
+<p><b>План</b></p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Ако имате на разположение сканирано изображение на
+плана на жилището, започнете като го импортирате за <a href="importingBackground.html">фоново
+изображение на плана</a>. Това ускорява чертането на стените.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>За да дефинирате прецизно мащаба на импортираното
+фоново изображение, уголемете панела на помощника за импортиране.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Ако искате да зададете различни цветове от една
+страна на стена, обща за съседни стаи, разделете я на повече сегменти
+при <a href="drawingWalls.html">създаването
+и</a> или я разделете на две от менюто <i>План &gt;
+Раздели стената</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>За да начертаете трапецовидна стена на таванска
+стая с наклонен таван, <a href="editingWalls.html">задайте</a>
+различни височини на началната и на крайната точки на стената.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Когато работите с <i>Редактиране &gt;
+Копирай</i> или <i>Редактиране &gt; Изрежи</i>,
+маркираните обекти в плана се копират в клипборда като изображения,
+които можете да поставите в други приложения (тази функция може да не
+работи в Linux). Ако Ви е нужно изображение на плана във формат
+векторна графика, изберете от менюто <i>План &gt;
+Експортирай във формат SVG...</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За да преместите маркирания обект прецизно,
+ползвайте клавишите-стрелки от клавиатурата.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Заключете основния план, за да маркирате и
+променяте <a href="editingFurniture.html">мебелировката</a>
+без да се притеснявате, че ще промените елемент от друг тип в плана.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако искате в плана да маркирате обект, скрит под други обекти, можете да го маркирате в списъка с обекти, но ако знаете къде се 
+намира в плана, можете да поставите показалеца на мишката на това място, да цъкнете с десния бутон на мишката и да го маркирате в 
+контекстното меню <i>От обектите маркирай</i>. Може да го маркирате и като го включите в един маркиращ правоъгълник, след което да 
+демаркирате видимите обекти като цъкате върху тях с мишката, натискайки клавиша <i>shift</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Използвайте линийките за подравняване. Това помага
+за прецизното чертане на стени, стаи и оразмерителни линии.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>За да дублирате в плана маркирани обекти,
+натиснете и задръжте клавиша <i>ctrl</i> (или <i>alt</i>
+за ползващите Mac OS X) докато ги влачите.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Магнетизмът, включен в менюто <a href="editingPreferences.html">Предпочитания</a>,
+можете да отмените временно чрез задържане на клавиша <i>shift</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>За по-лесното чертане на стени и поставяне на
+мебелировка, <a href="editing3DView.html">променете
+в 3D изгледа</a> гледната точка и/или прозрачността на стените.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако искате да подравните няколко обекта,
+маркирайте ги и изберете необходимото от менюто <i>Мебелировка
+&gt; Подравни</i>. Обектите ще се подравнят според обекта,
+който сте маркирали първи.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>За да местите лесно видимата част на плана,
+изберете от менюто <i>План &gt; Местене с ръка</i> или
+цъкнете върху бутона <i>Местене с ръка</i> от лентата с
+инструменти. Когато сте в друг режим, можете да активирате временно
+този режим, чрез натискане и задържане на клавиша <i>space</i>.</p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Изберете <i>План &gt; Уголеми</i>
+или <i>План &gt; Смали</i> за да уголемите или смалите
+плана, или въртете колелцето на мишката с натиснат и задържан клавиш <i>ctrl</i>
+(или <i>cmd</i> под Mac OS X).</p>
+</td>
+</tr>
+<tr valign="top">
+<td colspan="2">
+<p><b>3D изглед</b></p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Изберете <i>3D изглед &gt; Покажи в
+отделен прозорец</i> за да изнесете 3D изображението в отделен
+прозорец на екрана или да го преместите на втори монитор. За да върнете
+3D изображението в основния прозорец, изберете <i>3D изглед
+&gt; Покажи в основния прозорец</i> или затворете прозореца с
+3D изображението.</p>
+</td>
+</tr>
+<tr>
+<td>
+<p>•</p>
+</td>
+<td>Натиснете клавиша <i>Shift</i> за да
+увеличите ефекта от
+движението на мишката и колелцето и, когато показалецът и е в
+полето с 3D изгледа.</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p> Ако не можете да видите някои от обектите в някои
+стаи, <a href="editing3DView.html">променете</a>
+прозрачността на стените. </p>
+</td>
+</tr>
+<tr valign="top">
+<td width="16">
+<p>•</p>
+</td>
+<td>
+<p>Ако някои стени, настилки или мебелировка са
+твърде ярки, <a href="editing3DView.html">променете</a>
+яркостта на осветлението. </p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>
+<p>Ако се "изгубите" и не знаете къде се намира
+виртуалният посетител, завъртете скрол колелцето с показалец на мишката
+в 3D изгледа. Това автоматично ще маркира и покаже виртуалния посетител
+в плана.</p>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>Записвайте основните гледни точки от менюто <i>3D
+изглед &gt; Запис на гледната точка...</i> и после ще можете
+бързо да се връщате в тях като ги избирате от менюто <i>3D
+изглед &gt; Избор на гледна точка</i>. Часът, датата и вида
+обектив, зададени в прозореца <i>Създаване на снимки</i>
+се записват заедно с координатите на гледната точка.<br>
+</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>По подразбиране, изображенията, генерирани
+в двата режима с високо качество чрез <i>Създаване на снимки</i>
+и <i>Създаване на филми</i> са осветени от лампи,
+поставени в средата
+на тавана на всяка <a href="drawingRooms.html">стая</a>
+и от слънцето, ако зададения час е през деня.
+Можете да подобрите осветяването като демаркирате
+<i>Светнати лампи на тавана</i> в тези
+прозорци,
+като променяте часа или датата, като променяте
+ориентацията на компаса, като добавяте източници на светлина
+и като подбирате тяхната мощност.</td>
+</tr>
+<tr valign="top">
+<td>
+<p>•</p>
+</td>
+<td>Можете да <a href="savingHome.html">
+експортирате</a> 3D изображението във файл в OBJ формат
+и да импортирате получения файл в друга 3D програма като <a href="http://aoi.sourceforge.net">Art of Illusion</a>
+или в <a href="http://www.blender.org">Blender</a>.</td>
+</tr>
+</tbody>
+</table>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tocCreating.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tocCreating.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tocCreating.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tocCreating.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,55 +1,56 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html;charset=utf-8"><title>Създаване на планове, стени, мебелировка</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-	<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet Home 3D Помощ - Начало</a></div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr align="left" valign="top">
-<td valign="bottom" width="3"></td>
-<td valign="bottom" width="120"><font id="topic">Съдържание</font></td>
-<td rowspan="3" background="../images/verticalLine.gif" width="31">&nbsp;</td>
-<td valign="bottom" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td valign="bottom" width="7"></td>
-<td valign="bottom"><font id="topic">Създаване
-на планове, стени, мебелировка</font></td>
-</tr>
-<tr align="left" height="18" valign="top">
-<td height="18" width="3"></td>
-<td height="18" width="120"></td>
-<td colspan="3" height="18"></td>
-</tr>
-<tr align="left" valign="top">
-<td width="3"></td>
-<td width="120">
-<p><a href="ui.html">Sweet Home 3D
-Потребителски
-Интерфейс</a></p>
-<p><a href="tocCreating.html">Създаване на
-планове, стени, мебелировка</a></p>
-<p><a href="tocEditing.html">Промяна на предпочитанията, стените, мебелировката и 3D изгледа</a></p>
-<p><a href="tocImporting.html">Импортиране на изображение за фон и на мебелировка</a></p>
+<html><head>
+<meta http-equiv="content-type" content="text/html;charset=utf-8"><title>Създаване на планове, стени, мебелировка</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+	<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet Home 3D Помощ - Начало</a></div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr align="left" valign="top">
+<td valign="bottom" width="3"></td>
+<td valign="bottom" width="120"><font id="topic">Съдържание</font></td>
+<td rowspan="3" background="../images/verticalLine.gif" width="31">&nbsp;</td>
+<td valign="bottom" width="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td valign="bottom" width="7"></td>
+<td valign="bottom"><font id="topic">Създаване
+на планове, стени, мебелировка</font></td>
+</tr>
+<tr align="left" height="18" valign="top">
+<td height="18" width="3"></td>
+<td height="18" width="120"></td>
+<td colspan="3" height="18"></td>
+</tr>
+<tr align="left" valign="top">
+<td width="3"></td>
+<td width="120">
+<p><a href="ui.html">Sweet Home 3D
+Потребителски
+Интерфейс</a></p>
+<p><a href="tocCreating.html">Създаване на
+планове, стени, мебелировка</a></p>
+<p><a href="tocEditing.html">Промяна на предпочитанията, стените, мебелировката и 3D изгледа</a></p>
+<p><a href="tocImporting.html">Импортиране на изображение за фон и на мебелировка</a></p>
 <p><a href="tocCreatingPhotos.html">Създаване на снимки и видео</a></p>
-<p><a href="tips.html">Съвети</a></p>
-</td>
-<td colspan="3">
-<p><a href="creatingHome.html">Създаване на план</a></p>
-<p><a href="drawingWalls.html">Създаване на стени</a></p>
-<p><a href="addingFurniture.html">Поставяне на врати, прозорци и мебелировка</a></p>
-<p><a href="drawingRooms.html">Създаване на стаи</a></p>
-<p><a href="drawingDimensions.html">Чертане на оразмерителни линии</a></p>
-<p><a href="addingTexts.html">Добавяне на текстове</a></p>
-<p><a href="savingHome.html">Записване и отваряне на план</a></p>
-<p><a href="printingHome.html">Отпечатване на план</a></p>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
+<p><a href="tips.html">Съвети</a></p>
+</td>
+<td colspan="3">
+<p><a href="creatingHome.html">Създаване на план</a></p>
+<p><a href="drawingWalls.html">Създаване на стени</a></p>
+<p><a href="addingFurniture.html">Поставяне на врати, прозорци и мебелировка</a></p>
+<p><a href="drawingRooms.html">Създаване на стаи</a></p>
+<p><a href="drawingDimensions.html">Чертане на оразмерителни линии</a></p>
+<p><a href="addingTexts.html">Добавяне на текстове</a></p>
+<p><a href="addingLevels.html">Добавяне на етажи</a></p>
+<p><a href="savingHome.html">Записване и отваряне на план</a></p>
+<p><a href="printingHome.html">Отпечатване на план</a></p>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tocEditing.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tocEditing.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tocEditing.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/tocEditing.html	2011-12-21 00:48:52.000000000 +0000
@@ -1,50 +1,51 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<meta http-equiv="content-type" content="text/html;charset=utf-8"><title>Промяна на предпочитанията, стените, мебелировката и 3D изгледа</title>
-
-<link href="../help.css" rel="stylesheet" media="all">
-</head>
-	<body style="background-color: rgb(255, 255, 255);">
-<div id="banner">
-<div id="helpheader"> <a class="bread" href="index.html">Sweet Home 3D Помощ - Начало</a> </div>
-</div>
-<div id="mainbox" align="left">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tbody>
-<tr align="left" valign="top">
-<td valign="bottom" width="3"></td>
-<td valign="bottom" width="120"><font id="topic">Съдържание</font></td>
-<td rowspan="3" background="../images/verticalLine.gif" width="32">&nbsp;</td>
-<td valign="bottom" width="31"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
-<td valign="bottom" width="7"></td>
-<td valign="bottom"><font id="topic">Промяна на предпочитанията, стените, мебелировката и 3D изгледа</font></td>
-</tr>
-<tr align="left" height="18" valign="top">
-<td height="18" width="3"></td>
-<td height="18" width="120"></td>
-<td colspan="3" height="18"></td>
-</tr>
-<tr align="left" valign="top">
-<td width="3"></td>
-<td width="120">
-<p><a href="ui.html">Sweet Home 3D Потребителски интерфейс</a></p>
-<p><a href="tocCreating.html">Създаване на планове, стени, мебелировка</a></p>
-<p><a href="tocEditing.html">Промяна на предпочитанията, стените, мебелировката и 3D изгледа</a></p>
-<p><a href="tocImporting.html">Импортиране на изображение за фон и на мебелировка</a></p>
+<html><head>
+<meta http-equiv="content-type" content="text/html;charset=utf-8"><title>Промяна на предпочитанията, стените, мебелировката и 3D изгледа</title>
+
+<link href="../help.css" rel="stylesheet" media="all">
+</head>
+	<body style="background-color: rgb(255, 255, 255);">
+<div id="banner">
+<div id="helpheader"> <a class="bread" href="index.html">Sweet Home 3D Помощ - Начало</a> </div>
+</div>
+<div id="mainbox" align="left">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tbody>
+<tr align="left" valign="top">
+<td valign="bottom" width="3"></td>
+<td valign="bottom" width="120"><font id="topic">Съдържание</font></td>
+<td rowspan="3" background="../images/verticalLine.gif" width="32">&nbsp;</td>
+<td valign="bottom" width="31"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+<td valign="bottom" width="7"></td>
+<td valign="bottom"><font id="topic">Промяна на предпочитанията, стените, мебелировката и 3D изгледа</font></td>
+</tr>
+<tr align="left" height="18" valign="top">
+<td height="18" width="3"></td>
+<td height="18" width="120"></td>
+<td colspan="3" height="18"></td>
+</tr>
+<tr align="left" valign="top">
+<td width="3"></td>
+<td width="120">
+<p><a href="ui.html">Sweet Home 3D Потребителски интерфейс</a></p>
+<p><a href="tocCreating.html">Създаване на планове, стени, мебелировка</a></p>
+<p><a href="tocEditing.html">Промяна на предпочитанията, стените, мебелировката и 3D изгледа</a></p>
+<p><a href="tocImporting.html">Импортиране на изображение за фон и на мебелировка</a></p>
 <p><a href="tocCreatingPhotos.html">Създаване на снимки и видео</a></p>
-<p><a href="tips.html">Съвети</a></p>
-</td>
-<td colspan="3">
-<p><a href="editingPreferences.html">Промяна на предпочитанията</a></p>
-<p><a href="editingWalls.html">Промяна на стените</a></p>
-<p><a href="editingFurniture.html">Редактиране на мебелировката</a></p>
-<p><a href="editingRooms.html">Промяна на стаите</a></p>
-<p><a href="editingDimensions.html">Редактиране на оразмеряванията</a></p>
+<p><a href="tips.html">Съвети</a></p>
+</td>
+<td colspan="3">
+<p><a href="editingPreferences.html">Промяна на предпочитанията</a></p>
+<p><a href="editingWalls.html">Промяна на стените</a></p>
+<p><a href="editingFurniture.html">Редактиране на мебелировката</a></p>
+<p><a href="editingRooms.html">Промяна на стаите</a></p>
+<p><a href="editingDimensions.html">Редактиране на оразмеряванията</a></p>
+<p><a href="editingLevels.html">Промяна на етажи</a></p>
 <p><a href="editing3DView.html">Настройки на 3D изгледа</a></p>
-<p><A HREF="editingCompass.html">Настройки на компаса и географските координати</A> </p>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
+<p><A HREF="editingCompass.html">Настройки на компаса и географските координати</A> </p>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
 </body></html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/ui.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/ui.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/ui.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/bg/ui.html	2011-12-21 00:48:52.000000000 +0000
@@ -80,7 +80,9 @@
 ще начертаете <a href="drawingWalls.html">стените</a>
 и <a href="drawingRooms.html">стаите</a> на
 жилището
-и ще поставите <a href="editingFurniture.html">мебелировката</a>.</p>
+и ще поставите <a href="editingFurniture.html">мебелировката</a>. 
+Когато домът има повече от един <a href="addingLevels.html">етаж</a>, името 
+на всеки от етажите се изобразява в таб в горната част на полето с плана.</p>
 </td>
 </tr>
 <tr valign="top">
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/cs/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/cs/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/cs/editingPreferences.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/cs/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -26,7 +26,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
 	<tr>
 	<td><p>Nastavení programu Sweet Home 3D změníte v <i>Sweet Home 3D &gt; Nastavení...</i> v prostředí Mac OS X nebo v <i>Projekt &gt; Nastavení...</i> v jiných systémech.</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="434" height="381"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="429" height="401"></p>
 	  <p>V okně nastavení můžete měnit <i>jazyk</i> prostředí programu Sweet Home 3D, <i>měrnou jednotku</i> užívanou v pravítku plánu, mřížce a všech dalších rozměrech.    <br>
 						
 	    Políčko <i>přichytávání</i> povoluje či zakazuje užívání přichytávání v plánu projektu při <a href="drawingWalls.html">kreslení zdí</a>
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/cs/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/cs/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/addingLevels.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/addingLevels.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/addingLevels.html	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/addingLevels.html	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,93 @@
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
+	<meta name="keywords" content="Stock, St�cke">
+	<title>Niveaus hinzuf&uuml;gen</title>
+	<link href="../help.css" rel="stylesheet" media="all">
+</head>
+
+<body  bgcolor="#ffffff">
+<div id="banner">
+	<div id="helpheader">
+		<a class="bread" href="index.html">Sweet Home 3D-Hilfe</a> > <a class="bread" href="tocCreating.html">Erstellen von Wohnungen, W&auml;nden und M&ouml;beln</a>
+	</div>
+</div>
+<div id="mainbox" align="left">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr valign="bottom" height="32">
+	<td width="3" height="32">&nbsp;</td>
+	<td width="32" height="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D-Icon" height="32" width="32"></td>
+	<td width="8" height="32">&nbsp;&nbsp;</td>
+	<td valign="bottom" height="32"><font id="topic">Niveaus hinzuf&uuml;gen</font></td>
+	</tr>
+	<tr height="10">
+	<td colspan="4" height="10">&nbsp;</td>
+	</tr>
+</table>
+<table width="100%" border="0" cellspacing="0" cellpadding="3">
+	<tr>
+	<td><p>Jede Wohnung wird mit einem Standard-Niveau erzeugt, aber Sweet Home 3D kann auch mehrere Niveaus verwalten. Jedem Niveau kann dabei eine positive oder negative Anhebung zugewiesen werden. Um ein neues Niveau hinzuzuf&uuml;gen, w&auml;hlen Sie im Men&uuml; <i>Plan &gt; Neues Niveau hinzuf&uuml;gen</i></a>. Sobald eine Wohnung &uuml;ber mehr als ein Niveau verf&uuml;gt, erscheinen Reiter am oberen Rand der Planungsansicht. Mit diesen k&ouml;nnen Sie bestimmen, in welches Niveau Elemente eingef&uuml;gt werden sollen. Am Ende der Reiterleiste erscheint zus&auml;tzlich ein Reiter mit einem <font size="+1"><b>+</b></font>-Symbol, der dazu verwendet werden kann, weitere Niveaus zu erzeugen, sofern gew&uuml;nscht.</p>
+	  <table border="0" align="center" cellpadding="0" cellspacing="5">
+	    <tr align="center">
+    <td><img src="../images/addingLevel.png" alt="Niveaus hinzuf&uuml;gen" width="416" height="234"></td>
+    </tr>
+  <tr>
+    <td align="center" valign="top">Ein neues Niveau, wobei W&auml;nde und Decken des darunterliegenden Niveaus blass dargestellt werden</td>
+    </tr>
+</table>
+      <p>Um Ihnen zu helfen, sich in einem h&ouml;heren Niveau zurechtzufinden, werden W&auml;nde und Decken des darunterliegenden Niveaus im Plan mit blassen Farben dargestellt. Ist das ausgew&auml;hlte Niveau das unterste Niveau, werden die W&auml;nde und B&ouml;den des n&auml;chsten Niveaus mit blassen Farben dargestellt. Ist die Magnetismus-Option aktiviert, rastet der Mauszeiger an diesen W&auml;nden und R&auml;umen ein, um Wand- und Raumzeichenwerkzeuge einfacher nutzbar zu machen. Wenn n&ouml;tig, k&ouml;nnen Sie auch einfach W&auml;nde R&auml;ume und M&ouml;belst&uuml;cke aus einem anderen Niveau kopieren, um sie im neuen Niveau einzuf&uuml;gen.</p>
+      <p>Jedes Niveau hat eine Anhebung und weitere Attribute, die <a href="editingLevels.html">angepasst</a> werden k&ouml;nnen. Sind die Oberkante einiger W&auml;nde oder M&ouml;belst&uuml;cke in einem niedrigeren Niveau h&ouml;her als die Anhebung des ausgew&auml;hlten Niveaus, werden sie mit kr&auml;ftigen Farben dargestellt, wie an den umgebenden W&auml;nden, der Wendeltreppe und dem Fenster rechts in der folgenden Abbildung zu sehen ist.</p>
+      <table border="0" align="center" cellpadding="0" cellspacing="5">
+        <tr align="center">
+      <td><img src="../images/level1WithHighWalls.png" alt="Elemente aus anderen Niveaus in kr&auml;ftigen Farben" width="416" height="234"></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top">Ein neues Niveau, wobei die hohen W&auml;nde und das Mobiliar <br>
+        des darunterliegenden Niveaus in kr&auml;ftigen Farben dargestellt werden</td>
+    </tr>
+</table>
+      <p>Wird ein neues Niveau hinzugef&uuml;gt, so hat dies keine direkte Auswirkung auf die 3D-Ansicht. Es wird auch nicht automatisch ein Boden eingef&uuml;gt, um das Niveau von den anderen zu trennen. Erst, wenn Sie anfangen, W&auml;nde, R&auml;ume oder M&ouml;belst&uuml;cke hinzuzuf&uuml;gen, werden Sie sehen, dass diese neuen Elemente mit der Anhebung des neuen Niveaus auftauchen</p></td>
+	</tr>
+</table>
+<div id="taskbox">
+  <table width="100%" border="0" cellspacing="0" cellpadding="7" BGCOLOR="#eeeeee">
+    <tr valign="top" BGCOLOR="#eeeeee">
+      <td bgcolor="#eeeeee" width="98%">
+        <table border="0" cellspacing="0" cellpadding="4">
+          <tr valign="top">
+            <td width="16"><p>&#149;</p></td>
+            <td><p>Die H&ouml;he und die Bodendicke eines neuen Niveaus k&ouml;nnen im <a href="editingPreferences.html">Einstellungsbereich</a> festgelegt werden. Die Anhebung eines neuen Niveaus wird berechnet, indem die Anhebung des letzten Niveaus, seine H&ouml;he sowie seine Bodendicke aus den Einstellungen addiert werden.</p></td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td>Wurde ein Niveau angelegt, k&ouml;nnen Sie seinen Namen, seine Anhebung und H&ouml;hen <a href="editingLevels.html">&auml;ndern</a>, indem Sie doppelt auf seinen Reiter klicken, oder indem Sie im Men&uuml; <i>Plan &gt; Niveau bearbeiten</i> w&auml;hlen.</td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td>Die Reiter am oberen Rand der Planungsansicht f&uuml;hren alle Niveaus geordnet nach ihrer Anhebung auf. Wenn mehrere Niveaus dieselbe Anhebung haben, werden diese ihrer H&ouml;he nach von hoch nach niedrig sortiert.</td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td>Wird ein M&ouml;belst&uuml;ck aus der Mobiliarliste ausgew&auml;hlt, wird automatisch das Niveau des M&ouml;belst&uuml;cks gew&auml;hlt, wenn das M&ouml;belst&uuml;ck ansonsten im aktuellen Niveau nicht betrachtet werden kann.</td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>Jedes Niveau in einer Wohnung kann sein eigenes <a href="importingBackground.html">Hintergrundbild</a> erhalten, auf dem W&auml;nde und R&auml;ume gezeichnet werden k&ouml;nnen.</td>
+          </tr>
+          <tr valign="top">
+            <td>
+              <p>&#149;</p>
+              </td>
+            <td>
+              <p>Die W&auml;nde und Decken eines anderen Niveaus, die blass dargestellt werden, werden nicht in die Zwischenablage kopiert. Sie dienen dazu, damit Sie sich im aktuellen Niveau schneller zurechtfinden und schneller zeichnen k&ouml;nnen.</p>
+              </td>
+          </tr>
+        </table>
+       </td>
+    </tr>
+  </table>
+</div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/creatingHome.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/creatingHome.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/creatingHome.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/creatingHome.html	2011-12-21 00:48:52.000000000 +0000
@@ -32,6 +32,7 @@
           Wurde eine Wohnung erstellt, k&ouml;nnen Sie die deren <a href="drawingWalls.html">W&auml;nde 
           einzeichnen</a>, <a href="addingFurniture.html">T&uuml;ren, Fenster und M&ouml;bel hinzuf&uuml;gen</a>, 
           <a href="drawingRooms.html">R&auml;ume anhand der gezeichneten W&auml;nde definieren</a>, 
+          <a href="addingLevels.html">zus&auml;tzliche Niveaus</a> einf&uuml;gen,
           die <a href="editingCompass.html">geografische Position anpassen</a>, 
           <a href="drawingDimensions.html">Bema�ungen einzeichnen</a> und <a href="addingTexts.html">Texte hinzuf&uuml;gen</a>.
           Da die <a href="editing3DView.html">3D-Ansicht</a> immer synchronisiert 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editing3DView.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editing3DView.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editing3DView.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editing3DView.html	2011-12-21 00:48:52.000000000 +0000
@@ -135,7 +135,7 @@
 	<td bgcolor="#eeeeee" width="98%">
 	<table border="0" cellspacing="0" cellpadding="4"><tr valign="top"><td width="16"><p>&#149;</p></td><td><p>
 	Dr�cken Sie die Shift-Taste um den Effekt der Mausbewegungen und des Mausrades in der 3D-Ansicht zu
-	verlangsamen.</p></td></tr>
+	erh&ouml;hen.</p></td></tr>
 	  <tr valign="top">
         <td><p>&#149;</p>
         </td>
@@ -168,12 +168,21 @@
 	  <tr valign="top">
 	    <td><p>&#149;</p>
 	      </td>
-	    <td><p>Nichts hindert den virtuellen Besucher, "in" einer Wand zu stehen oder sehr weit vom
+	    <td><p>Nichts hindert den virtuellen Besucher, &quot;in&quot; einer Wand zu stehen oder sehr weit vom
 	    geplanten Haus entfernt zu sein. Falls Sie nicht wissen sollten, wo sich der virtuelle Besucher
 	    derzeit befindet, drehen Sie das Mausrad mit dem Mauszeiger �ber der 3D-Ansicht. Dies wird
 	    den Besucher automatisch im Plan anzeigen.</p>
 	      </td>
 	    </tr>
+	  <tr valign="top">
+	    <td><p>&#149;</p>
+	      </td>
+	    <td><p>Falls Sie immer alle Niveaus in der 3D-Ansicht sehen m&ouml;chten, unabh&auml;ngig davon, welches
+        Niveau gerade ausgew&auml;hlt ist, w&auml;hlen Sie den Men&uuml;eintrag 3D-Ansicht &gt; Alle Niveaus anzeigen.
+        Um nur das ausgew&auml;hlte Niveau und alle darunterliegenden Niveaus anzuzeigen, w&auml;hlen Sie den
+        Men&uuml;eintrag <i>3D-Ansicht &gt; Ausgew&auml;hltes Niveau anzeigen</i>.</p>
+	      </td>
+	    </tr>
 	</table>
 	
 	</td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingLevels.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingLevels.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingLevels.html	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingLevels.html	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,57 @@
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
+	<title>Niveaus bearbeiten</title>
+	<link href="../help.css" rel="stylesheet" media="all">
+</head>
+
+<body  bgcolor="#ffffff">
+<div id="banner">
+	<div id="helpheader">
+		<a class="bread" href="index.html">Sweet Home 3D-Hilfe</a> > <a class="bread" href="tocEditing.html">&Auml;ndern der Einstellungen, des Planungs- und des 3D-Modus</a>
+	</div>
+</div>
+<div id="mainbox" align="left">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr valign="bottom" height="32">
+	<td width="3" height="32">&nbsp;</td>
+	<td width="32" height="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D-Icon" height="32" width="32"></td>
+	<td width="8" height="32">&nbsp;&nbsp;</td>
+	<td valign="bottom" height="32"><font id="topic">Niveaus bearbeiten</font></td>
+	</tr>
+	<tr height="10">
+	<td colspan="4" height="10">&nbsp;</td>
+	</tr>
+</table>
+<table width="100%" border="0" cellspacing="0" cellpadding="3">
+  <tr>
+    <td><p>Sie k&ouml;nnen den Namen, die Anhebung und die H&ouml;hen eines Niveaus bearbeiten, indem Sie seinen Reiter doppelt anklicken, oder indem Sie im Men&uuml; <i>Plan &gt; Niveau bearbeiten</i> w&auml;hlen.<br>
+      Im Einstellungsbereich eines Niveaus k&ouml;nnen dessen Attribute ge&auml;ndert werden. Zudem wird eine Tabelle angezeigt, in der s&auml;mtliche Niveaus der Wohnung aufgef&uuml;hrt sind. Darin entspricht die ausgew&auml;hlte Zeile dem momentan bearbeiteten Niveau.</p>
+<p align="center"><img src="images/editingLevels.png" alt="Modify furniture" width="314" height="286"></p>
+	    <p>In der 3D-Ansicht wird die Dicke des Bodens zum Zeichnen des vertikalen Rands um einen Boden verwendet. Diese Fl&auml;chen sind am Rand von L&ouml;chern im Boden und am Rand eines Zwischenstocks oder Balkons sichtbar.<br>
+          Die Anhebung eines Niveaus kann positiv oder negativ sein. In letzterem Fall wird der Boden in der 3D-Ansicht stets automatisch weiter ausgeh&ouml;hlt, wann immer ein M&ouml;belst&uuml;ck, ein Raum oder ein abgeschlossener Bereich aus W&auml;nden im Untergrundniveau eingef&uuml;gt wird. Diese Feature kann dazu verwendet werden, einen Swimming Pool zu erzeugen oder einen Keller mit einem oder mehreren Stockwerken zu erstellen.</p></td>
+	</tr>
+</table>
+<div id="taskbox">
+  <table width="100%" border="0" cellspacing="0" cellpadding="7" BGCOLOR="#eeeeee">
+    <tr valign="top" BGCOLOR="#eeeeee">
+      <td bgcolor="#eeeeee" width="98%">
+        <table border="0" cellspacing="0" cellpadding="4">
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td>Es ist nicht notwendig, die Werte so anzugeben, dass die Niveaus exakt aufeinanderliegen.
+              Sie k&ouml;nnen das Niveau-Feature auch dazu verwenden, Zwischenb&ouml;den, angehobene B&ouml;den und Zwischendecken zu erzeugen. Ebenso k&ouml;nnen Sie Niveaus mit derselben Anhebung als Layer verwenden, um einzelne Elemente wie <a href="drawingDimensions.html">Bema&szlig;ungen</a> oder <a href="addingTexts.html">Texte</a> zu isolieren.</td>
+          </tr>
+            <tr valign="top"> 
+              <td width="16"> <p>&#149;</p></td>
+              <td> <p>Die Reiter am oberen Rand der Planungsansicht zeigen die Namen der Niveaus in Reihenfolge ihrer Anhebung an. Haben mehrere Niveaus dieselbe Anhebung, so werden diese von hoch nach niedrig ihrer H&ouml;he nach sortiert. Wird die Anhebung und/oder die H&ouml;he eines Niveaus ge&auml;ndert, wird die Reihenfolge der Reiter automatisch angepasst.</td>
+            </tr>
+          </table>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingPreferences.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -27,11 +27,12 @@
 	<tr>
 	<td><p>Um die Sweet Home 3D-Einstellungen zu ver�ndern, w�hlen Sie <i>Sweet Home 3D &gt; Einstellungen...</i> auf Mac OS X oder <i>Datei &gt; Einstellungen...</i> auf
 	    anderen Systemen.</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="371" height="381"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="367" height="403"></p>
 	    <p>Im Einstellungsfenster k�nnen Sie die <i>Sprache</i> einstellen welche 
           im Sweet Home 3D Benutzerinterface verwendet wird. Au�erdem k�nnen Sie 
           die <i>Ma�einheiten</i> einstellen die benutzt wird um die Bema�ung, 
-          das Gitter und die L�ngen darzustellen.</p>
+          das Gitter und die L�ngen darzustellen.<br>
+          Die Schaltfl&auml;che neben dem Auswahlfeld <i>Sprache</i> erm&ouml;glicht den Import von zus&auml;tzlichen Sprachbibliotheksdateien mit der Erweiterung SH3L.</p>
         <p> Die Auswahlkn&ouml;pfe (radio buttons) <i>Katalogordner</i> und <i>Durchsuchbare 
           Liste</i> geben Ihnen die M&ouml;glichkeit auszusuchen, wie der M&ouml;belkatalog 
           angezeigt wird in jedem Sweet Home 3D-Fenster.<br>
@@ -52,10 +53,12 @@
           Die <i>Wandmuster im Plan</i> -ComboBox bietet die M&ouml;glichkeit, 
           ein bestimmtes Muster zu w&auml;hlen um die W&auml;nde zu f&uuml;llen. 
         </p>
-        <p>Der <i>Standardbreite Wand</i> -Wert setzt die Dicke von allen W�nden, 
-          die erstellt werden nachdem die Einstellungen mit "OK" geschlossen werden.<br>
-          Der <i>Standardh�he Wand</i> -Wert setzt die H�he von allen W�nden, 
-          die erstellt werden nachdem die Einstellungen mit "OK" geschlossen werden.</p>
+        <p>Der Wert <i>Standardbreite f&uuml;r W&auml;nde</i> setzt die Dicke von allen W&auml;nden, 
+          die erstellt werden nachdem die Einstellungen mit &quot;OK&quot; geschlossen werden.<br>
+          Der Wert <i>Standardh&ouml;he f&uuml;r W&auml;nde</i> setzt die H&ouml;he von allen W&auml;nden, 
+          die erstellt werden nachdem die Einstellungen mit &quot;OK&quot; geschlossen werden.<br>
+          Der Wert <i>Standarddicke f&uuml;r B&ouml;den</i> setzt die Dicke von allen B&ouml;den,
+          die nach dem Schlie&szlig;en der Einstellungen mit &quot;OK&quot; erstellt werden.</p>
         <p>�ber das Feld <i>Intervall zum automatischen Speichern</i> wird, sofern diese Option 
           aktiviert ist, der Zeitraum in Minuten festgelegt, nach dem die ge�ffneten 
           Wohnungspl�ne immer wieder automatisch gespeichert werden sollen. 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingRooms.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingRooms.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingRooms.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/editingRooms.html	2011-12-21 00:48:52.000000000 +0000
@@ -127,10 +127,13 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>Der Boden eines Raums ist immer auf H�he 0. Die Deckenh�he eines Raums wird f�r jeden Punkt
-			    des Raums separat berechnet, und die H�he an jedem dieser Punkte entspricht der H�he des
-				n�hesten Anfangs- oder Endpunktes einer Wand. Somit kann auch eine Dachschr�ge modelliert werden,
-				indem Anfangs- und Endpunkt einer <a href="editingWalls.html">Wand</a> unterschiedliche H�hen zugewiesen werden.</td>
+              <p>Der Boden eines Raums ist immer auf derselben H&ouml;he wie das <a href="addingLevels.html">Niveau</a>,
+                zu dem der Raum geh&ouml;rt (das hei&szlig;t 0, wenn der Wohnung kein Niveau hinzugef&uuml;gt wurde).
+                Befindet sich der Raum nicht auf dem <b>letzten Niveau</b>, so entspricht die Deckenh&ouml;he der
+                Summe aus Anhebung und H�he des Niveaus, dem der Raum angeh&ouml;rt. Andernfalls wird die Deckenh�he f�r jeden Punkt
+			    des Raums separat berechnet, und die H&ouml;he an jedem dieser Punkte entspricht der H&ouml;he des
+				n&auml;hesten Anfangs- oder Endpunktes einer Wand. Somit kann auch eine Dachschr&auml;ge modelliert werden,
+				indem Anfangs- und Endpunkt einer <a href="editingWalls.html">Wand</a> unterschiedliche H&ouml;hen zugewiesen werden.</td>
           </tr>
           <tr valign="top">
             <td>
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/images/editingLevels.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/images/editingLevels.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/importingBackground.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/importingBackground.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/importingBackground.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/importingBackground.html	2011-12-21 00:48:52.000000000 +0000
@@ -134,6 +134,14 @@
               <p>&#149;</p>
             </td>
             <td>
+              <p>Jedes <a href="addingLevels.html">Niveau</a> in einer Wohnung kann ein eigenes
+              Hintergrundbild haben.</p></td>
+          </tr>
+          <tr valign="top">
+            <td>
+              <p>&#149;</p>
+            </td>
+            <td>
               <p>Die Ma�einheit, welche standardm��ig dargestellt wird, h�ngt von Ihrem Land ab.
               Sie k�nnen diese nat�rlich in den <a href="editingPreferences.html">Einstellungen</a> ver�ndern. </td>
           </tr>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/importingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/importingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/importingFurniture.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/importingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -117,6 +117,12 @@
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
+              <td> <p>Soll ein 3D-Modell in 1�-Schritten an Stelle von 90�-Schritten rotiert werden,
+                  halten Sie die <i>Umschalttaste</i> gedr&uuml;ckt, w&auml;hrend Sie im zweiten
+                  Schritt die Pfeiltasten anklicken.</p></td>
+            </tr>
+            <tr valign="top"> 
+              <td> <p>&#149;</p></td>
               <td> <p>Das Katalog-Mobiliar unterst�tzt keine Homonyme in einer 
                   Kategorie. So lange der Name eines importieren 3D-Modelles nicht 
                   einmalig in seiner Kategorie vorkommt, bleibt der <i>Weiter</i> 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/tocCreating.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/tocCreating.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/tocCreating.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/tocCreating.html	2011-12-21 00:48:52.000000000 +0000
@@ -41,7 +41,8 @@
         <p><a href="drawingRooms.html">R�ume zeichnen</a></p>
         <p><a href="drawingDimensions.html">Dimensionen zeichnen</a></p>
         <p><a href="addingTexts.html">Hinzuf�gen von Texten</a></p>
-        <p><A HREF="savingHome.html">Speichern und �ffnen einer Wohnung</A></p>
+        <p><a href="addingLevels.html">Niveaus hinzuf&uuml;gen</a></p>
+<p><A HREF="savingHome.html">Speichern und �ffnen einer Wohnung</A></p>
         <p><A HREF="printingHome.html">Drucken einer Wohnung</A></p></td>
     </tr>
   </table>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/tocEditing.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/tocEditing.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/tocEditing.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/tocEditing.html	2011-12-21 00:48:52.000000000 +0000
@@ -39,7 +39,8 @@
         <p><A HREF="editingFurniture.html">M�bel �ndern</A></p>
         <p><A HREF="editingRooms.html">R�ume bearbeiten</A></p>
         <p><A HREF="editingDimensions.html">Dimensionen �ndern</A></p>
-        <p><A HREF="editing3DView.html">�ndern der 3D-Ansicht</A></p>
+        <p><A HREF="editingLevels.html">Niveaus bearbeiten</A></p>
+<p><A HREF="editing3DView.html">�ndern der 3D-Ansicht</A></p>
      	<p><A HREF="editingCompass.html">Den Kompass und die geografische Position bearbeiten</A> </p></td>
     </tr>
   </table>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/ui.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/ui.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/ui.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/de/ui.html	2011-12-21 00:48:52.000000000 +0000
@@ -53,7 +53,7 @@
                       <td nowrap><p>3.</p>
                       </td>
                       <td><p>Der Wohnungsplan<br>
-                            Dieser Bereich zeigt Ihre Wohnung aus der Vogelperspektive. Dies ist der Ort, an dem Sie W�nde einzeichnen und per Maus oder Tastatur Ihr Mobiliar aufstellen k�nnen.</p>
+                            Dieser Bereich zeigt Ihre Wohnung aus der Vogelperspektive. Dies ist der Ort, an dem Sie W�nde einzeichnen und per Maus oder Tastatur Ihr Mobiliar aufstellen k�nnen. Verf&uuml;gt eine Wohnung &uuml;ber mehr als ein <a href="addingLevels.html">Niveau</a>, wird der Name jedes Niveaus in einem Reiter am oberen Rand des Plans angezeigt.</p>
                       </td>
                     </tr>
                     <tr valign="top">
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/el/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/el/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/el/editingPreferences.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/el/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -26,7 +26,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
 	<tr>
 	<td><p>��� �� �������������� ��� ����������� Sweet Home 3D �������� <i>Sweet Home 3D &gt; �����������...</i> �� Mac OS X � <i>������ &gt; �����������...</i> �� ���� ����������� ���������.</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="431" height="378"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="423" height="398"></p>
 	  <p>���� ������ ����������� �������� �� ��������� �� <i>������</i> ��� ��������������� ��� ������� ������ Sweet Home 3D ��� �� <i>������ ��������</i> ��� ��������������� ��� ��� ��������� ��� ������� ��� ��� ��������� ��� ������� ������ ��� �� ���������� ���� ��� ������.</p> 
           <p>�� ����� �������� <i>�����������</i> ����������� ��� ������������� ��� ���������� ��� ��������������� ��� ������ ������ ���� ��� <a href="drawingWalls.html">��������� ������</a> ��� ��� <a href="editingFurniture.html">���������� �������</a>.<br> �� ����� �������� <i>�������</i> ������� ���� ������� ���� ��� �� ������ ������� � ��������.<br> �� ����� �������� <i>������</i> ������� �� ������ ���� ��� �� ������ ����� � ������.
           <br>�� ������� �������� <i>������� ���������</i> ��� <i>������</i> ��� ���������� �� ��������� ��� ����� �� ��� ����� �� ������ ������������ ��� ������ (��. ������� ��������).
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/el/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/el/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/addingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/addingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/addingFurniture.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/addingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -74,7 +74,7 @@
             </td>
             <td>
               <p>A piece of furniture qualified as a door or a window indicates to Sweet Home 3D to automatically make holes
-                in walls at the intersection location with doors or windows. This computation isn't made for the other kinds
+                in walls at the intersection location with doors or windows. Similarly, a staircase is able to make a hole in the ceiling and the floor of upper levels. This computation isn't made for the other kinds
               of furniture. </td>
           </tr>
           <tr valign="top">
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/addingLevels.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/addingLevels.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/addingLevels.html	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/addingLevels.html	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,95 @@
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
+	<meta name="keywords" content="story, stories">
+	<title>Adding levels</title>
+	<link href="../help.css" rel="stylesheet" media="all">
+</head>
+
+<body  bgcolor="#ffffff">
+<div id="banner">
+	<div id="helpheader">
+		<a class="bread" href="index.html">Sweet Home 3D Help</a> > <a class="bread" href="tocCreating.html">Creating
+						      homes, walls and furniture</a>
+	</div>
+</div>
+<div id="mainbox" align="left">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr valign="bottom" height="32">
+	<td width="3" height="32">&nbsp;</td>
+	<td width="32" height="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+	<td width="8" height="32">&nbsp;&nbsp;</td>
+	<td valign="bottom" height="32"><font id="topic">Adding levels</font></td>
+	</tr>
+	<tr height="10">
+	<td colspan="4" height="10">&nbsp;</td>
+	</tr>
+</table>
+<table width="100%" border="0" cellspacing="0" cellpadding="3">
+	<tr>
+	<td><p>Every home is created with a default level, but Sweet Home 3D is also able to manage multiple levels, with a positive or negative elevation for each level. To add a new level, choose <i>Plan &gt; Add new level</i> from the menu. As soon as a home has more then one level, some tabs appear at the top of the plan view and let you select the level into which you want to add some objects. At the end of the tabs list, appears also a tab with a <font size="+1"><b>+</b></font> sign that you can use to create more levels if needed.
+</p>
+	  <table border="0" align="center" cellpadding="0" cellspacing="5">
+	    <tr align="center">
+    <td><img src="../images/addingLevel.png" alt="Adding levels" width="416" height="234"></td>
+    </tr>
+  <tr>
+    <td align="center" valign="top">New level showing in light color walls and ceilings of the lower level </td>
+    </tr>
+</table>
+      <p>To help you find your place in an upper level, walls and ceilings of the lower level are displayed with a light color in the plan view. If the selected level is the lowest level, walls and floors of the next level will be drawn in a light color. When magnetism is active, the mouse cursor is magnetized on these  walls and rooms to let you use  wall or room drawing tools more easily. If needed you may also simply copy some walls, rooms or furniture from an other level to paste them in the new level.</p>
+      <p>Each level has an elevation and other attributes that can be <a href="editingLevels.html">changed</a>. If the top of some walls or some furniture added to a lower level is higher than the elevation of the selected level, they will appear in full color, like the surrounding walls, the spiral staircase and the window on the right in the next figure.</p>
+      <table border="0" align="center" cellpadding="0" cellspacing="5">
+        <tr align="center">
+      <td><img src="../images/level1WithHighWalls.png" alt="Adding levels" width="416" height="234"></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top">New level showing in full color the high walls and furniture of the lower level</td>
+    </tr>
+</table>
+      <p>Adding a new level has no direct effect in the 3D view, and no floor is automatically added to separate a level from an other. It's only once you start to draw  walls,  rooms or add some furniture that you will see these new objects appear at the elevation of the new level.</p></td>
+	</tr>
+</table>
+<div id="taskbox">
+  <table width="100%" border="0" cellspacing="0" cellpadding="7" BGCOLOR="#eeeeee">
+    <tr valign="top" BGCOLOR="#eeeeee">
+      <td bgcolor="#eeeeee" width="98%">
+        <table border="0" cellspacing="0" cellpadding="4">
+          <tr valign="top">
+            <td width="16"><p>&#149;</p></td>
+            <td><p>The  height  and the floor thickness 
+              of a new level can be set in the <a href="editingPreferences.html">preferences</a> panel. The elevation of a new level is computed by adding  the elevation of last level, its height and the  floor thickness set in preferences.</p></td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td> Once a level is created you may <a href="editingLevels.html">change</a> its name, its elevation, its height and its floor thickness by double-clicking on its tab, or by choosing <i>Plan &gt; Modify level</i>... from the menu.</td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td> The tabs at the top of the plan view list levels in the order of their elevation, then at a same elevation, in the reverse order of their height.</td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td> Selecting a piece of furniture in the furniture list will select automatically the level it was added to, if this piece can't be viewed in the current level.</td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>Each level in a home can have its own <a href="importingBackground.html">background image</a> to draw walls and rooms upon it.</td>
+          </tr>
+          <tr valign="top">
+            <td>
+              <p>&#149;</p>
+              </td>
+            <td>
+              <p>The walls and ceilings of an other level  drawn with a light color are not printed or copied in the clipboard. They are here to help you find your place and  draw faster the current level.</p>
+              </td>
+          </tr>
+        </table>
+       </td>
+    </tr>
+  </table>
+</div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/creatingHome.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/creatingHome.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/creatingHome.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/creatingHome.html	2011-12-21 00:48:52.000000000 +0000
@@ -31,9 +31,9 @@
           Once a home is created, you may <a href="drawingWalls.html">draw its 
           walls</a>, <a href="addingFurniture.html">add doors, windows and furniture</a> 
           to it, <a href="drawingRooms.html">define its rooms</a> from the drawn 
-          walls, update its <a href="editingCompass.html">geographic location</a>, 
+          walls, create some <a href="addingLevels.html">additional levels</a>, update its <a href="editingCompass.html">geographic location</a>, 
           <a href="drawingDimensions.html">draw some dimensions</a> and <a href="addingTexts.html">add 
-          texts</a> on its plan. As the 3D view is always synchronized with the 
+          texts</a> on its plan. As the 3D view is continously updated from the 
           modifications done in the home plan, don't hesitate to <a href="editing3DView.html">navigate 
           in the 3D view</a> of a home at any time to see it from the best point 
           of view.</p>
@@ -46,7 +46,7 @@
 	<tr valign="top" BGCOLOR="#eeeeee">
 	<td bgcolor="#eeeeee" width="98%">
 	<table border="0" cellspacing="0" cellpadding="4"><tr valign="top"><td width="16"><p>&#149;</p></td><td>
-	<p>The default height of the walls in a new home is set by the value of <i>New home walls height</i> in the <a href="editingPreferences.html">preferences</a> pane.
+	<p>The default height of the walls in a new home is set by the value of <i>New  walls height</i> in the <a href="editingPreferences.html">preferences</a> pane.
 	  After its creation, any wall may have a different height by <a href="editingWalls.html">editing it</a>.</p>
 	</td></tr>
 	<tr valign="top"><td width="16"><p>&#149;</p></td><td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/creatingPhotos.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/creatingPhotos.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/creatingPhotos.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/creatingPhotos.html	2011-12-21 00:48:52.000000000 +0000
@@ -88,7 +88,7 @@
           and the power of lights. By default, the image is computed at midday 
           with additional lights automatically placed at the ceiling of each <a href="drawingRooms.html">room</a>. 
           If you want to control better the light sources in your home, possibly 
-          uncheck the <i>Add ceiling lights</i> check box, add some items of the 
+          uncheck the <i>Add ceiling lights</i> check box, add some objects of the 
           <i>Lights</i> category in the plan and adjust their power either with 
           their power indicator or by <a href="editingFurniture.html">editing</a> 
           their attributes. The power of the sun, the color and the direction 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editing3DView.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editing3DView.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editing3DView.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editing3DView.html	2011-12-21 00:48:52.000000000 +0000
@@ -128,7 +128,7 @@
         <p align="center"><img src="images/editing3DView.png" width="347" height="214"></p>
         <p>In the 3D view pane, you may change&nbsp;the virtual visitor field of view, its height, the color or the texture
           of the ground and
-          the sky, the light brightness and walls transparency.<br>
+          the sky, the light brightness and walls (and floors) transparency.<br>
         The elevation of the virtual visitor point of view is equal to 13/14 of its height to respect adult human proportions.</p>
       </td>
   </tr>
@@ -137,7 +137,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="7" BGCOLOR="#eeeeee">
 	<tr valign="top" BGCOLOR="#eeeeee">
 	<td bgcolor="#eeeeee" width="98%">
-	<table border="0" cellspacing="0" cellpadding="4"><tr valign="top"><td width="16"><p>&#149;</p></td><td><p>Press the <i>shift</i>	        key to slow down the effect of mouse moves and mouse wheel in the 3D view.</p></td></tr>
+	<table border="0" cellspacing="0" cellpadding="4"><tr valign="top"><td width="16"><p>&#149;</p></td><td><p>Press the <i>shift</i>	        key to increase the effect of mouse moves and mouse wheel in the 3D view.</p></td></tr>
 	  <tr valign="top">
         <td><p>&#149;</p>
         </td>
@@ -148,7 +148,7 @@
 	    <td width="16"><p>&#149;</p>
 	      </td>
 	    <td><p>The moves in the 3D view aren't considered as undoable
-	        operations, but the current position in 3D view is <a href="savingHome.html">saved</a> in a Sweet Home 3D file
+	        operations, but the current position in the 3D view is <a href="savingHome.html">saved</a> in a Sweet Home 3D file
 	        when you choose <i>File &gt; Save</i> or <i>File &gt; Save
 	        as...</i>.</p>
 	      </td>
@@ -169,12 +169,15 @@
         </td>
 	    </tr>
 	  <tr valign="top">
-	    <td><p>&#149;</p>
-	      </td>
+	    <td><p>&#149;</p></td>
 	    <td><p>Nothing prevents the virtual visitor from being inside a wall or very far from home. If you don't know where
-	        the virtual visitor is located, roll the mouse wheel with the mouse pointer in 3D view, it will automatically
-	        select and show the virtual visitor in the home plan.</p>
+	      the virtual visitor is located, roll the mouse wheel with the mouse pointer in 3D view, it will automatically
+	      select and show the virtual visitor in the home plan.</p></td>
+	    </tr>
+	  <tr valign="top">
+	    <td><p>&#149;</p>
 	      </td>
+	    <td><p>If you want to always see all the levels in the 3D view whatever the selected level is, choose <i>3D view &gt; Display all levels</i> menu item. To display the selected level and all the other lower levels, choose <i>3D view &gt; Display selected level</i> menu item.</p></td>
 	    </tr>
 	</table>
 	
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingCompass.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingCompass.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingCompass.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingCompass.html	2011-12-21 00:48:52.000000000 +0000
@@ -28,9 +28,9 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
   <tr>
     <td><p>Every new home displays a compass rose at the top left of its plan. 
-          As other items in the plan, it may be moved with a drag and drop operation 
+          As other objects in the plan, it may be moved with a drag and drop operation 
           or the keyboard arrows after selecting it.</p>
-        <p> When the compass rose is the <b>only </b>item selected in the plan, 
+        <p> When the compass rose is the <b>only </b>object selected in the plan, 
           you may resize it or change the direction of the North with its indicators.</p>
         <p align="center"><img src="../images/compassIndicators.png" alt="Compass indicators" width="108" height="121"></p>
     </td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingDimensions.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingDimensions.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingDimensions.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingDimensions.html	2011-12-21 00:48:52.000000000 +0000
@@ -110,11 +110,11 @@
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
-              <td> <p>If the items selected in the plan contain walls, rooms, 
-                  furniture, dimensions and texts, all these items will be moved 
+              <td> <p>If the objects selected in the plan contain walls, rooms, 
+                  furniture, dimensions and texts, all these objects will be moved 
                   with a drag and drop or the keyboard arrows. If you keep the 
                   <i>ctrl</i> key (or under Mac OS X, the <i>alt</i> key) pressed 
-                  while you drag and drop these items, they will be duplicated.</td>
+                  while you drag and drop these objects, they will be duplicated.</td>
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingFurniture.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -28,18 +28,18 @@
   <tr>
     <td><p>You may edit the location, the size, the elevation and the angle of 
           home furniture, either with the mouse or with the <i>Furniture &gt; 
-          Modify...</i> menu.<br>
+          Modify...</i> menu item.<br>
           To edit pieces of furniture with the mouse, select them in the home 
           plan or furniture list first. To select&nbsp;one piece in the plan, 
           click on it. To select multiple pieces in the plan, draw a selection 
           rectangle around them, or click on pieces while pressing <i>shift</i> 
           key. <br>
-          To avoid selecting furniture with other kinds of items in the plan, 
+          To avoid selecting furniture with other kinds of objects in the plan, 
           lock the base plan by clicking on the lock displayed at the top left 
           of the plan pane or by choosing <i>Plan &gt; Lock base plan</i> out 
           of the menu. This will disallow the selection of walls, rooms, dimensions, 
           free texts, doors and windows, to let you arrange your furniture more 
-          easily. Clicking a second time on the lock or adding any item to the 
+          easily. Clicking a second time on the lock or adding any object to the 
           plan that is not a piece of furniture will unlock the plan.<br>
           To move the selected pieces, place the mouse pointer inside the selected 
           box of one these pieces then drag and drop them, or press the keyboard 
@@ -72,7 +72,7 @@
                       <td nowrap><p>2.</p>
                       </td>
                       <td><p>The elevation indicator shows the corner you can drag  to change the elevation of the
-                          selected piece.</p>
+                          selected piece (in relation to the elevation of the level it was added to if the home contains <a href="addingLevels.html">multiple levels</a>).</p>
                       </td>
                     </tr>
                     <tr valign="top">
@@ -82,7 +82,7 @@
                   to change the height of the selected piece.<br>
                   If the piece of furniture is a light source or a lamp containing 
                   light sources, this indicator is a light dimmer. If you want 
-                  to modify the height of such items, edit its attributes as indicated 
+                  to modify the height of such objects, edit its attributes as indicated 
                   in the next paragraph.</p>
                       </td>
                     </tr>
@@ -127,11 +127,15 @@
         <table border="0" cellspacing="0" cellpadding="4">
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
-              <td> <p>If you want to modify the attributes of a set of pieces, 
+              <td> <p>When the <i>Visible</i> column is displayed in the furniture list, the visibility of the selected piece of furniture may be changed also by clicking directly on the <i>Visible</i> check box in the list.</td>
+            </tr>
+            <tr valign="top">
+              <td><p>&#149;</p></td>
+              <td><p>If you want to modify the attributes of a set of pieces, 
                   select these pieces and choose <i>Furniture &gt; Modify...</i>. 
                   The values of the attributes that are different from one piece 
                   to another in the selected furniture set, will appear blank 
-                  in the furniture pane.</td>
+              in the furniture pane.</td>
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
@@ -155,6 +159,10 @@
                   makes a hole. This computation isn't made for the other kinds 
                   of furniture. </td>
             </tr>
+            <tr valign="top">
+              <td><p>&#149;</p></td>
+              <td><p>When your home contains more than one level, a staircase is able to  automatically make a hole in the ceiling and the floor of upper levels when its height is higher than the elevation of the upper level.</td>
+            </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
               <td> <p>Modifying the power of lights has some effect only in the 
@@ -170,16 +178,16 @@
               <td> <p>If a piece of furniture is dropped on an other one, it will 
                   be elevated to appear on the top of the latter, when its selection 
                   rectangle is included in the one of the latter and its elevation 
-                  is equal to zero (at floor level). This automatic behavior is 
-                  disabled when magnetism is disabled. </td>
+                  is equal to zero (on the floor of the selected level). This automatic behavior is 
+              disabled when magnetism is disabled. </td>
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
-              <td> <p>If the items selected in the plan contain walls, rooms, 
-                  furniture, dimensions and texts, all these items will be moved 
+              <td> <p>If the objects selected in the plan contain walls, rooms, 
+                  furniture, dimensions and texts, all these objects will be moved 
                   with a drag and drop or the keyboard arrows. If you keep the 
                   <i>ctrl</i> key (or under Mac OS X, the <i>alt</i> key) pressed 
-                  while you drag and drop these items, they will be duplicated.</td>
+                  while you drag and drop these objects, they will be duplicated.</td>
             </tr>
             <tr valign="top"> 
               <td width="16"> <p>&#149;</p></td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingLevels.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingLevels.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingLevels.html	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingLevels.html	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,60 @@
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
+	<title>Editing levels</title>
+	<link href="../help.css" rel="stylesheet" media="all">
+</head>
+
+<body  bgcolor="#ffffff">
+<div id="banner">
+	<div id="helpheader">
+		<a class="bread" href="index.html">Sweet Home 3D Help</a> > <a class="bread" href="tocEditing.html">Editing
+					      preferences, plan and 3D view</a>
+	</div>
+</div>
+<div id="mainbox" align="left">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr valign="bottom" height="32">
+	<td width="3" height="32">&nbsp;</td>
+	<td width="32" height="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+	<td width="8" height="32">&nbsp;&nbsp;</td>
+	<td valign="bottom" height="32"><font id="topic">Editing levels</font></td>
+	</tr>
+	<tr height="10">
+	<td colspan="4" height="10">&nbsp;</td>
+	</tr>
+</table>
+<table width="100%" border="0" cellspacing="0" cellpadding="3">
+  <tr>
+    <td><p>You may edit the name, the elevation and the heights of a level by double-clicking on its tab, or by choosing <i>Plan &gt; Modify level</i>... from the menu.<br>
+      The modification pane of a level lets you edit its attributes, but also shows a table 
+      describing all the levels of a home where the selected line matches the currently edited level.</p>
+<p align="center"><img src="images/editingLevels.png" alt="Modify level" width="294" height="321"></p>
+	    <p>The thickness of the floor is used to compute the vertical border around a floor in the 3D view. This surface is visible  around holes in the floor and at the border of a mezzanine or a balcony.<br>
+	      The elevation 
+	    of a level can be positive or negative. In the later case, the ground will be automatically dug in the 3D view each time a piece of furniture, a room or a closed set of walls is added to the underground level. This feature can be used to place a swimming pool in the ground or to create a basement with one or more levels.</p></td>
+	</tr>
+</table>
+<div id="taskbox">
+  <table width="100%" border="0" cellspacing="0" cellpadding="7" BGCOLOR="#eeeeee">
+    <tr valign="top" BGCOLOR="#eeeeee">
+      <td bgcolor="#eeeeee" width="98%">
+        <table border="0" cellspacing="0" cellpadding="4">
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td> It's not mandatory to enter values that will have the effect of superimposing  levels on top of each other. 
+              You may use the level feature to manage intermediate levels, raised floors and false ceilings. You can also use levels at the same elevation as layers to isolate some objects like <a href="drawingDimensions.html">dimension lines</a> or <a href="addingTexts.html">texts</a>.</td>
+          </tr>
+            <tr valign="top"> 
+              <td width="16"> <p>&#149;</p></td>
+              <td> <p>The tabs at the top of the plan view display the name of the levels in the order of their elevation, then at a same elevation, in the reverse order of their height. Changing the elevation and/or the height of a level will automatically update the order of the tabs.</td>
+            </tr>
+          </table>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingPreferences.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -28,15 +28,16 @@
 	<tr>
 	<td><p>To edit Sweet Home 3D preferences, choose <i>Sweet Home 3D &gt; Preferences...</i> under Mac OS X or <i>File &gt; Preferences...</i> under
 	    other systems.</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="358" height="381"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="357" height="402"></p>
 	  <p>In the preferences pane, you can choose the <i>Language</i> used in Sweet Home 3D user interface and the <i>Unit</i> used
-	    to draw  the rulers and grid of the home plan, and to display lengths and areas.</p>
+	    to draw  the rulers and grid of the home plan, and to display lengths and areas.<br>
+	    The button beside the <i>Language</i> drop down list lets you also import some additional languages library files with a SH3L extension. </p>
 	    <p> The <i>Category folders</i> and the <i>Searchable list</i> radio buttons 
           let you choose how the furniture catalog should be displayed in each 
           <a href="ui.html">Sweet Home 3D window</a>.<br>
           The <i>3D navigation arrows</i> check box allows to display arrow buttons 
           that will help you to <a href="editing3DView.html">navigate in the 3D 
-          view</a>.</p>
+        view</a>.</p>
         <p> The <i>Magnetism</i> check box enables or disables the magnetism used 
           in the home plan during <a href="drawingWalls.html">walls drawing</a> 
           and <a href="editingFurniture.html">furniture placing</a>.<br>
@@ -55,8 +56,8 @@
         <p>	      The <i>New walls thickness</i> value sets the thickness of all the walls that will be created once the preferences
 	        pane will be closed.<br>
           The <i>New  walls height</i> value 
-	        sets the height of all the walls that will be created once the preferences pane will
-        be closed. </p>	  
+	        sets the height of the new walls and of the new levels. <br>
+        The <i>New floors thickness</i> sets the thickness of the floors of new levels. </p>	  
         <p>The value of the field associated to the <i>Save home data for recovery</i> 
           check box sets the delay in minutes between two save operations of the 
           opened homes. These homes are automatically saved in private files, 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingRooms.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingRooms.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingRooms.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingRooms.html	2011-12-21 00:48:52.000000000 +0000
@@ -124,11 +124,10 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>The elevation of the floor of a room is always  0. The height of the ceiling of a room is computed at each
+              <p>The elevation of the floor of a room is always  equal to the elevation of the <a href="addingLevels.html">level</a> the room belongs to (i.e. 0 if no level was added to home). If the room isn't at the <b>last level</b>, the elevation of the ceiling will be equal to the elevation + the height of the level it belongs to. Otherwise, the height of the ceiling of a room is computed at each
                 point of the room, and the height at each of these points is equal to the height of the closest start or
                 end  point of a wall. This allows to create the ceiling of a garret when you set different heights at the
-                start and end points of
-                 <a href="editingWalls.html">sloping walls</a>.</td>
+              start and end points of <a href="editingWalls.html">sloping walls</a>.</td>
           </tr>
           <tr valign="top">
             <td>
@@ -155,10 +154,10 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>If the items selected in the plan contain walls,  rooms, furniture,  dimensions and texts, all these
-                items will be moved with a drag and drop or the keyboard arrows. If you keep the <i>ctrl</i> key (or under Mac
+              <p>If the objects selected in the plan contain walls,  rooms, furniture,  dimensions and texts, all these
+                objects will be moved with a drag and drop or the keyboard arrows. If you keep the <i>ctrl</i> key (or under Mac
                 OS X, the <i>alt</i> key) pressed while
-              you drag and drop these items, they will be duplicated.</td>
+              you drag and drop these objects, they will be duplicated.</td>
           </tr>
           <tr valign="top">
             <td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingWalls.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingWalls.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingWalls.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/editingWalls.html	2011-12-21 00:48:52.000000000 +0000
@@ -146,10 +146,10 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>If the items selected in the plan contain walls,  rooms, furniture,  dimensions and texts, all these
-                items will be moved with a drag and drop or the keyboard arrows. If you keep the <i>ctrl</i> key (or under Mac
+              <p>If the objects selected in the plan contain walls,  rooms, furniture,  dimensions and texts, all these
+                objects will be moved with a drag and drop or the keyboard arrows. If you keep the <i>ctrl</i> key (or under Mac
                 OS X, the <i>alt</i> key) pressed while
-              you drag and drop these items, they will be duplicated.</td>
+              you drag and drop these objects, they will be duplicated.</td>
           </tr>
           <tr valign="top">
             <td>
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/images/editingLevels.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/images/editingLevels.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/importingBackground.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/importingBackground.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/importingBackground.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/importingBackground.html	2011-12-21 00:48:52.000000000 +0000
@@ -66,7 +66,7 @@
             </td>
             <td><p>Define the scale of the image by moving the end points of the colored line drawn in the image, in such
                 a way  that this line matches a known length. Then type the real length of this line in the <i>Length of
-                the drawn line</i> field, and click on <i>Continue</i>.</p>
+                the drawn line</i> field taking care of the current unit, and click on <i>Continue</i>.</p>
             </td>
           </tr>
           <tr valign="top">
@@ -120,12 +120,16 @@
               <p>Avoid importing a too large file.</td>
           </tr>
           <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>When you import a scanned image of your home plan, ensure  the image is correctly rotated. A rotation
+              of only one degre make you lose the alignment between image borders and some walls.</td>
+          </tr>
+          <tr valign="top">
             <td>
               <p>&#149;</p>
             </td>
             <td>
-              <p>When you import a scanned image of your home plan, ensure  the image is correctly rotated. A rotation
-                of only one degre make you lose the alignment between image borders and some walls.</td>
+              <p>Each <a href="addingLevels.html">level</a> in a home can have its own background image.</td>
           </tr>
           <tr valign="top">
             <td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/importingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/importingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/importingFurniture.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/importingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -72,7 +72,7 @@
             <td nowrap><p>3.</p>
             </td>
             <td><p>Change if necessary the name, the size, the elevation, the color of the imported model  and whether this
-                model is movable and is a door or a window<i></i>.<br>
+                model is movable and is a door, a window<i></i> or staircase.<br>
                 When a 3D model is imported to home furniture list or  home plan, check <i>Add to catalog</i> check box
                 if you want to import it also into furniture catalog. <br>
                   Uncheck the <i>Keep proportions</i> check box if you want to change the width, the depth or the height
@@ -120,6 +120,10 @@
                 on Linux.</td>
           </tr>
           <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>If you need to rotate a 3D model by steps of 1&deg; instead of 90&deg;, maintain the <i>shift</i> key pressed while clicking on the arrow buttons at the second step.</td>
+          </tr>
+          <tr valign="top">
             <td>
               <p>&#149;</p>
             </td>
@@ -137,6 +141,16 @@
                 of furniture.</td>
           </tr>
 		  <tr valign="top">
+		    <td><p>&#149;</p></td>
+		    <td><p>When magnetism is active, only             doors or windows can be placed on a wall with the mouse, and only this kind of furniture is able to make a hole
+	          in walls. Therefore, don't forget to select the <i>Door or window</i> check box if you want an imported piece of furniture to behave this way. </td>
+		    </tr>
+		  <tr valign="top">
+		    <td><p>&#149;</p></td>
+		    <td><p>Only staircases             are able to make automatically a hole
+		      in the ceiling and the floor of uppers levels. Therefore, don't forget to select the <i>Staircase</i> check box if you want an imported piece of furniture to behave this way. </td>
+		    </tr>
+		  <tr valign="top">
             <td>
               <p>&#149;</p>
             </td>
@@ -164,12 +178,9 @@
               catalog    (i.e. import, modifications and deletion) can be undone. </td>
           </tr>
           <tr valign="top">
-            <td>
-              <p>&#149;</p>
-            </td>
-            <td>
-              <p>The characteristics of imported catalog furniture are automatically stored in preferences and their 3D model
-                and icon files are stored in folders specific to Sweet Home 3D.</td>
+            <td><p>&#149;</p></td>
+            <td><p>The characteristics of imported catalog furniture are automatically stored in preferences and their 3D model
+              and icon files are stored in folders specific to Sweet Home 3D.</td>
           </tr>
         </table>
       </td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/printingHome.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/printingHome.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/printingHome.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/printingHome.html	2011-12-21 00:48:52.000000000 +0000
@@ -81,6 +81,10 @@
             </td>
           </tr>
           <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>If the printed home contains more than one <a href="addingLevels.html">level</a>, the printed furniture list will contain only the furniture visible at the currently selected level, except if you request to print only the furniture list, in which case all the furniture list will be printed. The printed plan and 3D view will be the ones currently displayed at screen. To print the plan or the 3D view of several levels, select then print  each level one by one.</p></td>
+          </tr>
+          <tr valign="top">
             <td width="16"><p>&#149;</p>
             </td>
             <td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/savingHome.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/savingHome.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/savingHome.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/savingHome.html	2011-12-21 00:48:52.000000000 +0000
@@ -42,7 +42,7 @@
             menu item,</li>
           <li>create a <a href="creatingVideos.html">video</a> at Quicktime MOV 
             format from a path in the 3D view, by choosing <i>3D view &gt; Create 
-            video...</i> menu item</li>
+            video...</i> menu item,</li>
           <li>export the 3D view of a home to OBJ format by choosing <i>3D view 
             &gt; Export to OBJ format...</i> menu item. This feature lets you 
             choose the OBJ file which will describe all the objects of the 3D 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tips.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tips.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tips.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tips.html	2011-12-21 00:48:52.000000000 +0000
@@ -112,7 +112,7 @@
           <TR VALIGN="top"> 
             <td><p>&#149;</p></td>
             <TD> <P>When you choose <i>Edit &gt; Copy </i>or <i>Edit &gt; Cut</i>, 
-                the selected items in furniture list are also copied in clipboard 
+                the selected objects in furniture list are also copied in clipboard 
                 as a text at CSV format, that you may paste in a text editor or 
                 a spreadsheet (this feature may not work under Linux).</P></TD>
           </TR>
@@ -145,7 +145,7 @@
           <TR VALIGN="top"> 
             <td width="16"><p>&#149;</p></td>
             <TD> <P>When you choose <i>Edit &gt; Copy </i>or <i>Edit &gt; Cut</i>, 
-                the selected items in the plan are also copied in the clipboard 
+                the selected objects in the plan are also copied in the clipboard 
                 as an image, that you may paste in an other application (this 
                 feature may not work under Linux). If you prefer an image of the 
                 plan in a vector graphics format, choose <i>Plan &gt; Export to 
@@ -158,16 +158,16 @@
           <tr valign="top"> 
             <td><p>&#149;</p></td>
             <td> <p>Lock the base plan to select and arrange <a href="editingFurniture.html">furniture</a> 
-                without being annoyed by the other kinds of items displayed in 
+                without being annoyed by the other kinds of objects displayed in 
                 the plan.</p></td>
           </tr>
           <TR VALIGN="top"> 
             <td><p>&#149;</p></td>
-            <TD> <P> If you want to select an item which is hidden by other items 
-                in home plan, select it in the furniture list&nbsp;; you may also 
+            <TD> <P> If you want to select an object which is hidden by other objects 
+                in home plan, select it in the furniture list&nbsp;; you may also select it by placing the mouse cursor where the objects overlap, then selecting the hidden object in the <i>Select object</i> contextual sub-menu. Finally, you may also 
                 select it in plan with a selection rectangle that includes it, 
-                into which you unselect the items that hide it with a click while 
-                maintaining the <i>shift</i> key pressed.</P></TD>
+                into which you unselect the objects that hide it with a click while 
+            maintaining the <i>shift</i> key pressed.</P></TD>
           </TR>
           <tr valign="top"> 
             <td width="16"><p>&#149;</p></td>
@@ -176,7 +176,7 @@
           </tr>
           <tr valign="top"> 
             <td><p>&#149;</p></td>
-            <td> <p>To duplicate selected items in plan, drag and drop them while 
+            <td> <p>To duplicate selected objects in plan, drag and drop them while 
                 keeping the <i>ctrl</i> key pressed (or under Mac OS X, the <i>alt</i> 
                 key pressed).</p></td>
           </tr>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tocCreating.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tocCreating.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tocCreating.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tocCreating.html	2011-12-21 00:48:52.000000000 +0000
@@ -44,6 +44,7 @@
 						<p><A HREF="drawingRooms.html">Drawing rooms</A></p>
 						<p><a href="drawingDimensions.html">Drawing dimensions</a></p>
 						<p><a href="addingTexts.html">Adding texts</a></p>
+						<p><a href="addingLevels.html">Adding levels</a></p>
 						<p><A HREF="savingHome.html">Saving and opening a home</A></p>
 						<p><A HREF="printingHome.html">Printing a home</A></p></td>
 				</tr>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tocEditing.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tocEditing.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tocEditing.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/tocEditing.html	2011-12-21 00:48:52.000000000 +0000
@@ -44,6 +44,7 @@
 						<p><A HREF="editingFurniture.html">Editing furniture</A></p>
 						<p><A HREF="editingRooms.html">Editing rooms</A></p>
       					<p><A HREF="editingDimensions.html">Editing dimensions</A></p>
+      					<p><A HREF="editingLevels.html">Editing levels</A></p>
 						<p><A HREF="editing3DView.html">Editing 3D view</A></p> 
      				    
         				<p><A HREF="editingCompass.html">Editing compass and geographic location</A> </p>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/ui.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/ui.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/ui.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/en/ui.html	2011-12-21 00:48:52.000000000 +0000
@@ -75,7 +75,7 @@
                             your
                             <a href="editingFurniture.html">furniture</a>                        with
                             the
-                            mouse or the keyboard arrows.</p>
+                            mouse or the keyboard arrows. When a home has more than one <a href="addingLevels.html">level</a>, the name of each level is displayed in tabs at the top of the plan.</p>
                       </td>
                     </tr>
                     <tr valign="top">
@@ -111,7 +111,7 @@
           customize a Sweet Home 3D window in many ways. As the following image 
           of the same home shows, the language and the unit used in Sweet Home 3D 
           may be changed, the furniture catalog may be displayed as a searchable 
-          list, the columns in the furniture list may be modified, items in the 
+          list, the columns in the furniture list may be modified, objects in the 
           plan may be viewed in a different way, the navigation arrows in the 
           3D view may be hidden...</p>
         <p align="center"><img src="../images/applicationPanesVirtualVisit.png" alt="Other view of the User Interface" width="443" height="381"></p></td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/editing3DView.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/editing3DView.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/editing3DView.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/editing3DView.html	2011-12-21 00:48:52.000000000 +0000
@@ -136,7 +136,7 @@
         <td bgcolor="#eeeeee" width="98%"> <table border="0" cellspacing="0" cellpadding="4">
             <tr valign="top">
               <td width="16"><p>&#149;</p></td>
-              <td><p>Pulsa la tecla <i>shift</i> para ralentizar el efecto de 
+              <td><p>Pulsa la tecla <i>shift</i> para aumentar el efecto de 
                   los movimientos del ratón y rueda del ratón en la vista 3D.</p></td>
             </tr>
             <tr valign="top"> 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/editingPreferences.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -27,7 +27,7 @@
       <td><p>Para editar las preferencias de Sweet Home 3D, elige <i>Sweet Home 3D 
           &gt; Preferencias...</i> en Mac OS X o <i>Archivo &gt; Preferencias...</i> 
           en otros sistemas.</p>
-        <p align="center"><img src="images/editingPreferences.png" width="447" height="379"></p>
+        <p align="center"><img src="images/editingPreferences.png" width="450" height="404"></p>
         <p>En el panel preferencias, puedes elegir el <i>Idioma</i> usado en la 
           interfaz de usuario de Sweet Home 3D y las <i>Unidades</i> usadas para 
           dibujar las reglas y rejillas del plano, y mostrar las longitudes.</p>
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/es/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/addingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/addingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/addingFurniture.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/addingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -71,16 +71,16 @@
             <td>
               <p>Un meuble de type porte ou fen&ecirc;tre indique &agrave; Sweet Home 3D de trouer automatiquement les murs
                 &agrave; l'endroit de leur intersection avec les portes ou fen&ecirc;tres.
-                Ce calcul n'est pas effectu&eacute; pour les autres types de meubles. </td>
+              Un meuble de type escalier est quant &agrave; lui capable de trouer le plafond et le plancher d'un niveau sup&eacute;rieur. Ce calcul n'est pas effectu&eacute; pour les autres types de meubles. </td>
           </tr>
           <tr valign="top">
             <td>
               <p>&#149;</p>
             </td>
             <td>
-              <p>Si un un &eacute;l&eacute;ment du mobilier est d&eacute;pos&eacute; sur un autre, son &eacute;l&eacute;vation
+              <p>Si un meuble est d&eacute;pos&eacute; sur un autre, son &eacute;l&eacute;vation
                 sera calcul&eacute;e pour que celui-ci apparaisse sur le dessus du second, si son rectangle de s&eacute;lection
-                est inclus dans celui de l'autre &eacute;l&eacute;ment et si son &eacute;l&eacute;vation par d&eacute;faut est
+                est inclus dans celui de l'autre objet et si son &eacute;l&eacute;vation par d&eacute;faut est
               nulle (au niveau du sol).</td>
           </tr>
           <tr valign="top">
@@ -119,7 +119,7 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>L'<a href="drawingWalls.html">outil <i>Selectionner</i></a> est automatiquement s&eacute;lectionn&eacute; apr&egrave;s l'ajout
+              <p>L'<a href="drawingWalls.html">outil <i>S&eacute;lectionner</i></a> est automatiquement s&eacute;lectionn&eacute; apr&egrave;s l'ajout
                 d'un meuble au logement.</p>
             </td>
           </tr>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/addingLevels.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/addingLevels.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/addingLevels.html	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/addingLevels.html	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,93 @@
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
+	<meta name="keywords" content="etages, �tages">
+	<title>Ajout de niveaux</title>
+	<link href="../help.css" rel="stylesheet" media="all">
+</head>
+
+<body  bgcolor="#ffffff">
+<div id="banner">
+	<div id="helpheader"><a class="bread" href="index.html">Aide Sweet Home 3D</a> > <A class="bread" HREF="tocCreating.html">Cr&eacute;ation de
+	logements, de	murs et de meubles</A></div>
+</div>
+<div id="mainbox" align="left">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr valign="bottom" height="32">
+	<td width="3" height="32">&nbsp;</td>
+	<td width="32" height="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+	<td width="8" height="32">&nbsp;&nbsp;</td>
+	<td valign="bottom" height="32"><font id="topic">Ajout de niveaux</font></td>
+	</tr>
+	<tr height="10">
+	<td colspan="4" height="10">&nbsp;</td>
+	</tr>
+</table>
+<table width="100%" border="0" cellspacing="0" cellpadding="3">
+	<tr>
+	<td><p>Chaque logement est cr&eacute;&eacute; avec un niveau par d&eacute;faut, mais Sweet Home 3D est aussi capable de g&eacute;rer plusieurs niveaux, avec la possibilit&eacute; pour chaque niveau d'&ecirc;tre au dessus ou en dessous du sol. Pour ajouter un nouveau niveau, choisissez le menu <i>Plan &gt; Ajouter un  niveau</i>. Aussit&ocirc;t que le logement comporte plus d'un niveau, des onglets apparaissent au dessus de la vue du plan pour vous permettre de s&eacute;lectionner le niveau auquel vous voulez ajouter des objets. Le dernier onglet contient un signe <font size="+1"><b>+</b></font> sur lequel vous pouvez  cliquer aussi pour cr&eacute;er des niveaux suppl&eacute;mentaires si besoin.
+</p>
+	  <table border="0" align="center" cellpadding="0" cellspacing="5">
+	    <tr align="center">
+    <td><img src="../images/addingLevel.png" alt="Ajout de niveaux" width="416" height="234"></td>
+    </tr>
+  <tr>
+    <td align="center" valign="top">Nouveau niveau montrant en couleur claire les murs et les plafonds du niveau inf&eacute;rieur </td>
+    </tr>
+</table>
+      <p>Pour vous aider &agrave; vous retrouver dans le niveau sup&eacute;rieur, les murs et les plafonds du niveau inf&eacute;rieur sont en couleur claire dans la vue du plan. Si le niveau en cours d'&eacute;dition est le plus bas, ce sont alors les murs et les planchers du niveau au dessus qui seront dessin&eacute;s en couleur claire. Quand le magn&eacute;tisme est actif, le curseur de la souris est magn&eacute;tis&eacute; sur ces murs et ces pi&egrave;ces pour vous simplifier l'utilisation des outils de dessin des murs et des pi&egrave;ces. Si besoin, vous pouvez aussi copier des murs, des pi&egrave;ces ou des meubles d'un autre niveau pour les coller dans le nouveau niveau.</p>
+      <p>Chaque niveau a une &eacute;l&eacute;vation et d'autres attributs qui peuvent &ecirc;tre <a href="editingLevels.html">modifi&eacute;s</a>. Si le haut des murs et des meubles ajout&eacute;s &agrave; un niveau inf&eacute;rieur est plus &eacute;lev&eacute; que l'&eacute;l&eacute;vation du niveau s&eacute;lectionn&eacute;, ils appara&icirc;tront alors en couleur normale, comme les murs ext&eacute;rieurs, l'escalier en colima&ccedil;on et la fen&ecirc;tre &agrave; droite dans la figure suivante.</p>
+      <table border="0" align="center" cellpadding="0" cellspacing="5">
+        <tr align="center">
+      <td><img src="../images/level1WithHighWalls.png" alt="Ajout de niveaux" width="416" height="234"></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top"><p>Nouveau niveau montrant en couleur normale les murs  et meubles &eacute;lev&eacute;s du niveau inf&eacute;rieur</p></td>
+    </tr>
+</table>
+      <p>L'ajout d'un nouveau niveau n'a aucun effet direct dans la vue 3D, et aucun plancher n'est ajout&eacute; automatiquement pour s&eacute;parer un niveau d'un autre. Ca n'est qu'&agrave; partir du moment o&ugrave; vous commencez &agrave; y dessiner des murs, des pi&egrave;ces et y ajouter du mobilier que vous verrez appara&icirc;tre ces nouveaux objets &agrave; l'&eacute;l&eacute;vation du nouveau niveau.</p></td>
+	</tr>
+</table>
+<div id="taskbox">
+  <table width="100%" border="0" cellspacing="0" cellpadding="7" BGCOLOR="#eeeeee">
+    <tr valign="top" BGCOLOR="#eeeeee">
+      <td bgcolor="#eeeeee" width="98%">
+        <table border="0" cellspacing="0" cellpadding="4">
+          <tr valign="top">
+            <td width="16"><p>&#149;</p></td>
+            <td><p>La hauteur et l'&eacute;paisseur de plancher d'un nouveau niveau
+              peut &ecirc;tre modifi&eacute;e dans le panneau des <a href="editingPreferences.html">pr&eacute;f&eacute;rences</a>. L'&eacute;l&eacute;vation d'un nouveau niveau est calcul&eacute;e en additionnant l'&eacute;l&eacute;vation du dernier niveau, sa hauteur et l'&eacute;paisseur de plancher choisie dans les pr&eacute;f&eacute;rences.</p></td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td> Une fois qu'un niveau est cr&eacute;&eacute;, vous pouvez <a href="editingLevels.html">modifier</a> son nom, son &eacute;l&eacute;vation et ses hauteurs en double-cliquant sur son onglet, ou en choisissant le menu <i>Plan &gt; Modifier le niveau</i>....</td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td> Les onglets au dessus de la vue du plan sont tri&eacute;s dans l'ordre de l'&eacute;l&eacute;vation des niveaux, puis &agrave; &eacute;l&eacute;vation &eacute;gale dans l'ordre inverse de leur hauteur.</td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td> La s&eacute;lection d'un meuble dans la liste des meubles s&eacute;lectionnera automatiquement le niveau dans lequel le meuble avait &eacute;t&eacute; ajout&eacute;, si ce meuble ne peut &ecirc;tre visualis&eacute; dans le niveau en cours de s&eacute;lection.</td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>Chaque niveau d'un logement peut avoir sa propre  <a href="importingBackground.html">image d'arri&egrave;re plan</a> pour dessiner des murs et des pi&egrave;ces par dessus.</td>
+          </tr>
+          <tr valign="top">
+            <td>
+              <p>&#149;</p>
+              </td>
+            <td>
+              <p>Les murs et les plafonds  d'un autre niveau dessin&eacute; en couleur claires ne sont ni imprim&eacute;s, ni copi&eacute;s dans le presse-papier. Ils sont pr&eacute;sents uniquement pour vous aider &agrave; vous y retrouver et dessiner plus rapidement le niveau sup&eacute;rieur.</p>
+              </td>
+          </tr>
+        </table>
+       </td>
+    </tr>
+  </table>
+</div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingHome.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingHome.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingHome.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingHome.html	2011-12-21 00:48:52.000000000 +0000
@@ -30,7 +30,7 @@
           Une fois qu'un logement est cr&eacute;&eacute;, vous pouvez <a href="drawingWalls.html">dessiner 
           ses murs</a>, y <a href="addingFurniture.html">ajouter des portes, des 
           fen&ecirc;tres et des meubles</a>, <a href="drawingRooms.html">d&eacute;finir 
-          ses pi&egrave;ces</a> &agrave; partir de ses murs, ajuster sa <a href="editingCompass.html">position 
+          ses pi&egrave;ces</a> &agrave; partir de ses murs, cr&eacute;er des <a href="addingLevels.html">niveaux suppl&eacute;mentaires</a>, ajuster sa <a href="editingCompass.html">position 
           g&eacute;ographique</a>, ajouter <a href="drawingDimensions.html">des 
           cotes</a> et <a href="addingTexts.html">des textes</a> sur son plan. 
           Comme la vue 3D est toujours&nbsp;synchronis&eacute;e avec les modifications 
@@ -49,7 +49,7 @@
 	<td bgcolor="#eeeeee" width="98%">
 	<table border="0" cellspacing="0" cellpadding="4"><tr valign="top"><td width="16"><p>&#149;</p></td><td>
 	<p>La hauteur par d&eacute;faut des murs d'un nouveau logement est d&eacute;termin&eacute;e par la valeur de la <i>Hauteur
-	    des nouveaux logements</i>	  du panneau des <a href="editingPreferences.html">pr&eacute;f&eacute;rences</a>. Apr&egrave;s
+	    des nouveaux murs</i>	  du panneau des <a href="editingPreferences.html">pr&eacute;f&eacute;rences</a>. Apr&egrave;s
 	    sa cr&eacute;ation, la hauteur d'un mur peut &ecirc;tre modifi&eacute;e en <a href="editingWalls.html">&eacute;ditant</a> ce
 	    mur.</p>
 	</td></tr>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingPhotos.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingPhotos.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingPhotos.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingPhotos.html	2011-12-21 00:48:52.000000000 +0000
@@ -41,7 +41,7 @@
         <p align="center"><img src="images/creatingPhotos.jpg" width="546" height="474"></p>
         <p>Si la taille par d&eacute;faut de l'image ne convient pas, choisissez 
           une largeur et une hauteur diff&eacute;rente. Quand la bo&icirc;te &agrave; 
-          cocher <i>Appliquer les proportions</i> est s&eacute;lectonn&eacute;e, 
+          cocher <i>Appliquer les proportions</i> est s&eacute;lectionn&eacute;e, 
           la hauteur de l'image est automatiquement mise &agrave; jour &agrave; 
           chaque changement de la largeur et ce, en fonction des proportions indiqu&eacute;es 
           par la liste d&eacute;roulante &agrave; c&ocirc;t&eacute; de la bo&icirc;te 
@@ -79,7 +79,7 @@
               <td><img src="../images/photoQuality1.jpg" alt="Quality 1" width="240" height="160" border="1" align="absmiddle"  ></td>
               <td><p>2. Le second niveau de qualit&eacute; est le m&ecirc;me que 
                   le niveau le moins &eacute;lev&eacute; avec des ombres affich&eacute;s 
-                  sous les meubles pos&eacute;s sur le sol, ce qui donne un effet 
+                  sous les meubles pos&eacute;s sur le plancher, ce qui donne un effet 
                   plus photor&eacute;aliste.</p></td>
               <td><img src="../images/photoQuality3.jpg" alt="Quality 3" width="240" height="160" border="1" align="absmiddle" ></td>
               <td>4. Le meilleur niveau de qualit&eacute; est proche du pr&eacute;c&eacute;dent 
@@ -98,10 +98,10 @@
           d&eacute;faut, l'image est calcul&eacute;e &agrave; midi avec des lumi&egrave;res 
           suppl&eacute;mentaires plac&eacute;es automatiquement au plafond de 
           chaque <a href="drawingRooms.html">pi&egrave;ce</a>. Si vous voulez 
-          mieux contr&ocirc;ler les sources lumineuses dand votre logement, d&eacute;cochez 
-          eventuellement la bo&icirc;te &agrave; cocher <i>Ajouter des plafonniers</i>, 
-          ajoutez des &eacute;l&eacute;ments de la cat&eacute;gorie <i>Lumi&egrave;res</i> 
-          dans le plan et r&egrave;gler leur puissance avec leur indicateur de 
+          mieux contr&ocirc;ler les sources lumineuses dans votre logement, d&eacute;cochez 
+          &eacute;ventuellement la bo&icirc;te &agrave; cocher <i>Ajouter des plafonniers</i>, 
+          ajoutez des objets de la cat&eacute;gorie <i>Lumi&egrave;res</i> 
+          dans le plan et r&eacute;gler leur puissance avec leur indicateur de 
           puissance ou en <a href="editingFurniture.html">&eacute;ditant</a> leurs 
           valeurs. La luminosit&eacute; du soleil, sa couleur et la direction 
           de ses rayons d&eacute;pendent de l'heure et de la date choisies, mais 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingVideos.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingVideos.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingVideos.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/creatingVideos.html	2011-12-21 00:48:52.000000000 +0000
@@ -27,7 +27,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
 	<tr>
 	<td><p>Pour cr&eacute;er une vid&eacute;o 3D du logement, choisissez le menu 
-          <i>Vue 3D &gt; Cr&eacute;er une vid&eacute;o...</i> our cliquez sur 
+          <i>Vue 3D &gt; Cr&eacute;er une vid&eacute;o...</i> ou cliquez sur 
           l'outil <i>Cr&eacute;er une vid&eacute;o</i>.</p><blockquote> 
           <p><img src="../images/createVideoTool.png" alt="Video Creation tool" width="24" height="24" align="absmiddle">&nbsp;Outil 
             <i>Cr&eacute;er une vid&eacute;o</i> </p>
@@ -81,7 +81,7 @@
                   3D de la fen&ecirc;tre principale de Sweet Home 3D, car une 
                   fois lanc&eacute;e, la g&eacute;n&eacute;ration d'une vid&eacute;o 
                   peut prendre de quelques minutes &agrave; plusieurs heures suivant 
-                  votre am&eacute;nagement, la quailt&eacute; choisie et la puissance 
+                  votre am&eacute;nagement, la qualit&eacute; choisie et la puissance 
                   de votre ordinateur.</p></td>
             </tr>
             <tr valign="top"> 
@@ -92,7 +92,7 @@
                   sont prises en compte pendant le calcul de la vid&eacute;o et 
                   vous laisse cr&eacute;er toute sorte d'animations.<br>
                   Aux deux meilleurs niveaux de qualit&eacute;, vous pouvez aussi 
-                  choisir une heure diff&eacute;rente aus diff&eacute;rents points 
+                  choisir une heure diff&eacute;rente aux diff&eacute;rents points 
                   enregistr&eacute;s, et ce, m&ecirc;me si vous n'avez pas d&eacute;plac&eacute; 
                   la cam&eacute;ra entre deux enregistrements. Si l'heure au premier 
                   point enregistr&eacute; est en d&eacute;but de journ&eacute;e 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingDimensions.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingDimensions.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingDimensions.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingDimensions.html	2011-12-21 00:48:52.000000000 +0000
@@ -27,13 +27,13 @@
   <table width="100%" border="0" cellspacing="0" cellpadding="3">
     <tr> 
       <td><p>Pour dessiner des cotes, vous devez tout d'abord choisir <i>Plan 
-          &gt; Cr&eacute;er les cotes</i> ou selectionner l'outil <i>Cr&eacute;er 
+          &gt; Cr&eacute;er les cotes</i> ou s&eacute;lectionner l'outil <i>Cr&eacute;er 
           les cotes</i>. </p>
         <blockquote> 
           <p><img src="../images/createDimensionsTool.png" alt="Dimension Creation mode tool" width="24" height="24" align="absmiddle">&nbsp;Outil<i> 
             Cr&eacute;er les cotes</i></p>
         </blockquote>
-        <p class="plist">You pouvez cr&eacute;er une nouvelle cote de l'une des 
+        <p class="plist">Vous pouvez cr&eacute;er une nouvelle cote de l'une des 
           fa&ccedil;ons suivantes:</p>
         <ul>
           <li>Cliquez au point de d&eacute;part de la cote, cliquez &agrave; son 
@@ -133,9 +133,9 @@
             </tr>
             <tr valign="top">
               <td width="16"><p>&#149;</p></td>
-              <td> <p>Tant que l'outil<i>Cr&eacute;er les cotes</i> est s&eacute;lectionn&eacute;, 
+              <td> <p>Tant que l'outil <i>Cr&eacute;er les cotes</i> est s&eacute;lectionn&eacute;, 
                   certains outils et menus sont d&eacute;sactiv&eacute;s. Si vous 
-                  avez besoin de ces outils, res&eacute;lectionnez l'outil <i>S&eacute;lectionner</i>.</p></td>
+              avez besoin de ces outils, res&eacute;lectionnez l'outil <i>S&eacute;lectionner</i>.</p></td>
             </tr>
           </table></td>
       </tr>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingRooms.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingRooms.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingRooms.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingRooms.html	2011-12-21 00:48:52.000000000 +0000
@@ -42,7 +42,7 @@
 	  </ul>
 	  <p>Quand vous dessinez une pi&egrave;ce point par point avec le magn&eacute;tisme activ&eacute;, un guide sous forme d'un point color&eacute; appara&icirc;tra
 	    pour vous aider &agrave; cliquer &agrave; l'intersection des murs. Une pi&egrave;ce cr&eacute;&eacute;e avec un double-clic couvre la superficie du
-	    sol comprise entre les murs qui entourent le point o&ugrave; vous avez cliqu&eacute;, et comprend aussi la surface d'un demi pas
+	    plancher comprise entre les murs qui entourent le point o&ugrave; vous avez cliqu&eacute;, et comprend aussi la surface d'un demi pas
 	    de porte de chacune des portes plac&eacute;s sur ces murs. Cette fonctionnalit&eacute; permet de cr&eacute;er facilement des pi&egrave;ces qui
 	    se joignent correctement dans la vue 3D quand les portes entre les murs sont ouvertes.<br>
 	      Ainsi, &agrave; moins que vous vouliez cr&eacute;er une surface sp&eacute;ciale qui ne touche pas les bords des
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingWalls.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingWalls.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingWalls.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/drawingWalls.html	2011-12-21 00:48:52.000000000 +0000
@@ -26,7 +26,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
 	<tr>
 	<td><p>Pour dessiner des murs, vous devez tout d'abord choisir <i>Plan &gt; Cr&eacute;er les murs</i> ou
-	    selectionner l'outil <i>Cr&eacute;er les murs</i>.
+	    s&eacute;lectionner l'outil <i>Cr&eacute;er les murs</i>.
 	</p>
 	  <blockquote>
 	    <p><img src="../images/createWallsTool.png" alt="Wall Creation mode tool" width="24" height="24" align="absmiddle">&nbsp;Outil<i> Cr&eacute;er
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editing3DView.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editing3DView.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editing3DView.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editing3DView.html	2011-12-21 00:48:52.000000000 +0000
@@ -52,7 +52,7 @@
           virtuel. Dans ce mode, le d&eacute;placement de la souris vers la gauche 
           ou la droite fait tourner le corps du visiteur vers la gauche ou la 
           droite&nbsp;; le d&eacute;placement de la souris en avant ou en arri&egrave;re 
-          fait tourner la t&ecirc;te du visteur vers le haut ou vers le bas&nbsp;; 
+          fait tourner la t&ecirc;te du visiteur vers le haut ou vers le bas&nbsp;; 
           la rotation de la roue de la souris fait avancer ou reculer le visiteur.	
           <br>
           Dans les deux modes, les touches <i>fl&egrave;che gauche</i> et <i>fl&egrave;che 
@@ -141,7 +141,7 @@
         <p align="center"><img src="images/editing3DView.png" width="399" height="214"></p>
         <p>Dans le panneau de la vue 3D, vous pouvez modifier le champ de vue du visiteur virtuel, sa hauteur,
           la couleur ou la texture du sol et du ciel, l'intensit&eacute; de la lumi&egrave;re
-          et la transparence des murs.<br>
+          et la transparence des murs (et des planchers/plafonds des pi&egrave;ces).<br>
         L'&eacute;l&eacute;vation du point du vue du visiteur virtuel est &eacute;gale aux 13/14 de sa hauteur selon les proportions d'un adulte
         humain.</p>
       </td>
@@ -152,7 +152,7 @@
 	<tr valign="top" BGCOLOR="#eeeeee">
 	<td bgcolor="#eeeeee" width="98%">
 	<table border="0" cellspacing="0" cellpadding="4"><tr valign="top"><td width="16"><p>&#149;</p></td><td><p>Maintenez enfonc&eacute;e
-	        la touche <i>majuscule</i> pour diminuer l'effet des mouvements de la souris et de sa roue dans la vue 3D.</p></td></tr>
+	        la touche <i>majuscule</i> pour augmenter l'effet des mouvements de la souris et de sa roue dans la vue 3D.</p></td></tr>
 	  <tr valign="top">
         <td><p>&#149;</p>
         </td>
@@ -166,7 +166,7 @@
 	      </td>
 	    <td><p>Les d&eacute;placements dans la vue 3D ne sont pas consid&eacute;r&eacute;es comme des op&eacute;rations annulables, mais la position courante
 	        dans la vue 3D est <a href="savingHome.html">enregistr&eacute;e</a> dans un fichier Sweet Home 3D 
-	        quand vous choisissez <i>Fichier &gt; Enregistrer</i> ou<i> Fichier &gt; Enregister sous...</i>.</p>
+	        quand vous choisissez <i>Fichier &gt; Enregistrer</i> ou<i> Fichier &gt; Enregistrer sous...</i>.</p>
 	      </td>
 	    </tr>
 	  <tr valign="top">
@@ -186,15 +186,17 @@
         </td>
 	    </tr>
 	  <tr valign="top">
-	    <td><p>&#149;</p>
-	      </td>
+	    <td><p>&#149;</p></td>
 	    <td><p>Rien n'emp&ecirc;che le visiteur virtuel d'&ecirc;tre au milieu d'un mur ou tr&egrave;s loin du logement. Si
-	        vous n'arrivez pas
-	        &agrave; d&eacute;terminer o&ugrave; le visiteur virtuel se situe, le fait de tourner la roue de la souris avec
-	        le pointeur de la souris au dessus de la vue 3D
-	        s&eacute;lectionnera et affichera automatiquement
-	        le visiteur virtuel dans le plan du logement.</p>
-	      </td>
+	      vous n'arrivez pas
+	      &agrave; d&eacute;terminer o&ugrave; le visiteur virtuel se situe, le fait de tourner la roue de la souris avec
+	      le pointeur de la souris au dessus de la vue 3D
+	      s&eacute;lectionnera et affichera automatiquement
+	      le visiteur virtuel dans le plan du logement.</p></td>
+	    </tr>
+	  <tr valign="top">
+	    <td><p>&#149;</p></td>
+	    <td><p>Si vous pr&eacute;f&eacute;rez visualiser tous les niveaux existants l'un sur l'autre dans la vue 3D quelque soit le niveau en cours de s&eacute;lection, choisissez le menu <i>Vue 3D &gt; Afficher tous les niveaux</i>. Pour n'afficher que le niveau s&eacute;lectionn&eacute; et tous les niveaux en dessous, choisissez le menu <i>Vue 3D &gt; Afficher le niveau s&eacute;lectionn&eacute;</i>.</p></td>
 	    </tr>
 	</table>
 	
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingCompass.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingCompass.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingCompass.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingCompass.html	2011-12-21 00:48:52.000000000 +0000
@@ -27,10 +27,10 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
   <tr>
     <td><p>Chaque nouveau logement affiche une rosace en haut &agrave; gauche 
-          de son plan. Comme pour les autres &eacute;l&eacute;ments du plan, cette 
+          de son plan. Comme pour les autres objets du plan, cette 
           rosace peut &ecirc;tre d&eacute;plac&eacute;e en la s&eacute;lectionnant 
           puis en la glissant-d&eacute;posant ou avec les touches du clavier.</p>
-        <p> Quand la rosace est le <b>seul</b> &eacute;l&eacute;ment s&eacute;lectionn&eacute; 
+        <p> Quand la rosace est le <b>seul</b> objet s&eacute;lectionn&eacute; 
           dans le plan, vous pouvez modifier sa taille ou son orientation avec 
           ses indicateurs.</p>
         <p align="center"><img src="../images/compassIndicators.png" alt="Compass indicators" width="108" height="121"></p>
@@ -71,7 +71,7 @@
         <p>Dans le panneau de la boussole, vous pouvez changer la position, le 
           diam&egrave;tre, la direction du nord de la rosace et sp&eacute;cifier 
           si elle doit &ecirc;tre affich&eacute;e ou non dans le plan. Vous pouvez 
-          aussi modifier la lattitude et la longitude de la position g&eacute;ographique 
+          aussi modifier la latitude et la longitude de la position g&eacute;ographique 
           du logement et le fuseau horaire de sa r&eacute;gion.</p>
       </td>
   </tr>
@@ -90,16 +90,16 @@
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
-              <td> <p>Les valeurs des champs <i>Lattitude</i> et <i>Longitude</i> 
+              <td> <p>Les valeurs des champs <i>Latitude</i> et <i>Longitude</i> 
                   sont sp&eacute;cifi&eacute;es avec des d&eacute;cimales de l'unit&eacute; 
                   de degr&eacute; et <b>pas</b> des minutes et des secondes. Le 
-                  pr&eacute;fixe de la lattitude doit &ecirc;tre N pour le nord 
+                  pr&eacute;fixe de la latitude doit &ecirc;tre N pour le nord 
                   et S pour le sud, et le pr&eacute;fixe de la longitude doit 
                   &ecirc;tre W pour l'ouest et E pour l'est.</td>
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
-              <td> <p> Le fuseau horaire, la lattitude et la longitude sont initialis&eacute;s 
+              <td> <p> Le fuseau horaire, la latitude et la longitude sont initialis&eacute;s 
                   d'apr&egrave;s les param&egrave;tres comparables de votre syst&egrave;me. 
                   Pensez &agrave; v&eacute;rifier ces valeurs si voulez que Sweet Home 3D 
                   calcule la position exacte du soleil dans le ciel.
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingDimensions.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingDimensions.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingDimensions.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingDimensions.html	2011-12-21 00:48:52.000000000 +0000
@@ -82,7 +82,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
   <tr>
     <td><p>Quand le pointeur de la souris survole l'un de ces indicateurs, celui-ci change d'aspect pour indiquer que vous
-        pouvez glisser-d&eacute;poser ce point afin de modifier l'attribut correspondant de la cote s&eacute;lectonn&eacute;e.
+        pouvez glisser-d&eacute;poser ce point afin de modifier l'attribut correspondant de la cote s&eacute;lectionn&eacute;e.
         Au fur et &agrave; mesure que vous effectuez un glisser-d&eacute;poser, la taille de la cote modifi&eacute;e et la
         longueur qui y est affich&eacute;e sont mises &agrave; jour dans le plan.</p>
       </td>
@@ -118,13 +118,13 @@
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
-              <td> <p>Si les &eacute;l&eacute;ments s&eacute;lectionn&eacute;s 
+              <td> <p>Si les objets s&eacute;lectionn&eacute;s 
                   dans le plan contiennent des murs, des pi&egrave;ces, des meubles, 
-                  des cotes et des textes, tous ces &eacute;l&eacute;ments seront 
+                  des cotes et des textes, tous ces objets seront 
                   d&eacute;plac&eacute;s avec un glisser-d&eacute;poser ou avec 
                   les fl&egrave;ches du clavier. Si la touche <i>ctrl</i> (ou 
                   sous Mac OS X, la touche <i>alt</i>) est enfonc&eacute;e pendant 
-                  que vous glissez-d&eacute;posez ces &eacute;l&eacute;ments, 
+                  que vous glissez-d&eacute;posez ces objets, 
                   ceux-ci seront dupliqu&eacute;s.</td>
             </tr>
             <tr valign="top"> 
@@ -132,7 +132,7 @@
               <td> <p>Utilisez les &eacute;l&eacute;ments du sous-menu <i>Plan 
                   &gt; Modifier le style du texte </i> pour modifier la 
                   taille et le style de la police de caract&egrave;res appliqu&eacute;e 
-                  &agrave;la longueur d'une cote.</td>
+                  &agrave; la longueur d'une cote.</td>
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingFurniture.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -36,13 +36,13 @@
           qui les contient, ou cliquez sur les meubles en maintenant la touche 
           <i>majuscule</i> enfonc&eacute;e. <br>
           Pour &eacute;viter de s&eacute;lectionner des meubles en m&ecirc;me 
-          temps que d'autres types d'&eacute;l&eacute;ments dans le plan, verrouillez 
+          temps que d'autres types d'objets dans le plan, verrouillez 
           le plan de base en cliquant sur le verrou affich&eacute; en haut &agrave; 
           gauche du panneau du plan ou en choisissant le menu <i>Plan &gt; Verrouiller 
           le plan de base</i>. Ceci emp&ecirc;chera la s&eacute;lection des murs, 
           des pi&egrave;ces, des cotes, des textes libres, des portes et des fen&ecirc;tres, 
           vous laissant ainsi disposer vos meubles plus facilement. Un second 
-          clic sur le verrou ou l'ajout de tout &eacute;l&eacute;ment dans le 
+          clic sur le verrou ou l'ajout de tout objet dans le 
           plan autre qu'un meuble d&eacute;verrouillera le plan.<br>
           Pour d&eacute;placer les meubles s&eacute;lectionn&eacute;s, positionnez 
           le pointeur de la souris &agrave; l'int&eacute;rieur de la bo&icirc;te 
@@ -79,7 +79,7 @@
                       <td nowrap><p>2.</p>
                       </td>
                       <td><p>L'indicateur d'&eacute;l&eacute;vation montre le coin que vous pouvez glisser-d&eacute;poser pour monter ou descendre
-                          le meuble s&eacute;lectionn&eacute;.</p>
+                          le meuble s&eacute;lectionn&eacute; (par rapport &agrave; l'&eacute;l&eacute;vation du niveau auquel le meuble a &eacute;t&eacute; ajout&eacute; si le logement contient <a href="addingLevels.html">plusieurs niveaux</a>).</p>
                       </td>
                     </tr>
                     <tr valign="top">
@@ -109,19 +109,19 @@
 		  <table width="100%" border="0" cellspacing="0" cellpadding="3">
 	<tr>
 	<td><p>Quand le pointeur de la souris survole l'un de ces coins, celui-ci change d'aspect pour indiquer que vous
-	    pouvez glisser-d&eacute;poser ce coin afin de modifier l'attribut correspondant du meuble s&eacute;lectonn&eacute;.
+	    pouvez glisser-d&eacute;poser ce coin afin de modifier l'attribut correspondant du meuble s&eacute;lectionn&eacute;.
 	    Pendant que vous appuyez sur le bouton de la souris, une info-bulle indique la valeur de(s) attribut(s) modifi&eacute;(s). <br>
 Les meubles modifi&eacute;s avec la souris sont dessin&eacute;s simultan&eacute;ment dans le plan et la vue 3D. </p>
 	  <p>Un meuble peut &ecirc;tre aussi modifi&eacute;  gr&acirc;ce &agrave; son panneau, en double-cliquant sur ce meuble dans le plan
 	    du logement ou dans la liste des meubles, ou en choisissant <i>Meubles &gt; Modifier...</i> apr&egrave;s l'avoir s&eacute;lectionn&eacute;.</p>
 	    <p align="center"><img src="images/editingFurniture.png" alt="Modify furniture" width="395" height="381"></p>
 	    <p>Dans le panneau du meuble, vous pouvez changer son nom, son angle de 
-          rotation, l'abcisse (X) et l'ordonn&eacute;e (Y) de son centre, l'&eacute;l&eacute;vation 
+          rotation, l'abscisse (X) et l'ordonn&eacute;e (Y) de son centre, l'&eacute;l&eacute;vation 
           de sa face inf&eacute;rieure par rapport au sol, sa largeur, sa profondeur, 
           sa hauteur, sa couleur ou sa texture, sa brillance, sa visibilit&eacute;, 
           si son nom doit &ecirc;tre affich&eacute; dans le plan ou non, et le 
           fait que la forme de son mod&egrave;le 3D soit celle par d&eacute;faut 
-          ou son mirroir. <br>
+          ou son miroir. <br>
 	     Si vous rendez un meuble invisible, il ne sera pas dessin&eacute; dans le plan du logement et dans
 	     la vue 3D, mais il continuera d'appara&icirc;tre dans
 	    la liste des meubles pour vous permettre de le rendre &agrave; nouveau visible ult&eacute;rieurement.</p></td>
@@ -132,6 +132,10 @@
     <tr valign="top" BGCOLOR="#eeeeee">
       <td bgcolor="#eeeeee" width="98%">
         <table border="0" cellspacing="0" cellpadding="4">
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>Quand la colonne <i>Visible</i> est affich&eacute;e dans la liste des meubles, la visibilit&eacute; du meuble s&eacute;lectionnn&eacute;e peut &ecirc;tre modifi&eacute;e aussi en cliquant sur la bo&icirc;te &agrave; cocher <i>Visible</i> dans la liste.</td>
+          </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
               <td> <p>Si vous voulez modifier les attributs d'un ensemble de meubles, 
@@ -164,6 +168,10 @@
                   du mur qu'elle troue. Ce calcul n'est pas effectu&eacute; pour 
                   les autres types de meubles. </td>
             </tr>
+            <tr valign="top">
+              <td><p>&#149;</p></td>
+              <td><p>Quand le logement contient plus d'un niveau, un escalier est capable de trouer automatiquement le plafond et le plancher des niveaux sup&eacute;rieurs si sa hauteur est plus grande que l'&eacute;l&eacute;vation du niveau sup&eacute;rieur.</td>
+            </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
               <td> <p>La modification de la puissance des lumi&egrave;res n'a 
@@ -171,29 +179,29 @@
                   de cr&eacute;ation de <a href="creatingPhotos.html">photo</a> 
                   ou de <a href="creatingVideos.html">vid&eacute;o</a>, aux deux 
                   meilleurs niveaux de qualit&eacute;s disponibles pour ces outils. 
-                  Une souce lumineuse n'a pas de repr&eacute;sentation physique 
+                  Une source lumineuse n'a pas de repr&eacute;sentation physique 
                   en 3D et peut &ecirc;tre vue dans la vue 3D quand elle est s&eacute;lectionn&eacute;e 
-                  pour vous aider &agrave; la positionnner dans l'espace. </td>
+                  pour vous aider &agrave; la positionner dans l'espace. </td>
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
-              <td> <p>Si un un &eacute;l&eacute;ment du mobilier est d&eacute;pos&eacute; 
+              <td> <p>Si un meuble est d&eacute;pos&eacute; 
                   sur un autre, son &eacute;l&eacute;vation sera calcul&eacute;e 
                   pour que celui-ci apparaisse sur le dessus du second, si son 
                   rectangle de s&eacute;lection est inclus dans celui de l'autre 
-                  &eacute;l&eacute;ment et si son &eacute;l&eacute;vation est 
-                  nulle (au niveau du sol). Cet automatisme est activ&eacute; 
-                  quand le magn&eacute;tisme est d&eacute;sactiv&eacute;.</td>
+                  objet et si son &eacute;l&eacute;vation est 
+                  nulle (au niveau du plancher du niveau s&eacute;lectionn&eacute;). Cet automatisme est activ&eacute; 
+              quand le magn&eacute;tisme est d&eacute;sactiv&eacute;.</td>
             </tr>
             <tr valign="top"> 
               <td> <p>&#149;</p></td>
-              <td> <p>Si les &eacute;l&eacute;ments s&eacute;lectionn&eacute;s 
+              <td> <p>Si les objets s&eacute;lectionn&eacute;s 
                   dans le plan contiennent des murs, des pi&egrave;ces, des meubles, 
-                  des cotes et des textes, tous ces &eacute;l&eacute;ments seront 
+                  des cotes et des textes, tous ces objets seront 
                   d&eacute;plac&eacute;s avec un glisser-d&eacute;poser ou avec 
                   les fl&egrave;ches du clavier. Si la touche <i>ctrl</i> (ou 
                   sous Mac OS X, la touche <i>alt</i>) est enfonc&eacute;e pendant 
-                  que vous glissez-d&eacute;posez ces &eacute;l&eacute;ments, 
+                  que vous glissez-d&eacute;posez ces objets, 
                   ceux-ci seront dupliqu&eacute;s.</td>
             </tr>
             <tr valign="top"> 
@@ -204,9 +212,9 @@
                   en maintenant la touche <i>majuscule</i> enfonc&eacute;e durant 
                   la rotation d'un meuble, ou en d&eacute;sactivant le magn&eacute;tisme 
                   dans le panneau des <a href="editingPreferences.html">pr&eacute;f&eacute;rences</a>. 
-                  De la m&ecirc;me fa&ccedil;on, l'orientation d'un &eacute;l&eacute;ment 
+                  De la m&ecirc;me fa&ccedil;on, l'orientation d'un objet 
                   plac&eacute; sur ou le long d'un mur et l'&eacute;l&eacute;vation 
-                  d'un &eacute;l&eacute;ment plac&eacute; sur un autre ne sont 
+                  d'un objet plac&eacute; sur un autre ne sont 
                   calcul&eacute;es automatiquement que quand le magn&eacute;tisme 
                   est activ&eacute;.</p></td>
             </tr>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingLevels.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingLevels.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingLevels.html	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingLevels.html	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,57 @@
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
+	<title>Modification des niveaux</title>
+	<link href="../help.css" rel="stylesheet" media="all">
+</head>
+
+<body  bgcolor="#ffffff">
+<div id="banner">
+	<div id="helpheader"><a class="bread" href="index.html">Aide Sweet Home 3D</a> > <a class="bread" href="tocEditing.html">Modification des pr&eacute;f&eacute;rences,
+	du plan et de la vue 3D</a></div>
+</div>
+<div id="mainbox" align="left">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+	<tr valign="bottom" height="32">
+	<td width="3" height="32">&nbsp;</td>
+	<td width="32" height="32"><img src="../images/applicationIcon32.png" alt="Sweet Home 3D Icon" height="32" width="32"></td>
+	<td width="8" height="32">&nbsp;&nbsp;</td>
+	<td valign="bottom" height="32"><font id="topic">Modification des niveaux</font></td>
+	</tr>
+	<tr height="10">
+	<td colspan="4" height="10">&nbsp;</td>
+	</tr>
+</table>
+<table width="100%" border="0" cellspacing="0" cellpadding="3">
+  <tr>
+    <td><p>Vous pouvez modifier le nom, l'&eacute;l&eacute;vation et les hauteurs d'un niveau en double-cliquant sur sur son onglet, ou en choisissant le menu <i>Plan &gt; Modifier le niveau</i>....<br>
+      Le panneau de modification d'un niveau vous permet de modifier ces attributs, mais affiche aussi un tableau d&eacute;crivant tous les niveaux d'un logement, la ligne qui y est s&eacute;lectionn&eacute;e correspondant au niveau en cours d'&eacute;dition.</p>
+<p align="center"><img src="images/editingLevels.png" alt="Modification de niveau" width="341" height="326"></p>
+	    <p>L'&eacute;paisseur du plancher est utilis&eacute;e pour calcul&eacute;e le bord vertical autour d'un plancher dans la vue 3D. Cette surface est notamment visible autour des trous dans un plancher, et au bord d'une mezzanine ou d'un balcon.<br>
+	      L'&eacute;l&eacute;vation 
+	    d'un niveau peut &ecirc;tre positive ou n&eacute;gative. Dans ce dernier cas, le sol sera automatiquement creus&eacute; dans la vue 3D chaque fois qu'un meuble, une pi&egrave;ce ou un ensemble de murs ferm&eacute; est ajout&eacute; &agrave; un niveau en sous-sol. Cette fonctionnalit&eacute; peut &ecirc;tre utilis&eacute;e pour placer une piscine dans le sol ou pour cr&eacute;er une cave d'un ou plusieurs niveaux.</p></td>
+	</tr>
+</table>
+<div id="taskbox">
+  <table width="100%" border="0" cellspacing="0" cellpadding="7" BGCOLOR="#eeeeee">
+    <tr valign="top" BGCOLOR="#eeeeee">
+      <td bgcolor="#eeeeee" width="98%">
+        <table border="0" cellspacing="0" cellpadding="4">
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td> Il n'est pas obligatoire de saisir des valeurs qui auront pour effet que les niveaux se superposeront exactement les uns sur les autres. 
+              Ainsi, vous pouvez utiliser la fonctionnalit&eacute; des niveaux pour g&eacute;rer des niveaux interm&eacute;diaires, des faux planchers ou des faux plafonds. Vous pouvez aussi utiliser aussi les niveaux &agrave; une  m&ecirc;me  &eacute;l&eacute;vation comme des calques pour isoler certains objets comme les <a href="drawingDimensions.html">cotes</a> ou les <a href="addingTexts.html">textes</a>.</td>
+          </tr>
+            <tr valign="top"> 
+              <td width="16"> <p>&#149;</p></td>
+              <td> <p>Les onglets au dessus de la vue du plan sont tri&eacute;s dans l'ordre de l'&eacute;l&eacute;vation des niveaux, puis &agrave; &eacute;l&eacute;vation &eacute;gale dans l'ordre inverse de leur hauteur. La modification de l'&eacute;l&eacute;vation et/ou de la hauteur d'un niveau mettra &agrave; jour automatiquement l'ordre des onglets.</td>
+            </tr>
+          </table>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingPreferences.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -28,11 +28,12 @@
 	<tr>
 	<td><p>Pour &eacute;diter les pr&eacute;f&eacute;rences de Sweet Home 3D, choisissez <i>Sweet Home 3D &gt; Pr&eacute;f&eacute;rences...</i> sous
 	    Mac OS X ou <i>Fichier &gt; Pr&eacute;f&eacute;rences...</i> sous les autres syst&egrave;mes d'exploitation.</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="434" height="378"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="459" height="401"></p>
 	  <p>Dans le panneau des pr&eacute;f&eacute;rences, vous pouvez choisir la <i>Langue</i> utilis&eacute;e dans l'interface utilisateur
 	    de Sweet Home 3D et l'<i>Unit&eacute;</i> utilis&eacute;e
 	    pour dessiner les r&egrave;gles et la grille du plan du
-	    logement, et pour afficher les longueurs. </p>
+	    logement, et pour afficher les longueurs. <br>
+	    Le bouton &agrave; c&ocirc;t&eacute; de la liste d&eacute;roulante <i>Langue</i> vous permet aussi d'importer des fichiers de langues avec une extensions SH3L. </p>
 	    <p> Les boutons radio <i>Dossiers de cat&eacute;gorie </i>et <i>Liste 
           avec recherche </i>permettent de choisir le mode d'affichage du catalogue 
           de meubles dans chaque <a href="ui.html">fen&ecirc;tre Sweet Home 3D</a>.<br>
@@ -41,39 +42,38 @@
           &agrave; la <a href="editing3DView.html">navigation dans la vue 3D</a>.</p>
         <p> La bo&icirc;te &agrave; cocher <i>Magn&eacute;tisme</i> active ou 
           d&eacute;sactive le magn&eacute;tisme utilis&eacute; dans le plan du 
-          logement au cours du dessin des murs et le positionnement des meubles.<br>
+          logement au cours du positionnement des meubles, et du dessin des murs, des pi&egrave;ces et des cotes.<br>
           La bo&icirc;te &agrave; cocher <i>R&egrave;gles</i> permet de rendre 
           visibles ou invisibles les r&egrave;gles affich&eacute;es en haut et 
           &agrave; gauche du plan.<br>
           La bo&icirc;te &agrave; cocher <i>Grille</i> permet de rendre visible 
-          ou invisible la grile affich&eacute;e sous le plan.<br>
+          ou invisible la grille affich&eacute;e sous le plan.<br>
           Les boutons radio <i>Ic&ocirc;nes du catalogue</i> et <i>Vue de dessus</i> 
           permettent de choisir comment seront dessin&eacute;s les meubles dans 
           le plan (voir les images ci-dessous).<br>
           Les boutons radio <i></i><i>Monochrome</i> et <i>Couleur ou texture 
-          du sol</i> permettent de choisir si les pi&egrave;ces doivent &ecirc;tre 
+          du plancher</i> permettent de choisir si les pi&egrave;ces doivent &ecirc;tre 
           remplies dans le plan avec la couleur ou de la texture que vous avez 
-          choisies pour leur sol, ou en gris (en blanc &agrave; l'impression).<br>
+          choisies pour leur plancher, ou en gris (en blanc &agrave; l'impression).<br>
           La liste d&eacute;roulante <i>Motif des murs dans le plan</i> permet 
           de choisir le motif de remplissage des murs dans le plan.</p>
 	  <p>La valeur de l'<i>Epaisseur des nouveaux murs</i> d&eacute;termine l'&eacute;paisseur des murs qui seront cr&eacute;&eacute;s
 	        une fois que le panneau des pr&eacute;f&eacute;rences sera ferm&eacute;.<br>
-          La valeur de la <i>Hauteur des nouveaux murs</i> d&eacute;termine la hauteur des murs  qui seront
-	        cr&eacute;&eacute;s
-	        une fois que le panneau des pr&eacute;f&eacute;rences sera ferm&eacute;.</p>	  
-        <p>La valeur du champ associ&eacute; &agrave; la bo&icirc;te &agrave; 
+          La valeur de la <i>Hauteur des nouveaux murs</i> d&eacute;termine la hauteur des futurs murs.<br>
+	        La valeur de l'<i>Epaisseur des nouveaux planchers</i> d&eacute;termine l'&eacute;paisseur des planchers des futurs niveaux.	  </p>
+	  <p>La valeur du champ associ&eacute; &agrave; la bo&icirc;te &agrave; 
           cocher <i>Enregistrer les donn&eacute;es de r&eacute;cup&eacute;ration</i> 
           d&eacute;termine le d&eacute;lai en minutes qui s'&eacute;coule entre 
           deux enregistrements des logements ouverts. Ceux-ci sont automatiquement 
           enregistr&eacute;s dans des fichiers priv&eacute;s, qui seront utilis&eacute;s 
           &agrave; des fins de r&eacute;cup&eacute;ration au prochain lancement 
           de Sweet Home 3D si le programme plante.<br>
-          Finallement, le bouton <i>R&eacute;initialiser l'affichage des conseils</i> 
+          Finalement, le bouton <i>R&eacute;initialiser l'affichage des conseils</i> 
           r&eacute;initialise les r&eacute;ponses que vous avez donn&eacute;es 
           aux bo&icirc;tes &agrave; cocher <i>Ne plus afficher ce conseil</i> 
           affich&eacute;es dans les conseils qui apparaissent quand vous cliquez 
           sur certains outils. Ceci implique que tous les dialogues o&ugrave; 
-          vous avez coch&eacute; cette option r&eacute;apparaitont au moment o&ugrave; 
+          vous avez coch&eacute; cette option r&eacute;appara&icirc;tront au moment o&ugrave; 
           vous cliquerez &agrave; nouveau sur ces outils.</p>
 	  <table border="0" align="center" cellpadding="0" cellspacing="5">
         <tr align="center">
@@ -83,9 +83,9 @@
         </tr>
         <tr>
           <td align="center" valign="top">Rendu du plan par d&eacute;faut avec les ic&ocirc;nes du catalogue,<br>
-      les sols monochromes et les murs hachur&eacute;s</td>
+      les planchers monochromes et les murs hachur&eacute;s</td>
           <td align="center" valign="top">Rendu du plan avec les meubles vus de dessus,<br>
-      les sols color&eacute;s, et les murs en noir</td>
+      les planchers color&eacute;s, et les murs en noir</td>
         </tr>
       </table></td>
 	</tr>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingRooms.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingRooms.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingRooms.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingRooms.html	2011-12-21 00:48:52.000000000 +0000
@@ -83,13 +83,13 @@
       <p>Le nom et les attributs 3D d'une pi&egrave;ce peuvent &ecirc;tre modifi&eacute;s gr&acirc;ce &agrave; son panneau,
         en double-cliquant sur cette pi&egrave;ce dans le plan du logement, ou en choisissant <i>Plan &gt; Modifier les pi&egrave;ces...</i> apr&egrave;s
         l'avoir s&eacute;lectionn&eacute;.</p>
-        <p align="center"><img src="images/editingRooms.png" width="339" height="249"></p>
+        <p align="center"><img src="images/editingRooms.png" width="337" height="247"></p>
         <p>Dans le panneau de la pi&egrave;ce, vous pouvez modifier le nom de la pi&egrave;ce s&eacute;lectionn&eacute;e et si sa superficie doit &ecirc;tre
           affich&eacute;e dans le plan ou non.<br>
-          Vous pouvez aussi choisir si le sol et le plafond de la pi&egrave;ce 
+          Vous pouvez aussi choisir si le plancher et le plafond de la pi&egrave;ce 
           s&eacute;lectionn&eacute;e doivent &ecirc;tre affich&eacute;s dans la 
           vue 3D, et si oui, avec quelle couleur, quelle texture et &agrave; quelle 
-          brillance.</p>
+        brillance.</p>
       </td>
   </tr>
 </table>
@@ -122,8 +122,8 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>Si vous voulez appliquer des couleurs ou des textures diff&eacute;rentes d'une partie &agrave; l'autre du sol d'une m&ecirc;me
-                pi&egrave;ce (par exemple pour utiliser des carreaux pour le sol d'un coin cuisine),   <a href="drawingRooms.html">cr&eacute;er</a> une
+              <p>Si vous voulez appliquer des couleurs ou des textures diff&eacute;rentes d'une partie &agrave; l'autre du plancher d'une m&ecirc;me
+                pi&egrave;ce (par exemple pour utiliser des carreaux pour le plancher d'un coin cuisine),   <a href="drawingRooms.html">cr&eacute;er</a> une
                 pi&egrave;ce pour chacune de ces parties et changer leur couleur ou leur texture.</td>
           </tr>
           <tr valign="top">
@@ -131,7 +131,7 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>L'&eacute;l&eacute;vation du sol d'une pi&egrave;ce est toujours nulle. La hauteur du plafond d'une pi&egrave;ce est calcul&eacute;e &agrave; chaque
+              <p>L'&eacute;l&eacute;vation du plancher d'une pi&egrave;ce est toujours &eacute;gale &agrave; l'&eacute;l&eacute;vation du <a href="addingLevels.html">niveau</a> auquel la pi&egrave;ce appartient (ou nulle si aucun niveau n'a &eacute;t&eacute; ajout&eacute; au logement). Si la pi&egrave;ce n'est pas au <b>dernier niveau</b>, la hauteur de son plafond sera &eacute;gale &agrave; l'&eacute;l&eacute;vation plus la hauteur du niveau auquel elle appartient. Sinon, la hauteur du plafond d'une pi&egrave;ce est calcul&eacute;e &agrave; chaque
                 point d'une pi&egrave;ce, et la hauteur de chacun de ces points est &eacute;gale &agrave; la hauteur du point de d&eacute;part ou d'arriv&eacute;e
                 le plus proche d'un mur. Ceci permet de cr&eacute;er le plafond d'un sous-pente si vous avez affect&eacute; des hauteurs
                 diff&eacute;rentes au point de d&eacute;part et d'arriv&eacute;e des <a href="editingWalls.html">murs inclin&eacute;s</a> d'une
@@ -145,7 +145,7 @@
               <p>Le plafond d'une pi&egrave;ce est visible seulement d'en-dessous,
                 ce qui implique que vous pourrez le voir uniquement qu'en <a href="editing3DView.html">Visite virtuelle</a>.
                 Ceci vous permet de toujours voir l'int&eacute;rieur du logement &eacute;dit&eacute; en <a href="editing3DView.html">Vue
-                a&eacute;rienne</a>,  que l'option <i>Afficher le plafond</i> du panneau des p!&egrave;ces
+                a&eacute;rienne</a>,  que l'option <i>Afficher le plafond</i> du panneau des pi&egrave;ces
                 soit coch&eacute;e ou non.</td>
           </tr>
           <tr valign="top">
@@ -163,10 +163,10 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>Si les &eacute;l&eacute;ments s&eacute;lectionn&eacute;s dans le plan contiennent des murs, des pi&egrave;ces,
-                des meubles, des cotes et des textes, tous ces &eacute;l&eacute;ments seront d&eacute;plac&eacute;s
+              <p>Si les objets s&eacute;lectionn&eacute;s dans le plan contiennent des murs, des pi&egrave;ces,
+                des meubles, des cotes et des textes, tous ces objets seront d&eacute;plac&eacute;s
                 avec un glisser-d&eacute;poser ou avec les fl&egrave;ches du clavier. Si la touche <i>ctrl</i> (ou sous Mac
-                OS X, la touche <i>alt</i>) est enfonc&eacute;e pendant que vous glissez-d&eacute;posez ces &eacute;l&eacute;ments,
+                OS X, la touche <i>alt</i>) est enfonc&eacute;e pendant que vous glissez-d&eacute;posez ces objets,
               ceux-ci seront dupliqu&eacute;s.</td>
           </tr>
           <tr valign="top">
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingWalls.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingWalls.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingWalls.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/editingWalls.html	2011-12-21 00:48:52.000000000 +0000
@@ -114,7 +114,7 @@
                 Les valeurs des attributs diff&eacute;rentes d'un mur &agrave; l'autre dans l'ensemble des murs s&eacute;lectionn&eacute;s,
                 appara&icirc;tront
               vides dans le panneau des murs. Si parmi ces murs, un&nbsp; mur n'est pas orient&eacute; correctement, s&eacute;lectionnez
-              le puis choisissez <i>Plan &gt; Inserser la direction des murs</i> pour inverser sa direction.</td>
+              le puis choisissez <i>Plan &gt; Inverser la direction des murs</i> pour inverser sa direction.</td>
           </tr>
           <tr valign="top">
             <td>
@@ -133,7 +133,7 @@
             </td>
             <td>
               <p>Pour vous &eacute;viter de calculer la longueur d'un mur en fonction de ces coordonn&eacute;es, utilisez
-                le champ de saisie <i>Longueur au point d'arriv&eacute;e</i>. Tout modification de cette longeur provoquera
+                le champ de saisie <i>Longueur au point d'arriv&eacute;e</i>. Tout modification de cette longueur provoquera
                 automatiquement un recalcul des coordonn&eacute;es X et Y du point d'arriv&eacute;e sont et vice-versa.</p>
             </td>
           </tr>
@@ -154,12 +154,12 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>Si les &eacute;l&eacute;ments s&eacute;lectionn&eacute;s dans le plan contiennent des murs, des pi&egrave;ces,
-                des meubles, des cotes et des textes, tous ces &eacute;l&eacute;ments seront d&eacute;plac&eacute;s
+              <p>Si les objets s&eacute;lectionn&eacute;s dans le plan contiennent des murs, des pi&egrave;ces,
+                des meubles, des cotes et des textes, tous ces objets seront d&eacute;plac&eacute;s
                 avec un glisser-d&eacute;poser
               ou avec les fl&egrave;ches du clavier. Si la touche <i>ctrl</i> (ou sous Mac OS X, la touche <i>alt</i>) est
               enfonc&eacute;e pendant que vous glissez-d&eacute;posez
-              ces &eacute;l&eacute;ments, ceux-ci seront dupliqu&eacute;s.</td>
+              ces objets, ceux-ci seront dupliqu&eacute;s.</td>
           </tr>
           <tr valign="top">
             <td>
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/images/editingLevels.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/images/editingLevels.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/images/editingPreferences.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/images/editingRooms.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/images/editingRooms.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/importingBackground.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/importingBackground.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/importingBackground.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/importingBackground.html	2011-12-21 00:48:52.000000000 +0000
@@ -68,7 +68,7 @@
             <td><p>D&eacute;finissez l'&eacute;chelle de l'image en d&eacute;pla&ccedil;ant les extr&eacute;mit&eacute;s
                 de la ligne color&eacute;e dessin&eacute;e dans l'image,
                 de telle mani&egrave;re que cette ligne corresponde &agrave; une longueur connue.
-                Saisissez ensuite la longueur r&eacute;elle de cette ligne dans le champ <i>Longueur de la ligne dessin&eacute;e</i>,
+                Saisissez ensuite la longueur r&eacute;elle de cette ligne dans le champ <i>Longueur de la ligne dessin&eacute;e</i> dans l'unit&eacute; en cours d'utilisation,
                 et cliquez sur <i>Continuer</i>.</p>
             </td>
           </tr>
@@ -86,7 +86,7 @@
 </div>
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
   <tr>
-    <td><p>Une fois que l'assitant image d'arri&egrave;re plan est ferm&eacute;, votre  image appara&icirc;tra sous
+    <td><p>Une fois que l'assistant image d'arri&egrave;re plan est ferm&eacute;, votre  image appara&icirc;tra sous
         la grille du plan du logement, et vous pouvez commencer &agrave; <a href="drawingWalls.html">dessiner les murs</a> de
         votre logement.</p>
         <table border="0" align="center" cellpadding="0" cellspacing="5">
@@ -122,7 +122,7 @@
               <p>&#149;</p>
             </td>
             <td>
-              <p>Eviter d'importer un fichier trop gros.</td>
+              <p>&Eacute;viter d'importer un fichier trop gros.</td>
           </tr>
           <tr valign="top">
             <td>
@@ -138,6 +138,13 @@
               <p>&#149;</p>
             </td>
             <td>
+              <p>Chaque <a href="addingLevels.html">niveau</a> dans un logement peut avoir sa propre image d'arri&egrave;re plan.</td>
+          </tr>
+          <tr valign="top">
+            <td>
+              <p>&#149;</p>
+            </td>
+            <td>
               <p>L'unit&eacute; affich&eacute;e par d&eacute;faut dans  l'assistant
                 image d'arri&egrave;re plan  d&eacute;pend de votre pays. Vous
               pouvez choisir entre le Centim&egrave;tre, le M&egrave;tre, le Millim&egrave;tre  et le Pouce dans le panneau
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/importingFurniture.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/importingFurniture.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/importingFurniture.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/importingFurniture.html	2011-12-21 00:48:52.000000000 +0000
@@ -54,7 +54,7 @@
           <tr valign="top">
             <td nowrap><p>1.</p>
             </td>
-            <td><p>Si vous avez lancer l'assistant &agrave; l'aide du menu, chosissez 
+            <td><p>Si vous avez lancer l'assistant &agrave; l'aide du menu, choisissez 
                   un fichier au format OBJ, DAE, 3DS, LWS ou un fichier ZIP contenant 
                   un fichier &agrave; l'un de ces formats en cliquant sur le bouton 
                   <i>Choisir mod&egrave;le</i>. Une fois que le mod&egrave;le 
@@ -64,7 +64,7 @@
           <tr valign="top">
             <td nowrap><p>2.</p>
             </td>
-            <td><p>Orientez le mod&egrave;le avec les boutons fl&egrave;ch&eacute;s de telle fa&ccedil;on que la vue de face affiche la face avant du
+            <td><p>Orientez le mod&egrave;le avec les boutons fl&eacute;ch&eacute;s de telle fa&ccedil;on que la vue de face affiche la face avant du
                 mod&egrave;le 3D. 
                 Quelques fois le rendu de certains mod&egrave;les 3D est incorrect parce que leurs faces avant et arri&egrave;re sont invers&eacute;es.
                 Si c'est le cas, cochez la bo&icirc;te &agrave; cocher <i>Inverser faces avant et arri&egrave;re</i>.<br>
@@ -76,7 +76,7 @@
             </td>
             <td><p>Modifiez si n&eacute;cessaire le nom, la taille, l'&eacute;l&eacute;vation, la couleur du mod&egrave;le import&eacute;   et
                 le fait que ce mod&egrave;le soit d&eacute;m&eacute;nageable ou que
-                ce soit une porte ou une fen&ecirc;tre.<br>
+                ce soit une porte, une fen&ecirc;tre ou un escalier.<br>
                 Quand un  mod&egrave;le 3D est  import&eacute; dans la liste des meubles ou le plan du logement, cochez la bo&icirc;te &agrave; cocher                <i>Ajouter
                 au catalogue</i> si vous d&eacute;sirez l'importer aussi dans le catalogue des meubles. <br>
                   D&eacute;cochez la bo&icirc;te &agrave; cocher <i>Garder les proportions</i> si vous voulez modifier la
@@ -102,7 +102,7 @@
 </div>
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
   <tr>
-    <td><p>Une fois  l'assitant d'importation de meubles  ferm&eacute;, le mod&egrave;le import&eacute; appara&icirc;tra
+    <td><p>Une fois  l'assistant d'importation de meubles  ferm&eacute;, le mod&egrave;le import&eacute; appara&icirc;tra
         dans le catalogue des meubles et/ou dans le plan et la liste des meubles du logement, selon les options que vous
         avez
         choisies.<br>
@@ -129,6 +129,10 @@
                 peut ne pas fonctionner sous Linux.</td>
           </tr>
           <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>Si vous avez besoin de faire pivoter  un mod&egrave;le 3D degr&eacute; par degr&eacute; plut&ocirc;t que par &agrave; coup de 90&deg;, maintenez enfonc&eacute;e la touche <i>majuscule</i>  pendant que vous cliquez sur les boutons fl&eacute;ch&eacute;s de la seconde &eacute;tape.</td>
+          </tr>
+		  <tr valign="top">
             <td>
               <p>&#149;</p>
             </td>
@@ -146,6 +150,14 @@
                 dans le champ de saisie de la liste d&eacute;roulante<i> Cat&eacute;gorie</i>.</td>
           </tr>
           <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>Quand le magn&eacute;tisme est actif, seuls les portes et fen&ecirc;tres peuvent &ecirc;tre plac&eacute;es sur un mur &agrave; l'aide de la souris, et seule cette cat&eacute;gorie de mobilier est capable de trouer les murs. Ainsi, n'oubliez pas de s&eacute;lectionner l'option <i>Porte ou fen&ecirc;tre</i> si vous d&eacute;sirez appliquer ce comportement &agrave; un mod&egrave;le import&eacute;. </td>
+          </tr>
+          <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>Seuls les escaliers sont capables de trouer automatiquement le plafond et le plancher des niveaux sup&eacute;rieurs. N'oubliez pas de s&eacute;lectionner l'option <i>Escalier</i> si vous d&eacute;sirez appliquer ce comportement &agrave; un mod&egrave;le import&eacute;. </td>
+          </tr>
+          <tr valign="top">
             <td>
               <p>&#149;</p>
             </td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/printingHome.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/printingHome.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/printingHome.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/printingHome.html	2011-12-21 00:48:52.000000000 +0000
@@ -82,6 +82,10 @@
             </td>
           </tr>
           <tr valign="top">
+            <td><p>&#149;</p></td>
+            <td><p>Si le logement imprim&eacute; contient plus d'un <a href="addingLevels.html">niveau</a>, la liste des meubles imprim&eacute;e ne contiendra que les meubles visibles au niveau en cours de s&eacute;lection, sauf si vous choisissez de n'imprimer que la liste des meubles, auquel cas la liste de tous les meubles sera imprim&eacute;e. Le plan et la vue 3D imprim&eacute;s sont ceux en cours de visualisation &agrave; l'&eacute;cran. Pour imprimer le plan ou la vue 3D de plusieurs niveaux, s&eacute;lectionner puis imprimer chaque niveau l'un apr&egrave;s l'autre.</p></td>
+          </tr>
+          <tr valign="top">
             <td width="16"><p>&#149;</p>
             </td>
             <td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tips.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tips.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tips.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tips.html	2011-12-21 00:48:52.000000000 +0000
@@ -167,7 +167,7 @@
                 d'une image, que vous pouvez coller dans une autre application 
                 (cette fonctionnalit&eacute; peut ne pas marcher sous Linux). 
                 Si vous pr&eacute;f&eacute;rez obtenir une image du plan dans 
-                un format vectoriel, chosissez le menu <i>Plan &gt; Exporter au 
+                un format vectoriel, choisissez le menu <i>Plan &gt; Exporter au 
                 format SVG...</i>.</P></TD>
           </TR>
           <TR VALIGN="top"> 
@@ -179,18 +179,18 @@
             <td><p>&#149;</p></td>
             <td> <p>Verrouiller le plan de base pour s&eacute;lectionner et disposer 
                 les <a href="editingFurniture.html">meubles</a> sans &ecirc;tre 
-                g&ecirc;n&eacute; par les autres types d'&eacute;l&eacute;ments 
+                g&ecirc;n&eacute; par les autres types d'objets 
                 du plan.</p></td>
           </tr>
           <TR VALIGN="top"> 
             <td><p>&#149;</p></td>
-            <TD> <P> Pour s&eacute;lectionner un &eacute;l&eacute;ment cach&eacute; 
-                par d'autres &eacute;l&eacute;ments dans le plan, selectionnez-le 
-                dans la liste des meubles&nbsp;; vous pouvez aussi le s&eacute;lectionner 
-                dans le plan du logement avec un rectangle de s&eacute;lection 
+            <TD> <P> Pour s&eacute;lectionner un objet cach&eacute; 
+                par d'autres objets dans le plan, selectionnez-le 
+                dans la liste des meubles&nbsp;; vous pouvez aussi le s&eacute;lectionner en pla&ccedil;ant dans le plan le curseur de la souris o&ugrave; les objets sont superpos&eacute;s, puis en choisissant l'objet en question dans le sous-menu contextuel <i>S&eacute;lectionner l'objet. </i>Finalement vous pouvez aussi le s&eacute;lectionner 
+                dans le plan  avec un rectangle de s&eacute;lection 
                 qui l'inclut, dans lequel vous d&eacute;s&eacute;lectionner les 
-                &eacute;l&eacute;ments qui le cachent avec un clic en maintenant 
-                la touche majuscule enfonc&eacute;e.</P></TD>
+                objets qui le cachent avec un clic en maintenant 
+            la touche majuscule enfonc&eacute;e. </P></TD>
           </TR>
           <tr valign="top"> 
             <td width="16"><p>&#149;</p></td>
@@ -300,7 +300,7 @@
                 la bo&icirc;te &agrave; cocher <i>Ajouter des plafonniers</i> 
                 de ces panneaux, en modifiant l'heure et la date, en changeant 
                 l'orientation de la boussole, en introduisant d'autres sources 
-                lumineuses et/ou en r&egrave;glant leur luminosit&eacute;.</P></TD>
+                lumineuses et/ou en r&eacute;glant leur luminosit&eacute;.</P></TD>
           </TR>
           <TR VALIGN="top"> 
             <td width="16"><p>&#149;</p></td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tocCreating.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tocCreating.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tocCreating.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tocCreating.html	2011-12-21 00:48:52.000000000 +0000
@@ -46,7 +46,8 @@
 						<p><a href="drawingRooms.html">Dessin des pi&egrave;ces</a></p>
 						<p><a href="drawingDimensions.html">Dessin des cotes</a></p>
 						<p><a href="addingTexts.html">Ajout de textes</a></p>
-						<p><A HREF="savingHome.html">Enregistrement et ouverture d'un logement</A></p>
+                        <p><a href="addingLevels.html">Ajout de niveaux</a></p>
+<p><A HREF="savingHome.html">Enregistrement et ouverture d'un logement</A></p>
 						<p><A HREF="printingHome.html">Impression d'un logement</A></p></td>
 				</tr>
 			</table>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tocEditing.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tocEditing.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tocEditing.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/tocEditing.html	2011-12-21 00:48:52.000000000 +0000
@@ -44,7 +44,8 @@
 						<p><A HREF="editingFurniture.html">Modification des meubles</A></p>
 						<p><A HREF="editingRooms.html">Modification des pi&egrave;ces</A></p>
 						<p><a href="editingDimensions.html">Modification des cotes</a></p>
-						<p><A HREF="editing3DView.html">Modification de la vue 3D</A></p>
+                        <p><A HREF="editingLevels.html">Modification des niveaux</A></p>
+<p><A HREF="editing3DView.html">Modification de la vue 3D</A></p>
 				        
         <p><A HREF="editingCompass.html">Modification de la boussole et de la 
           position g&eacute;ographique</A></p>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/ui.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/ui.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/ui.html	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/fr/ui.html	2011-12-21 00:48:52.000000000 +0000
@@ -65,7 +65,7 @@
                       <td><p>Le plan du logement.<br>
                             Ce panneau affiche votre logement vue de haut. C'est &agrave; cet endroit que vous dessinez les murs
                                 de votre logement et que vous placez vos meubles, &agrave; l'aide de la souris ou des fl&egrave;ches du
-                                clavier.</p>
+                                clavier. Quand le logement contient plus d'un <a href="addingLevels.html">niveau</a>, le nom de chaque niveau est affich&eacute; dans des onglets au dessus du plan.</p>
                       </td>
                     </tr>
                     <tr valign="top">
@@ -101,7 +101,7 @@
           et l'unit&eacute; utilis&eacute;es dans Sweet Home 3D peuvent &ecirc;tre 
           chang&eacute;es, le catalogue de meubles peut &ecirc;tre affich&eacute; 
           sous forme d'une liste avec recherche, les colonnes de la liste des 
-          meubles peuvent &ecirc;tre modifi&eacute;es, les &eacute;l&eacute;ments 
+          meubles peuvent &ecirc;tre modifi&eacute;es, les objets 
           du plan peuvent &ecirc;tre vus d'une autre fa&ccedil;on, les fl&egrave;ches 
           de navigation 3D peuvent &ecirc;tre cach&eacute;s...</p>
         <p align="center"><img src="../images/applicationPanesVirtualVisit.png" alt="Autre vue de l'interface utilisateur" width="443" height="381"></p></td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/hu/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/hu/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/hu/editingPreferences.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/hu/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -26,7 +26,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
 	<tr>
 	<td><p>A be�ll�t�sok m�dos�t�s�hoz v�lassza a <i>Sweet Home 3D &gt; Be�ll�t�sok...</i> men�pontot Mac OS X-en, vagy a <i>F�jl &gt; Be�ll�t�sok...</i> men�pontot egy�b rendszerek alatt.</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="484" height="379"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="488" height="400"></p>
 	  <p>A Be�ll�t�sok ablakban tudja kiv�lasztani a program sor�n haszn�lt <i>Nyelvet</i> �s az alap�rtelmezett <i>M�rt�kegys�get</i> amivel a program a t�vols�gokat �s a sz�less�geket m�ri.<br>
 	    A <i>M�gnesess�g</i> jel�l�n�gyzet enged�lyezi vagy tiltja le a m�gnesess�get az Alaprajz n�zetben <a href="drawingWalls.html">falrajzol�s</a> �s <a href="editingFurniture.html">b�tor elhelyez�s</a> k�zben.<br>
 	    A <i>Vonalz�k</i> jel�l�n�gyzettel lehet a vonalz�k l�that�s�g�t ki- �s bekapcsolni.<br>
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/hu/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/hu/images/editingPreferences.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/addingLevel.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/addingLevel.png differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/level1WithHighWalls.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/level1WithHighWalls.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/editing3DView.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/editing3DView.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/editing3DView.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/editing3DView.html	2011-12-21 00:48:52.000000000 +0000
@@ -150,7 +150,7 @@
 								<P>•</P>
 							</TD>
 							<TD>
-								<P>Premi il tasto <I>shift</I> per rallentare l'effetto del
+								<P>Premi il tasto <I>shift</I> per aumentare l'effetto del
 								movimento del mouse e della rotellina del mouse nella vista
 								3D.</P>
 							</TD>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/editingPreferences.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -33,7 +33,7 @@
 				&gt; Preferenze...</I> sotto Mac OS X oppure <I>File &gt;
 				Preferenze...</I> sotto altri sistemi operativi.</P>
 				
-        <P ALIGN=CENTER><IMG SRC="images/editingPreferences.png" ALIGN=BOTTOM WIDTH=434 HEIGHT=381 BORDER=0></P>
+        <P ALIGN=CENTER><IMG SRC="images/editingPreferences.png" ALIGN=BOTTOM WIDTH=435 HEIGHT=401 BORDER=0></P>
 				<P>Nel pannello preferenze, puoi scegliere il <I>Linguaggio</I>
 				usato per l'interfaccia utente di Sweet Home 3D e l'<I>Unità di
 				misura</I> usata per disegnare i righelli e la griglia della
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/it/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editingPreferences.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -28,7 +28,7 @@
 	<tr>
 	<td><p>Sweet Home 3D�̐ݒ��ҏW����ɂ́A <i>Sweet Home 3D &gt; �ݒ�...</i> �AMac OS X�E���̃V�X�e���‹��� <i>�t�@�C�� &gt; �ݒ�...</i> 
 	    ��I�����ĉ������B</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="393" height="459"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="392" height="485"></p>
 	  <p>�ݒ��ʂł́A�Ԏ��v�����쐬���Ɏg�p�����Sweet Home 3D�̃��[�U�E�C���^�[�t�F�[�X�� <i>����</i> �E <i>�\��</i> �E
 	    ��K����уO���b�h��I���ł��A�����Ē����Ɨ̈�Ȃǂ�\�����܂��B</p>
 	  <p>	      �Ԏ��v������
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ja/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/editing3DView.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/editing3DView.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/editing3DView.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/editing3DView.html	2011-12-21 00:48:52.000000000 +0000
@@ -124,8 +124,7 @@
 	<tr valign="top" BGCOLOR="#eeeeee">
 	<td bgcolor="#eeeeee" width="98%">
 	<table border="0" cellspacing="0" cellpadding="4">
-	  <tr valign="top"><td width="16"><p>&#149;</p></td><td><p>Pressione a tecla shift para tornar o eveito do 
-	        movimento do mouse e da roda do mouse mais lento na vis�o 3D.</p></td></tr>
+	  <tr valign="top"><td width="16"><p>&#149;</p></td><td><p>Pressione a tecla shift para aumentar o efeito de giro do mouse na vis&atilde;o 3D.</p></td></tr>
 	  	  <tr valign="top">
 	    <td width="16"><p>&#149;</p>
 	      </td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/editingPreferences.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -28,7 +28,7 @@
 	<tr>
 	<td><p>Para editar as prefer�ncias, escolha <i>Sweet Home 3D &gt; Prefer�ncias...</i> no Mac OS X ou 
 	    <i>Arquivo &gt; Prefer�ncia...</i> em outros sistemas.</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="421" height="377"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="426" height="402"></p>
 	  <p>Na janela de prefer�ncias, voc� pode escolher a <i>L&iacute;ngua</i> do Sweet Home 3D e a <i>Unidade</i> a ser usada
 	    para mostrar a r�gua e
 	    a grade no plano da casa, e mostrar os tamanhos.<br>
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/pt/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ru/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ru/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ru/editingPreferences.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ru/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -26,7 +26,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
 	<tr>
 	<td><p>��� �������������� �������� Sweet Home 3D, �������� <i>Sweet Home 3D &gt; ���������...</i> � ����� OS X ��� <i>���� &gt; ���������...</i> � ������ ��������.</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="416" height="381" ></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="422" height="397" ></p>
 	  <p>� ������ �������� �� ������ �������  <i>����</i>, ������������ � ���������� Sweet Home 3D � <i>������� ���������</i>, ������������ ��� ��������� � ��������� � ���������.</p>
 	  <p>����� ������ <i>����� ���������</i>  � <i>������ ������</i> ��������� ��������� ��� �������� ������ ��� ������� <a href="ui.html">Sweet Home 3D ����</a>.<br> 
 	     ���� <i>������� 3D ���������</i> �������� ��������� ������� ��� ��������� �� <a href="editing3DView.html">����������� �������������</a>.<br>
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ru/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/ru/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/editing3DView.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/editing3DView.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/editing3DView.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/editing3DView.html	2011-12-21 00:48:52.000000000 +0000
@@ -104,7 +104,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="7" BGCOLOR="#eeeeee">
 	<tr valign="top" BGCOLOR="#eeeeee">
 	<td bgcolor="#eeeeee" width="98%">
-	<table border="0" cellspacing="0" cellpadding="4"><tr valign="top"><td width="16"><p>&#149;</p></td><td><p>H�ll nere Shift-tangenten f�r att sakta ner verkan av musr�relser och mushjulet i 3D-vyn.</p></td></tr>
+	<table border="0" cellspacing="0" cellpadding="4"><tr valign="top"><td width="16"><p>&#149;</p></td><td><p>H&aring;ll ned Shift-tangenten f&ouml;r att &ouml;ka effekten av musr&ouml;relser och mushjulet i 3D-vyn.</p></td></tr>
 	  <tr valign="top">
         <td><p>&#149;</p>
         </td>
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/editingPreferences.html	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -26,7 +26,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
 	<tr>
 	<td><p>F�r att �ndra inst�llningarna f�r Sweet Home 3D v�ljer du <i>Sweet Home 3D &gt; Inst�llningar...</i> under Mac OS X eller <i>Arkiv &gt; Inst�llningar...</i> under andra operativsystem.</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="374" height="377"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="374" height="399"></p>
 	  <p>I inst�llningsrutan kan du v�lja vilket <i>Spr�k</i> som anv�nds i Sweet Home 3D:s anv�ndargr�nssnitt och vilken <i>Enhet</i> som anv�nds n�r du ritar hemmet, p� planl�sningens linjaler och rutn�t, samt p� l�ngder
 	    som visas.</p>
 	  <p> Radioknapparna <i>Kategorimappar</i> och <i>S�kbar lista</i> l�ter dig v�lja hur m�belkatalogen ska visas i varje <a href="ui.html">Sweet Home 3D-f�nster</a>.<br>
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/sv/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editingPreferences.html sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editingPreferences.html
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editingPreferences.html	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/editingPreferences.html	2011-12-21 00:48:52.000000000 +0000
@@ -24,7 +24,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="3">
 	<tr>
 	<td><p>���������Ҫ�Զ��� Sweet Home 3D �IJ������ã����ڲ˵���ѡ��<B>Sweet Home 3D</B>��<B>��������...</B>��Mac OS X����<B>�ļ�</B>��<B>��������...</B>����������ϵͳ����</p>
-	    <p align="center"><img src="images/editingPreferences.png" width="462" height="571"></p>
+	    <p align="center"><img src="images/editingPreferences.png" width="452" height="602"></p>
 	  <p>�����ڡ��������á������У�������ѡ�� Sweet Home 3D ���û�����ʹ�õ�<B>����</B>��ƽ��ͼ�����ڱ�ߡ������Լ�������ʾ���Ⱥ������<B>��λ</B>��</p>
 	  <p>����ʹ�á�<B>�Զ�����</B>����ѡ��������û������ƽ��ͼ�н���<a href="drawingWalls.html">����ǽ��</a>��<a href="editingFurniture.html">�������</a>�Ȳ���ʱ���Զ��������ܡ�<br>����ʹ�á�<B>���</B>����ѡ���������ƽ��ͼ��������ı���Ƿ���ʾ��<br>����ʹ�á�<b>������</b>����ѡ���������ƽ��ͼ���Ƿ���ʾ�����ߡ�<br>����ʹ�á�<b>Ŀ¼ͼ��</b>���͡�<b>����ͼ</b>����ѡ��ť�������������ƽ��ͼ����ʾ�ķ�ʽ���μ������ͼ�񣩡�<br>����ʹ�á�<b>��ɫ</b>���͡�<b>������ɫ������</b>����ѡ��ť��������ƽ��ͼ���Ƿ���ʾ����������ɫ������������Ϊ����ɫ��ʱ������԰�ɫ��ӡ����<br>����ʹ�á�ƽ��ͼǽ����������Ͽ��������ƽ��ͼ���������ǽ���ͼ����</p>
 	  <p>������<b>�½�ǽ����</b>������ֵ�����˻���ǽ��ʱĬ��ʹ�õ�ǽ���ȡ������ò���Ӱ��Ҿ�ģ�������е�ǽ�塣<br>������<b>�½�ǽ��߶�</b>������ֵ�����˻���ǽ��ʱĬ��ʹ�õ�ǽ��߶ȡ������ò���Ӱ��Ҿ�ģ�������е�ǽ�塣</p>	  
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/images/editingPreferences.png and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/resources/help/zh_CN/images/editingPreferences.png differ
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/RoomController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/RoomController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/RoomController.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/RoomController.java	2011-12-21 00:48:52.000000000 +0000
@@ -529,6 +529,9 @@
             ceilingColor, ceilingTexture, ceilingVisible, ceilingShininess);
         this.undoSupport.postEdit(undoableEdit);
       }
+      if (name != null) {
+        this.preferences.addAutoCompletionString("RoomName", name);
+      }
     }
   }
 
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/UserPreferencesController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/UserPreferencesController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/UserPreferencesController.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/UserPreferencesController.java	2011-12-21 00:48:52.000000000 +0000
@@ -36,11 +36,12 @@
    */
   public enum Property {LANGUAGE, UNIT, MAGNETISM_ENABLED, RULERS_VISIBLE, GRID_VISIBLE, 
       FURNITURE_VIEWED_FROM_TOP, ROOM_FLOOR_COLORED_OR_TEXTURED, WALL_PATTERN,  
-      NEW_WALL_THICKNESS, NEW_WALL_HEIGHT, FURNITURE_CATALOG_VIEWED_IN_TREE, NAVIGATION_PANEL_VISIBLE, 
+      NEW_WALL_THICKNESS, NEW_WALL_HEIGHT, NEW_FLOOR_THICKNESS, FURNITURE_CATALOG_VIEWED_IN_TREE, NAVIGATION_PANEL_VISIBLE, 
       AUTO_SAVE_DELAY_FOR_RECOVERY, AUTO_SAVE_FOR_RECOVERY_ENABLED}
   
   private final UserPreferences         preferences;
   private final ViewFactory             viewFactory;
+  private final HomeController          homeController;
   private final PropertyChangeSupport   propertyChangeSupport;
   private DialogView                    userPreferencesView;
 
@@ -56,6 +57,7 @@
   private TextureImage                  wallPattern;
   private float                         newWallThickness;
   private float                         newWallHeight;
+  private float                         newFloorThickness;
   private int                           autoSaveDelayForRecovery;
   private boolean                       autoSaveForRecoveryEnabled;
 
@@ -65,8 +67,19 @@
   public UserPreferencesController(UserPreferences preferences,
                                    ViewFactory viewFactory, 
                                    ContentManager contentManager) {
+    this(preferences, viewFactory, contentManager, null);
+  }
+
+  /**
+   * Creates the controller of user preferences view.
+   */
+  public UserPreferencesController(UserPreferences preferences,
+                                   ViewFactory viewFactory, 
+                                   ContentManager contentManager,
+                                   HomeController homeController) {
     this.preferences = preferences;
     this.viewFactory = viewFactory;
+    this.homeController = homeController;
     this.propertyChangeSupport = new PropertyChangeSupport(this);
     
     updateProperties();
@@ -118,8 +131,11 @@
     setFurnitureViewedFromTop(this.preferences.isFurnitureViewedFromTop());
     setRoomFloorColoredOrTextured(this.preferences.isRoomFloorColoredOrTextured());
     setWallPattern(this.preferences.getWallPattern());
-    setNewWallThickness(this.preferences.getNewWallThickness());
-    setNewWallHeight(this.preferences.getNewWallHeight());
+    float minimumLength = getUnit().getMinimumLength();
+    float maximumLength = getUnit().getMaximumLength();
+    setNewWallThickness(Math.min(Math.max(minimumLength, this.preferences.getNewWallThickness()), maximumLength / 10));
+    setNewWallHeight(Math.min(Math.max(minimumLength, this.preferences.getNewWallHeight()), maximumLength));
+    setNewFloorThickness(Math.min(Math.max(minimumLength, this.preferences.getNewFloorThickness()), maximumLength / 10));
     setAutoSaveDelayForRecovery(this.preferences.getAutoSaveDelayForRecovery());
     setAutoSaveForRecoveryEnabled(this.preferences.getAutoSaveDelayForRecovery() > 0);
   }  
@@ -128,10 +144,15 @@
    * Returns <code>true</code> if the given <code>property</code> is editable.
    * Depending on whether a property is editable or not, the view associated to this controller
    * may render it differently.
-   * The implementation of this method always returns <code>true</code>. 
+   * The implementation of this method always returns <code>true</code> except for <code>LANGUAGE</code> if it's not editable. 
    */
   public boolean isPropertyEditable(Property property) {
-    return true;
+    switch (property) {
+      case LANGUAGE :
+        return this.preferences.isLanguageEditable();
+      default :
+        return true;
+    }
   }
   
   /**
@@ -350,6 +371,24 @@
   }
 
   /**
+   * Sets the edited new floor thickness.
+   */
+  public void setNewFloorThickness(float newFloorThickness) {
+    if (newFloorThickness != this.newFloorThickness) {
+      float oldNewFloorThickness = this.newFloorThickness;
+      this.newFloorThickness = newFloorThickness;
+      this.propertyChangeSupport.firePropertyChange(Property.NEW_FLOOR_THICKNESS.name(), oldNewFloorThickness, newFloorThickness);
+    }
+  }
+
+  /**
+   * Returns the edited new floor thickness.
+   */
+  public float getNewFloorThickness() {
+    return this.newFloorThickness;
+  }
+
+  /**
    * Sets the edited auto recovery save delay.
    */
   public void setAutoSaveDelayForRecovery(int autoSaveDelayForRecovery) {
@@ -387,6 +426,22 @@
   }
 
   /**
+   * Returns <code>true</code> if language libraries can be imported.
+   */
+  public boolean mayImportLanguageLibrary() {
+    return this.homeController != null;
+  }
+  
+  /**
+   * Imports a language library chosen by the user.
+   */
+  public void importLanguageLibrary() {
+    if (this.homeController != null) {
+      this.homeController.importLanguageLibrary();
+    }
+  }
+
+  /**
    * Controls the modification of user preferences.
    */
   public void modifyUserPreferences() {
@@ -402,6 +457,7 @@
     this.preferences.setWallPattern(getWallPattern());
     this.preferences.setNewWallThickness(getNewWallThickness());
     this.preferences.setNewWallHeight(getNewWallHeight());
+    this.preferences.setNewFloorThickness(getNewFloorThickness());
     this.preferences.setAutoSaveDelayForRecovery(isAutoSaveForRecoveryEnabled()
         ? getAutoSaveDelayForRecovery() : 0);
   }
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java	2011-12-21 00:48:52.000000000 +0000
@@ -106,6 +106,12 @@
   public abstract DialogView createUserPreferencesView(
                                           UserPreferences preferences,
                                           UserPreferencesController userPreferencesController);
+  
+  /**
+   * Returns a new view that edits level values.
+   */
+  public abstract DialogView createLevelView(UserPreferences preferences, LevelController levelController);
+
   /**
    * Returns a new view that edits furniture values.
    */
diff -Nru sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/WallController.java sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/WallController.java
--- sweethome3d-3.3+dfsg/src/com/eteks/sweethome3d/viewcontroller/WallController.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/src/com/eteks/sweethome3d/viewcontroller/WallController.java	2011-12-21 00:48:52.000000000 +0000
@@ -497,7 +497,7 @@
     Float xEnd = getXEnd();
     Float yEnd = getYEnd();    
     if (xStart != null && yStart != null && xEnd != null && yEnd != null) {
-      Wall wall = new Wall(xStart, yStart, xEnd, yEnd, 0);
+      Wall wall = new Wall(xStart, yStart, xEnd, yEnd, 0, 0);
       Float arcExtent = getArcExtentInDegrees();
       if (arcExtent != null) {
         wall.setArcExtent((float)Math.toRadians(arcExtent));
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/CatalogTreeTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/CatalogTreeTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/CatalogTreeTest.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/CatalogTreeTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -35,8 +35,8 @@
 import junit.framework.TestCase;
 
 import com.eteks.sweethome3d.io.DefaultFurnitureCatalog;
-import com.eteks.sweethome3d.model.FurnitureCatalog;
 import com.eteks.sweethome3d.model.CatalogPieceOfFurniture;
+import com.eteks.sweethome3d.model.FurnitureCatalog;
 import com.eteks.sweethome3d.model.FurnitureCategory;
 import com.eteks.sweethome3d.swing.FurnitureCatalogTree;
 
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/FurnitureTableTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/FurnitureTableTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/FurnitureTableTest.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/FurnitureTableTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -47,8 +47,8 @@
 import com.eteks.sweethome3d.model.LengthUnit;
 import com.eteks.sweethome3d.model.UserPreferences;
 import com.eteks.sweethome3d.swing.FurnitureTable;
-import com.eteks.sweethome3d.swing.SwingViewFactory;
 import com.eteks.sweethome3d.swing.FurnitureTable.FurnitureFilter;
+import com.eteks.sweethome3d.swing.SwingViewFactory;
 import com.eteks.sweethome3d.viewcontroller.FurnitureController;
 
 /**
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/HomeControllerTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/HomeControllerTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/HomeControllerTest.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/HomeControllerTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -193,7 +193,7 @@
     secondPiece.setAngle(15);
     this.home.addPieceOfFurniture(secondPiece);
     // Add a wall to home
-    this.home.addWall(new Wall(0, 0, 100, 0, 7));
+    this.home.addWall(new Wall(0, 0, 100, 0, 7, this.home.getWallHeight()));
     
     PlanController planController = this.homeController.getPlanController();
     float scale = planController.getScale();
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/HomeFileRecorderTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/HomeFileRecorderTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/HomeFileRecorderTest.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/HomeFileRecorderTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -29,8 +29,8 @@
 
 import com.eteks.sweethome3d.io.DefaultFurnitureCatalog;
 import com.eteks.sweethome3d.io.HomeFileRecorder;
-import com.eteks.sweethome3d.model.FurnitureCatalog;
 import com.eteks.sweethome3d.model.Content;
+import com.eteks.sweethome3d.model.FurnitureCatalog;
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
 import com.eteks.sweethome3d.model.HomeRecorder;
@@ -46,7 +46,7 @@
     // 1. Create an empty home
     Home home1 = new Home();
     // Add to home a wall and a piece of furniture
-    Wall wall = new Wall(0, 10, 100, 80, 10);
+    Wall wall = new Wall(0, 10, 100, 80, 10, home1.getWallHeight());
     home1.addWall(wall);
     FurnitureCatalog catalog = new DefaultFurnitureCatalog();
     HomePieceOfFurniture piece = new HomePieceOfFurniture(
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/HomeFurniturePanelTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/HomeFurniturePanelTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/HomeFurniturePanelTest.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/HomeFurniturePanelTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -27,8 +27,8 @@
 import javax.swing.JFormattedTextField;
 import javax.swing.JOptionPane;
 import javax.swing.JSpinner;
-import javax.swing.JTextField;
 import javax.swing.JSpinner.DefaultEditor;
+import javax.swing.JTextField;
 
 import junit.extensions.abbot.ComponentTestFixture;
 import abbot.finder.AWTHierarchy;
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/HomeTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/HomeTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/HomeTest.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/HomeTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -64,8 +64,8 @@
     });
     
     // Create 2 walls
-    Wall wall1 = new Wall(0, 0, 100, 0, 0);
-    Wall wall2 = new Wall(100, 0, 100, 100, 0);
+    Wall wall1 = new Wall(0, 0, 100, 0, 0, home.getWallHeight());
+    Wall wall2 = new Wall(100, 0, 100, 100, 0, home.getWallHeight());
     // Add them to home
     home.addWall(wall1);
     home.addWall(wall2);
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/LevelTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/LevelTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/LevelTest.java	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/LevelTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,306 @@
+/*
+ * UserPreferences.java 20 nov. 2010
+ *
+ * Copyright (c) 2011 Emmanuel PUYBARET / eTeks <info@eteks.com>. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package com.eteks.sweethome3d.junit;
+
+import java.awt.Point;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.util.Collection;
+import java.util.List;
+
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JSpinner;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+
+import junit.extensions.abbot.ComponentTestFixture;
+import abbot.finder.AWTHierarchy;
+import abbot.finder.BasicFinder;
+import abbot.finder.ComponentNotFoundException;
+import abbot.finder.ComponentSearchException;
+import abbot.finder.MultipleComponentsFoundException;
+import abbot.finder.matchers.ClassMatcher;
+import abbot.tester.ComponentLocation;
+import abbot.tester.JComponentTester;
+import abbot.tester.JSpinnerTester;
+import abbot.tester.JSplitPaneTester;
+import abbot.tester.JTabbedPaneLocation;
+import abbot.tester.JTabbedPaneTester;
+
+import com.eteks.sweethome3d.io.DefaultUserPreferences;
+import com.eteks.sweethome3d.io.HomeFileRecorder;
+import com.eteks.sweethome3d.model.DimensionLine;
+import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.HomePieceOfFurniture;
+import com.eteks.sweethome3d.model.Label;
+import com.eteks.sweethome3d.model.Level;
+import com.eteks.sweethome3d.model.RecorderException;
+import com.eteks.sweethome3d.model.Room;
+import com.eteks.sweethome3d.model.Selectable;
+import com.eteks.sweethome3d.model.UserPreferences;
+import com.eteks.sweethome3d.model.Wall;
+import com.eteks.sweethome3d.swing.HomePane;
+import com.eteks.sweethome3d.swing.LevelPanel;
+import com.eteks.sweethome3d.swing.SwingViewFactory;
+import com.eteks.sweethome3d.swing.WallPanel;
+import com.eteks.sweethome3d.tools.OperatingSystem;
+import com.eteks.sweethome3d.viewcontroller.HomeController;
+import com.eteks.sweethome3d.viewcontroller.HomeView;
+import com.eteks.sweethome3d.viewcontroller.PlanView;
+
+/**
+ * Tests levels.
+ * @author Emmanuel Puybaret
+ */
+public class LevelTest extends ComponentTestFixture {
+  public void testLevels() throws RecorderException, NoSuchFieldException, IllegalAccessException, InterruptedException, ComponentSearchException {
+    UserPreferences preferences = new DefaultUserPreferences() {
+        @Override
+        public void write() throws RecorderException {
+        }
+      };
+    SwingViewFactory viewFactory = new SwingViewFactory();
+    String testFile = LevelTest.class.getResource("resources/home1.sh3d").getFile();
+    if (OperatingSystem.isWindows()) {
+      testFile = testFile.substring(1).replace("%20", " ");
+    }
+    Home home = new HomeFileRecorder().readHome(testFile);
+    assertHomeItemsAtLevel(home, null);
+    HomeController homeController = new HomeController(home, preferences, viewFactory);
+    
+    final JComponent view = (JComponent)homeController.getView();
+    
+    // Create a frame that displays a home view 
+    JFrame frame = new JFrame("Levels Test");    
+    frame.add(view);
+
+    showWindow(frame);
+    JComponentTester tester = new JComponentTester();
+    tester.waitForIdle();
+    // Enlarge plan view size
+    PlanView planView = homeController.getPlanController().getView();
+    JComponent planViewComponent = (JComponent)planView;
+    new JSplitPaneTester().actionMoveDivider(planViewComponent.getParent(), 0.75f);
+
+    // Give focus to plan view
+    tester.actionClick(planViewComponent, 50, 50);
+    assertTrue("Plan view doesn't have focus", TestUtilities.getField(homeController, "focusedView") == planViewComponent);
+    Collection<Wall> walls = home.getWalls();
+    List<HomePieceOfFurniture> furniture = home.getFurniture();
+    List<Room> rooms = home.getRooms();
+    // Select all in plan to ensure walls at top left are visible
+    runAction(homeController, HomeView.ActionType.SELECT_ALL, tester);
+    assertEquals("All walls are not selected", walls.size(), Home.getWallsSubList(home.getSelectedItems()).size());
+    assertEquals("All pieces are not selected", furniture.size(), Home.getFurnitureSubList(home.getSelectedItems()).size());
+    assertEquals("All rooms are not selected", rooms.size(), Home.getRoomsSubList(home.getSelectedItems()).size());
+    // Select wall at left
+    Point p = new Point(planView.convertXModelToScreen(0), planView.convertYModelToScreen(50));
+    SwingUtilities.convertPointFromScreen(p, planViewComponent);
+    tester.actionClick(planViewComponent, new ComponentLocation(p));
+    List<Selectable> selectedItems = home.getSelectedItems();
+    assertEquals("No wall selected", 1, selectedItems.size());
+    assertTrue("No wall selected", selectedItems.get(0) instanceof Wall);
+    Wall firstWall = (Wall)selectedItems.get(0);
+    float oldHeight = firstWall.getHeight();
+    // Modify wall
+    runAction(homeController, HomeView.ActionType.MODIFY_WALL, tester);
+    // Wait for wall view to be shown
+    tester.waitForFrameShowing(new AWTHierarchy(), preferences.getLocalizedString(
+        WallPanel.class, "wall.title"));
+    // Check dialog box is displayed
+    JDialog wallModificationDialog = (JDialog)new BasicFinder().find(frame, new ClassMatcher (JDialog.class, true));
+    assertTrue("Wall modification dialog not showing", wallModificationDialog.isShowing());
+    WallPanel wallPanel = (WallPanel)TestUtilities.findComponent(wallModificationDialog, WallPanel.class);    
+    JSpinner heightSpinner = (JSpinner)TestUtilities.getField(wallPanel, "rectangularWallHeightSpinner");
+    // Increase its height
+    JSpinnerTester spinnerTester = new JSpinnerTester();
+    for (int i = 0; i < 25; i++) {
+      spinnerTester.actionIncrement(heightSpinner);
+    }
+    float newHeight = ((Number)heightSpinner.getValue()).floatValue();
+    // Click on Ok in dialog box    
+    final JOptionPane optionPane = (JOptionPane)TestUtilities.findComponent(
+        wallModificationDialog, JOptionPane.class);
+    tester.invokeAndWait(new Runnable() {
+        public void run() {
+          // Select Ok option to hide dialog box in Event Dispatch Thread
+          optionPane.setValue(JOptionPane.OK_OPTION); 
+        }
+      });
+    assertFalse("Wall modification dialog still showing", wallModificationDialog.isShowing());
+    assertEquals("Wall height unchanged", newHeight, firstWall.getHeight());
+    
+    // Create a new level
+    runAction(homeController, HomeView.ActionType.ADD_LEVEL, tester);
+    List<Level> levels = home.getLevels();
+    assertEquals("No new level", 2, levels.size());
+    assertSame("New level isn't selected", levels.get(levels.size() - 1), home.getSelectedLevel());
+    // Check all home items moved to level 0
+    assertHomeItemsAtLevel(home, levels.get(0));
+    
+    // Check visibility of modified wall and other walls
+    for (Wall wall : walls) {
+      if (wall == firstWall) {
+        assertTrue("High wall not visible", wall.isAtLevel(home.getSelectedLevel()));
+      } else {
+        assertFalse("High wall visible", wall.isAtLevel(home.getSelectedLevel()));
+      }
+    }
+
+    // Test undo
+    runAction(homeController, HomeView.ActionType.UNDO, tester);
+    // Check all home items moved back to no level
+    assertHomeItemsAtLevel(home, null);
+    runAction(homeController, HomeView.ActionType.UNDO, tester);
+    assertEquals("Wall height not restored", oldHeight, firstWall.getHeight());
+    assertEquals("Incorrect level count", 0, home.getLevels().size());
+    
+    runAction(homeController, HomeView.ActionType.ADD_LEVEL, tester);
+    runAction(homeController, HomeView.ActionType.DELETE_LEVEL, tester);
+    assertEquals("Incorrect level count", 1, home.getLevels().size());
+    runAction(homeController, HomeView.ActionType.UNDO, tester);
+    // Check visibility of walls
+    for (Wall wall : walls) {
+      assertFalse("High wall visible", wall.isAtLevel(home.getSelectedLevel()));
+    }
+
+    // Change elevation of second level
+    decreaseLevelElevation(home, homeController, preferences, frame, tester);
+    // Check visibility of walls
+    for (Wall wall : walls) {
+      assertTrue("Wall invisible", wall.isAtLevel(home.getSelectedLevel()));
+    }
+    // Select first level
+    JTabbedPane tabbedPane = (JTabbedPane)new BasicFinder().find(planViewComponent, new ClassMatcher (JTabbedPane.class, true));
+    JTabbedPaneTester tabbedPaneTester = new JTabbedPaneTester();
+    tabbedPaneTester.actionSelectTab(tabbedPane, new JTabbedPaneLocation(0));
+    assertEquals("First level not selected", home.getSelectedLevel(), home.getLevels().get(0));
+    // Change elevation of first level
+    decreaseLevelElevation(home, homeController, preferences, frame, tester);
+    // Select second level
+    tabbedPaneTester.actionSelectTab(tabbedPane, new JTabbedPaneLocation(1));
+    assertEquals("Second level not selected", home.getSelectedLevel(), home.getLevels().get(1));
+
+    // Create a wall checking magnetism with 1st level works
+    runAction(homeController, HomeView.ActionType.CREATE_WALLS, tester);
+    p = new Point(planView.convertXModelToScreen(firstWall.getXStart()) + 2, planView.convertYModelToScreen(firstWall.getYStart()) - 1);
+    SwingUtilities.convertPointFromScreen(p, planViewComponent);
+    tester.actionClick(planViewComponent, new ComponentLocation(p));
+    p = new Point(planView.convertXModelToScreen(firstWall.getXEnd()) - 1, planView.convertYModelToScreen(firstWall.getYEnd()) + 2);
+    SwingUtilities.convertPointFromScreen(p, planViewComponent);
+    tester.actionClick(planViewComponent, new ComponentLocation(p), MouseEvent.BUTTON1, 2);
+    assertEquals("No new wall", walls.size() + 1, home.getWalls().size());
+    Wall newWall = (Wall)home.getWalls().toArray() [walls.size()];
+    assertTrue("Incorrect X start " + firstWall.getXStart() + " " + newWall.getXStart(), 
+        Math.abs(firstWall.getXStart() - newWall.getXStart()) < 1E-4);
+    assertTrue("Incorrect Y start " + firstWall.getYStart() + " " + newWall.getYStart(), 
+        Math.abs(firstWall.getYStart() - newWall.getYStart()) < 1E-4);
+    assertTrue("Incorrect X end " + firstWall.getXEnd() + " " + newWall.getXEnd(), 
+        Math.abs(firstWall.getXEnd() - newWall.getXEnd()) < 1E-4);
+    assertTrue("Incorrect Y end " + firstWall.getYEnd() + " " + newWall.getYEnd(), 
+        Math.abs(firstWall.getYEnd() - newWall.getYEnd()) < 1E-4);
+    
+    // Create a room checking magnetism works
+    runAction(homeController, HomeView.ActionType.CREATE_ROOMS, tester);
+    Room firstRoom = rooms.get(0);
+    float [][] firstRoomPoints = firstRoom.getPoints();
+    firstRoomPoints = new float [][] {firstRoomPoints [0], firstRoomPoints [1], firstRoomPoints [2], firstRoomPoints [firstRoomPoints.length - 1]};
+    for (float [] point : firstRoomPoints) {
+      p = new Point(planView.convertXModelToScreen(point [0]) + 1, planView.convertYModelToScreen(point [1]) + 1);
+      SwingUtilities.convertPointFromScreen(p, planViewComponent);
+      tester.actionClick(planViewComponent, new ComponentLocation(p));      
+    }
+    tester.actionMouseMove(planViewComponent, new ComponentLocation(new Point(0, 0)));
+    tester.actionKeyStroke(KeyEvent.VK_ESCAPE);
+    assertEquals("No new room", rooms.size() + 1, home.getRooms().size());
+    Room newRoom = home.getRooms().get(rooms.size());
+    assertEquals("Wrong point count", firstRoomPoints.length, newRoom.getPointCount());
+    float [][] points = newRoom.getPoints();
+    for (int i = 0; i < firstRoomPoints.length; i++) {
+      assertTrue("Incorrect X [" + i + "] "  + firstRoomPoints [i][0] + " " + points [i][0], 
+          Math.abs(firstRoomPoints [i][0] - points [i][0]) < 1E-4);
+      assertTrue("Incorrect Y [" + i + "] " + firstRoomPoints [i][1] + " " + points [i][1], 
+          Math.abs(firstRoomPoints [i][1] - points [i][1]) < 1E-4);
+    }
+  }
+
+  private void assertHomeItemsAtLevel(Home home, Level level) {
+    for (HomePieceOfFurniture piece : home.getFurniture()) {
+      assertSame("Piece not at expected level", level, piece.getLevel());
+    }
+    for (Wall wall : home.getWalls()) {
+      assertSame("Piece not at expected level", level, wall.getLevel());
+    }
+    for (DimensionLine line : home.getDimensionLines()) {
+      assertSame("Piece not at expected level", level, line.getLevel());
+    }
+    for (Label label : home.getLabels()) {
+      assertSame("Label not at expected level", level, label.getLevel());
+    }
+  }
+
+  private void decreaseLevelElevation(Home home, HomeController homeController, UserPreferences preferences,
+                                      JFrame frame, JComponentTester tester) throws ComponentNotFoundException,
+            MultipleComponentsFoundException, ComponentSearchException, NoSuchFieldException, IllegalAccessException {
+    JSpinnerTester spinnerTester;
+    runAction(homeController, HomeView.ActionType.MODIFY_LEVEL, tester);
+    // Wait for level view to be shown
+    tester.waitForFrameShowing(new AWTHierarchy(), preferences.getLocalizedString(
+        LevelPanel.class, "level.title"));
+    // Check dialog box is displayed
+    final JDialog levelModificationDialog = (JDialog)new BasicFinder().find(frame, new ClassMatcher (JDialog.class, true));
+    assertTrue(" Level modification dialog not showing", levelModificationDialog.isShowing());
+    LevelPanel levelPanel = ( LevelPanel)TestUtilities.findComponent(levelModificationDialog, LevelPanel.class);    
+    JSpinner elevationSpinner = (JSpinner)TestUtilities.getField(levelPanel, "elevationSpinner");
+    // Reduce its elevation at a level where walls of 1st level will be visible
+    spinnerTester = new JSpinnerTester();
+    for (int i = 0; i < 25; i++) {
+      spinnerTester.actionDecrement(elevationSpinner);
+    }
+    float newElevation = ((Number)elevationSpinner.getValue()).floatValue();
+    // Click on Ok in dialog box    
+    final JOptionPane levelOptionPane = (JOptionPane)TestUtilities.findComponent(
+        levelModificationDialog, JOptionPane.class);
+    tester.invokeAndWait(new Runnable() {
+        public void run() {
+          // Select Ok option to hide dialog box in Event Dispatch Thread
+          levelOptionPane.setValue(JOptionPane.OK_OPTION); 
+        }
+      });
+    assertFalse("Level modification dialog still showing", levelModificationDialog.isShowing());
+    assertEquals("Level elevation unchanged", newElevation, home.getSelectedLevel().getElevation());
+  }
+
+  /**
+   * Runs <code>actionPerformed</code> method matching <code>actionType</code> 
+   * in <code>controller</code> view. 
+   */
+  private void runAction(final HomeController controller,
+                         final HomePane.ActionType actionType, JComponentTester tester) {
+    tester.invokeAndWait(new Runnable() { 
+        public void run() {
+          ((JComponent)controller.getView()).getActionMap().get(actionType).actionPerformed(null);
+        }
+      });
+  }
+}
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/OBJWriterTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/OBJWriterTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/OBJWriterTest.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/OBJWriterTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -21,6 +21,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.net.URL;
 
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
@@ -29,6 +32,7 @@
 import junit.framework.TestCase;
 
 import com.eteks.sweethome3d.io.DefaultUserPreferences;
+import com.eteks.sweethome3d.io.HomeFileRecorder;
 import com.eteks.sweethome3d.j3d.OBJWriter;
 import com.eteks.sweethome3d.model.Home;
 import com.eteks.sweethome3d.model.HomePieceOfFurniture;
@@ -36,6 +40,7 @@
 import com.eteks.sweethome3d.model.UserPreferences;
 import com.eteks.sweethome3d.model.Wall;
 import com.eteks.sweethome3d.swing.SwingViewFactory;
+import com.eteks.sweethome3d.tools.OperatingSystem;
 import com.eteks.sweethome3d.viewcontroller.HomeController;
 import com.eteks.sweethome3d.viewcontroller.ViewFactory;
 import com.sun.j3d.utils.geometry.Box;
@@ -78,7 +83,7 @@
   /**
    * Tests home export to OBJ format.
    */
-  public void testHomeExportToOBJ() throws RecorderException {
+  public void testHomeExportToOBJ() throws RecorderException, IOException {
     // 1. Create an empty home and a 3D controller
     ViewFactory viewFactory = new SwingViewFactory();
     UserPreferences preferences = new DefaultUserPreferences();
@@ -87,7 +92,7 @@
         new HomeController(home, preferences, viewFactory);
     
     // 2. Add to home a wall and a piece of furniture
-    home.addWall(new Wall(0, 0, 0, 1000, 10));
+    home.addWall(new Wall(0, 0, 0, 1000, 10, home.getWallHeight()));
     HomePieceOfFurniture piece = new HomePieceOfFurniture(
         preferences.getFurnitureCatalog().getCategory(0).getPieceOfFurniture(0));
     home.addPieceOfFurniture(piece);
@@ -97,12 +102,11 @@
     assertEquals("Incorrect furniture count", 1, home.getFurniture().size());
 
     // 3. Export home to OBJ file
-    File dir = new File("Tmp@#");
-    dir.mkdir();
+    File dir = File.createTempFile("Tmp@#", ".obj1");
+    dir.delete();
+    assertTrue("Can't create temporary directory", dir.mkdir());    
     File objFile = new File(dir, "Test.obj");
     File mtlFile = new File(dir, "Test.mtl");
-    assertFalse(objFile + " exists", objFile.exists());
-    assertFalse(mtlFile + " exists", mtlFile.exists());
     
     homeController.getView().exportToOBJ(objFile.toString());
     assertTrue(objFile + " wasn't created", objFile.exists());
@@ -117,4 +121,71 @@
       fail("Couldn't delete test dir");
     }
   }
+  
+  /**
+   * Tests if the content of an OBJ file is as expected after exporting a complex home
+   * (with holes for windows and staircase).
+   */
+  public void testExportToOBJContent() throws RecorderException, IOException {
+    // 1. Read an existing file
+    String testFile = OBJWriterTest.class.getResource("resources/holes.sh3d").getFile();
+    if (OperatingSystem.isWindows()) {
+      testFile = testFile.substring(1).replace("%20", " ");
+    }
+    Home home = new HomeFileRecorder().readHome(testFile);
+    
+    // 2. Export home to OBJ file
+    File dir = File.createTempFile("Tmp@#", ".obj2");
+    dir.delete();
+    assertTrue("Can't create temporary directory", dir.mkdir());    
+    File objFile = new File(dir, "holes.obj");
+    File mtlFile = new File(dir, "holes.mtl");
+    
+    ViewFactory viewFactory = new SwingViewFactory();
+    UserPreferences preferences = new DefaultUserPreferences() {
+      @Override
+      public String getLocalizedString(Class<?> resourceClass, String resourceKey, Object ... resourceParameters) {
+        if ("exportToOBJ.header".equals(resourceKey)) {
+          return ""; // Avoid header with a date to simply comparison
+        } else {
+          return super.getLocalizedString(resourceClass, resourceKey, resourceParameters);
+        }
+      }
+    };
+    HomeController homeController = new HomeController(home, preferences, viewFactory);
+    homeController.getView().exportToOBJ(objFile.toString());
+    
+    assertSameContent(OBJWriterTest.class.getResource("resources/holes.obj"), objFile.toURI().toURL());
+    assertSameContent(OBJWriterTest.class.getResource("resources/holes.mtl"), mtlFile.toURI().toURL());
+    
+    for (File file : dir.listFiles()) {
+      if (!file.delete()) {
+        fail("Couldn't delete test file " + file);
+      }
+    }
+    if (!dir.delete()) {
+      fail("Couldn't delete test dir");
+    }
+  }
+
+  /**
+   * Asserts both URLs content is the same.
+   */
+  private void assertSameContent(URL expectedContentUrl, URL actualContentUrl) throws IOException {
+    LineNumberReader expectedIn = new LineNumberReader(new InputStreamReader(expectedContentUrl.openStream(), "ISO-8859-1"));
+    LineNumberReader actualIn = new LineNumberReader(new InputStreamReader(actualContentUrl.openStream(), "ISO-8859-1"));
+    for (String expectedLine; (expectedLine = expectedIn.readLine()) != null; ) {
+      String actualLine = actualIn.readLine();
+      if (actualLine == null) {
+        fail("Unexpected end of file in " + actualContentUrl + " at row " + expectedIn.getLineNumber());
+      } else if (!expectedLine.equals(actualLine)) {
+        fail("Difference in " + actualContentUrl + " at row " + expectedIn.getLineNumber());
+      }
+    }
+    if (actualIn.readLine() != null) {
+      fail("Expected end of file in " + actualContentUrl + " at row " + actualIn.getLineNumber());
+    }
+    expectedIn.close();
+    actualIn.close();
+  }
 }
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PackageDependenciesTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PackageDependenciesTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PackageDependenciesTest.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PackageDependenciesTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -79,6 +79,8 @@
     // FreeHEP Vector Graphics for SVG
     JavaPackage vectorGraphicsUtil = constraint.addPackage("org.freehep.util");
     JavaPackage vectorGraphicsSvg = constraint.addPackage("org.freehep.graphicsio.svg");
+    // Batik for SVG path parsing
+    JavaPackage orgApacheBatikParser = constraint.addPackage("org.apache.batik.parser");
     // Java JNLP
     JavaPackage jnlp = constraint.addPackage("javax.jnlp");
     // Mac OS X specific interfaces
@@ -121,6 +123,7 @@
     sweetHome3DJava3D.dependsUpon(xmlParsers);
     sweetHome3DJava3D.dependsUpon(xmlSax);
     sweetHome3DJava3D.dependsUpon(xmlSaxHelpers);
+    sweetHome3DJava3D.dependsUpon(orgApacheBatikParser);
     
     sweetHome3DSwing.dependsUpon(sweetHome3DModel);
     sweetHome3DSwing.dependsUpon(sweetHome3DTools);
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PhotoCreationTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PhotoCreationTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PhotoCreationTest.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PhotoCreationTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -19,18 +19,117 @@
  */
 package com.eteks.sweethome3d.junit;
 
+import java.awt.Component;
+import java.awt.Dialog;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.GregorianCalendar;
+import java.util.List;
 import java.util.TimeZone;
 
-import junit.framework.TestCase;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JProgressBar;
+import javax.swing.JSlider;
+import javax.swing.JSpinner;
 
+import junit.extensions.abbot.ComponentTestFixture;
+import abbot.finder.AWTHierarchy;
+import abbot.finder.BasicFinder;
+import abbot.finder.ComponentNotFoundException;
+import abbot.finder.ComponentSearchException;
+import abbot.finder.MultipleComponentsFoundException;
+import abbot.finder.matchers.ClassMatcher;
+import abbot.tester.JComponentTester;
+import abbot.tester.JFileChooserTester;
+import abbot.tester.JSliderTester;
+
+import com.eteks.sweethome3d.io.DefaultUserPreferences;
+import com.eteks.sweethome3d.io.HomeFileRecorder;
+import com.eteks.sweethome3d.model.AspectRatio;
 import com.eteks.sweethome3d.model.Compass;
+import com.eteks.sweethome3d.model.Home;
+import com.eteks.sweethome3d.model.HomeApplication;
+import com.eteks.sweethome3d.model.HomeRecorder;
+import com.eteks.sweethome3d.model.RecorderException;
+import com.eteks.sweethome3d.model.UserPreferences;
+import com.eteks.sweethome3d.swing.FileContentManager;
+import com.eteks.sweethome3d.swing.HomePane;
+import com.eteks.sweethome3d.swing.PhotoPanel;
+import com.eteks.sweethome3d.swing.SwingViewFactory;
+import com.eteks.sweethome3d.swing.VideoPanel;
+import com.eteks.sweethome3d.tools.OperatingSystem;
+import com.eteks.sweethome3d.viewcontroller.ContentManager;
+import com.eteks.sweethome3d.viewcontroller.HomeController;
+import com.eteks.sweethome3d.viewcontroller.View;
 
 /**
  * Tests photo creation dialog.
  * @author Emmanuel Puybaret
  */
-public class PhotoCreationTest extends TestCase {
+public class PhotoCreationTest extends ComponentTestFixture {
+  private UserPreferences preferences;
+  private HomeController homeController;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    this.preferences = new DefaultUserPreferences() {
+        @Override
+        public void write() throws RecorderException {        
+        }
+      };
+    SwingViewFactory viewFactory = new SwingViewFactory();
+    HomeApplication application = new HomeApplication() {
+        @Override
+        public HomeRecorder getHomeRecorder() {
+          return new HomeFileRecorder();
+        }
+  
+        @Override
+        public UserPreferences getUserPreferences() {
+          return preferences;
+        }
+      };
+    // Create a dummy controller to load a home test file
+    HomeController controller = new HomeController(new Home(), application, viewFactory);
+    
+    String testFile = PhotoCreationTest.class.getResource("resources/home1.sh3d").getFile();
+    if (OperatingSystem.isWindows()) {
+      testFile = testFile.substring(1).replace("%20", " ");
+    }
+    controller.open(testFile);
+    // Wait home is opened
+    for (int i = 0; i < 100 && application.getHomes().size() == 0; i++) {
+      Thread.sleep(100);
+    }
+    
+    List<Home> homes = application.getHomes();
+    assertEquals("Application doesn't contain one home", 1, homes.size());
+    assertEquals("Test home wasn't opened", testFile, homes.get(0).getName());
+    ContentManager contentManager = new FileContentManager(preferences) {
+        @Override
+        public String showSaveDialog(View parentView, String dialogTitle, ContentType contentType, String name) {
+          String os = System.getProperty("os.name");
+          if (OperatingSystem.isMacOSX()) {
+            // Let's pretend the OS isn't Mac OS X to get a JFileChooser instance that works better in test
+            System.setProperty("os.name", "dummy");
+          }
+          try {
+            return super.showSaveDialog(parentView, dialogTitle, contentType, name);
+          } finally {
+            System.setProperty("os.name", os);
+          }
+        }
+      };
+    this.homeController = new HomeController(homes.get(0), application, viewFactory, contentManager, null);
+  }
+  
   public void testSunLocation() {
     // Tests azimuth and elevation values computed in Compass to avoid any regression
     Compass compass = new Compass(0, 0, 2);
@@ -51,4 +150,184 @@
     TestUtilities.assertEqualsWithinEpsilon("Incorrect azimuth", 2.44565f, compass.getSunAzimuth(calendar.getTimeInMillis()), 1E-5f);
     TestUtilities.assertEqualsWithinEpsilon("Incorrect elevation", 0.38735f, compass.getSunElevation(calendar.getTimeInMillis()), 1E-5f);
   }
+  
+  public void testPhotoCreation() throws InterruptedException, ComponentSearchException, NoSuchFieldException, IllegalAccessException, InvocationTargetException, IOException {
+    final JComponent view = (JComponent)this.homeController.getView();
+    
+    // Create a frame that displays a home view 
+    JFrame frame = new JFrame("Photo Creation Test");    
+    frame.add(view);
+    frame.pack();
+
+    showWindow(frame);
+    JComponentTester tester = new JComponentTester();
+    tester.waitForIdle();
+
+    JDialog photoCreationDialog = showPhotoCreationPanel(this.preferences, this.homeController, frame, tester);
+    // Retrieve PhotoPanel components
+    PhotoPanel panel = (PhotoPanel)TestUtilities.findComponent(photoCreationDialog, PhotoPanel.class);    
+    final JSpinner widthSpinner = (JSpinner)TestUtilities.getField(panel, "widthSpinner");
+    JSpinner heightSpinner = (JSpinner)TestUtilities.getField(panel, "heightSpinner");
+    final JComboBox aspectRatioComboBox = (JComboBox)TestUtilities.getField(panel, "aspectRatioComboBox");
+    JSlider qualitySlider = (JSlider)TestUtilities.getField(panel, "qualitySlider");
+    JButton createButton = (JButton)TestUtilities.getField(panel, "createButton");
+    JButton saveButton = (JButton)TestUtilities.getField(panel, "saveButton");
+    JButton closeButton = (JButton)TestUtilities.getField(panel, "closeButton");
+    
+    tester.invokeAndWait(new Runnable() {
+        public void run() {
+          widthSpinner.setValue(200L);
+          aspectRatioComboBox.setSelectedItem(AspectRatio.SQUARE_RATIO);
+        }
+      });
+    assertEquals("Height spinner has wrong value", 200, ((Number)heightSpinner.getValue()).intValue());
+    JSliderTester sliderTester = new JSliderTester();
+    for (int i = qualitySlider.getMinimum(); i <= qualitySlider.getMaximum(); i++) {
+      sliderTester.actionSlide(qualitySlider, i);
+      // Test image creation at each quality 
+      tester.click(createButton);
+      assertFalse("Rendering didn't start", saveButton.isEnabled());
+      // Wait image is generated
+      for (int j = 0; j < 1000 && !saveButton.isEnabled(); j++) {
+        Thread.sleep(100);
+      }
+      assertTrue("Rendering didn't end", saveButton.isEnabled());
+      saveAndAssertMediaIsSaved(saveButton, ContentManager.ContentType.PNG, 
+          preferences.getLocalizedString(PhotoPanel.class, "savePhotoDialog.title"),
+          photoCreationDialog, tester);
+    }
+    tester.click(closeButton);
+    tester.close(frame);
+  }
+
+  public void testVideoCreation() throws InterruptedException, ComponentSearchException, NoSuchFieldException, IllegalAccessException, IOException {
+    final JComponent view = (JComponent)this.homeController.getView();
+    
+    // Create a frame that displays a home view 
+    JFrame frame = new JFrame("Video Creation Test");    
+    frame.add(view);
+    frame.pack();
+
+    showWindow(frame);
+    JComponentTester tester = new JComponentTester();
+    tester.waitForIdle();
+
+    JDialog videoCreationDialog = showVideoCreationPanel(this.preferences, this.homeController, frame, tester);
+    // Retrieve VideoPanel components
+    VideoPanel panel = (VideoPanel)TestUtilities.findComponent(videoCreationDialog, VideoPanel.class);
+    JProgressBar progressBar = (JProgressBar)TestUtilities.getField(panel, "progressBar");
+    JSlider qualitySlider = (JSlider)TestUtilities.getField(panel, "qualitySlider");
+    JButton createButton = (JButton)TestUtilities.getField(panel, "createButton");
+    JButton saveButton = (JButton)TestUtilities.getField(panel, "saveButton");
+    JButton closeButton = (JButton)TestUtilities.getField(panel, "closeButton");
+    JSliderTester sliderTester = new JSliderTester();
+    for (int i = qualitySlider.getMinimum(); i < qualitySlider.getMaximum(); i += 2) {
+      sliderTester.actionSlide(qualitySlider, i);
+      // Test image creation at quality 1 and 3 
+      assertFalse("Progress bar is showing", progressBar.isShowing());
+      tester.click(createButton);
+      assertTrue("Progress bar isn't showing", progressBar.isShowing());
+      // Wait image is generated
+      for (int j = 0; j < 1000 && !saveButton.isEnabled(); j++) {
+        Thread.sleep(100);
+      }
+      assertTrue("Rendering didn't end", saveButton.isEnabled());
+      saveAndAssertMediaIsSaved(saveButton, ContentManager.ContentType.MOV, 
+          preferences.getLocalizedString(VideoPanel.class, "saveVideoDialog.title"),
+          videoCreationDialog, tester);
+    }
+    tester.click(closeButton);
+    tester.close(frame);
+  }
+  
+  /**
+   * Returns the dialog that displays photo panel. 
+   */
+  private JDialog showPhotoCreationPanel(UserPreferences preferences,
+                                        final HomeController controller, 
+                                        JFrame parent, JComponentTester tester) throws ComponentSearchException {
+    tester.invokeLater(new Runnable() { 
+        public void run() {
+          // Display dialog box later in Event Dispatch Thread to avoid blocking test thread
+          ((JComponent)controller.getView()).getActionMap().get(HomePane.ActionType.CREATE_PHOTO).actionPerformed(null);
+        }
+      });
+    // Wait for 3D view to be shown
+    tester.waitForFrameShowing(new AWTHierarchy(), preferences.getLocalizedString(
+        PhotoPanel.class, "createPhoto.title"));
+    // Check dialog box is displayed
+    JDialog photoCreationDialog = (JDialog)new BasicFinder().find(parent, new ClassMatcher (JDialog.class, true));
+    assertTrue("Photo creation dialog not showing", photoCreationDialog.isShowing());
+    return photoCreationDialog;
+  }
+
+  /**
+   * Returns the dialog that displays video panel. 
+   */
+  private JDialog showVideoCreationPanel(UserPreferences preferences,
+                                        final HomeController controller, 
+                                        JFrame parent, JComponentTester tester) throws ComponentSearchException {
+    tester.invokeLater(new Runnable() { 
+        public void run() {
+          // Display dialog box later in Event Dispatch Thread to avoid blocking test thread
+          ((JComponent)controller.getView()).getActionMap().get(HomePane.ActionType.CREATE_VIDEO).actionPerformed(null);
+        }
+      });
+    // Wait for 3D view to be shown
+    tester.waitForFrameShowing(new AWTHierarchy(), preferences.getLocalizedString(
+        VideoPanel.class, "createVideo.title"));
+    // Check dialog box is displayed
+    JDialog photoCreationDialog = (JDialog)new BasicFinder().find(parent, new ClassMatcher (JDialog.class, true));
+    assertTrue("Video creation dialog not showing", photoCreationDialog.isShowing());
+    return photoCreationDialog;
+  }
+  
+  /**
+   * Assert the generated media can be saved. 
+   */
+  private void saveAndAssertMediaIsSaved(JButton saveButton, 
+                                  ContentManager.ContentType contentType,
+                                  final String fileDialogTitle, 
+                                  JDialog parent, 
+                                  JComponentTester tester) throws ComponentNotFoundException, MultipleComponentsFoundException, InterruptedException, IOException {
+    File tmpDirectory = File.createTempFile("media", "dir");
+    tmpDirectory.delete();    
+    assertTrue("Couldn't create tmp directory", tmpDirectory.mkdir());
+    String mediaBaseName = "test";
+    // Show save dialog box
+    tester.click(saveButton);
+    // Wait for file chooser to be shown
+    tester.waitForFrameShowing(new AWTHierarchy(), fileDialogTitle);
+    // Check dialog box is displayed
+    final Dialog saveDialog = (Dialog)new BasicFinder().find(parent, 
+        new ClassMatcher (Dialog.class, true) {
+          @Override
+          public boolean matches(Component c) {
+            if (super.matches(c)) {
+              return ((Dialog)c).getTitle().equals(fileDialogTitle);
+            } else {
+              return false;
+            }
+          }
+        });
+    assertTrue("Save dialog not showing", saveDialog.isShowing());
+    // Change file in print to PDF file chooser 
+    final JFileChooserTester fileChooserTester = new JFileChooserTester();
+    final JFileChooser fileChooser = (JFileChooser)new BasicFinder().find(saveDialog, 
+        new ClassMatcher(JFileChooser.class));
+    fileChooserTester.actionSetDirectory(fileChooser, tmpDirectory.getAbsolutePath());
+    fileChooserTester.actionSetFilename(fileChooser, mediaBaseName);
+    // Select Ok option to hide dialog box
+    fileChooserTester.actionApprove(fileChooser);
+    assertFalse("Save dialog still showing", saveDialog.isShowing());
+    // Wait saving
+    File mediaFile = new File(tmpDirectory, mediaBaseName + "." + contentType.toString().toLowerCase());
+    for (int i = 0; i < 100 && !mediaFile.exists(); i++) {
+      Thread.sleep(100);
+    }
+    assertTrue("Media file " + mediaFile + " doesn't exist", mediaFile.exists());
+    assertTrue("Media file is empty", mediaFile.length() > 0);
+    mediaFile.delete();
+    tmpDirectory.delete();
+  }
 }
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PlanComponentTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PlanComponentTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PlanComponentTest.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PlanComponentTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -56,6 +56,7 @@
 import com.eteks.sweethome3d.swing.PlanComponent;
 import com.eteks.sweethome3d.swing.SwingViewFactory;
 import com.eteks.sweethome3d.viewcontroller.PlanController;
+import com.eteks.sweethome3d.viewcontroller.PlanView;
 import com.eteks.sweethome3d.viewcontroller.ViewFactory;
 
 /**
@@ -412,13 +413,13 @@
    */
   private void assertCoordinatesEqualWallPoints(float xStart, float yStart, float xEnd, float yEnd, Wall wall) {
     assertTrue("Incorrect X start " + xStart + " " + wall.getXStart(), 
-        Math.abs(xStart - wall.getXStart()) < 1E-10);
+        Math.abs(xStart - wall.getXStart()) < 1E-4);
     assertTrue("Incorrect Y start " + yStart + " " + wall.getYStart(), 
-        Math.abs(yStart - wall.getYStart()) < 1E-10);
+        Math.abs(yStart - wall.getYStart()) < 1E-4);
     assertTrue("Incorrect X end " + xEnd + " " + wall.getXEnd(), 
-        Math.abs(xEnd - wall.getXEnd()) < 1E-10);
+        Math.abs(xEnd - wall.getXEnd()) < 1E-4);
     assertTrue("Incorrect Y end " + yEnd + " " + wall.getYEnd(), 
-        Math.abs(yEnd - wall.getYEnd()) < 1E-10);
+        Math.abs(yEnd - wall.getYEnd()) < 1E-4);
   }
 
   /**
@@ -477,7 +478,12 @@
       this.home.getCompass().setVisible(false);
       Locale.setDefault(Locale.FRANCE);
       this.preferences = new DefaultUserPreferences();
-      ViewFactory viewFactory = new SwingViewFactory();
+      ViewFactory viewFactory = new SwingViewFactory() {
+          @Override
+          public PlanView createPlanView(Home home, UserPreferences preferences, PlanController controller) {
+            return new PlanComponent(home, preferences, controller);
+          }
+        };
       UndoableEditSupport undoSupport = new UndoableEditSupport();
       final UndoManager undoManager = new UndoManager();
       undoSupport.addUndoableEditListener(undoManager);
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PlanComponentWithFurnitureTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PlanComponentWithFurnitureTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PlanComponentWithFurnitureTest.java	2011-07-26 19:10:20.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PlanComponentWithFurnitureTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -55,6 +55,8 @@
 import com.eteks.sweethome3d.swing.SwingViewFactory;
 import com.eteks.sweethome3d.tools.OperatingSystem;
 import com.eteks.sweethome3d.viewcontroller.HomeController;
+import com.eteks.sweethome3d.viewcontroller.PlanController;
+import com.eteks.sweethome3d.viewcontroller.PlanView;
 import com.eteks.sweethome3d.viewcontroller.ViewFactory;
 
 /**
@@ -572,7 +574,12 @@
       this.home = new Home();
       this.home.getCompass().setVisible(false);
       UserPreferences preferences = new DefaultUserPreferences();      
-      ViewFactory viewFactory = new SwingViewFactory();
+      ViewFactory viewFactory = new SwingViewFactory() {
+          @Override
+          public PlanView createPlanView(Home home, UserPreferences preferences, PlanController controller) {
+            return new PlanComponent(home, preferences, controller);
+          }
+        };
       this.homeController = new HomeController(home, preferences, viewFactory);
       JComponent homeView = (JComponent)this.homeController.getView();
       ActionMap actions = homeView.getActionMap();
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PrintTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PrintTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/PrintTest.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/PrintTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -215,10 +215,11 @@
       });
     assertFalse("Print preview dialog still showing", printPreviewDialog.isShowing());
     
-    // 7. Check the created PDF file doesn't exist
-    String pdfFileBase = "testsdfghjk";
-    File pdfFile = new File(pdfFileBase + ".pdf");
-    assertFalse("PDF file already exists, delete it first", pdfFile.exists());
+    // 7. Check PDF creation
+    File tmpDirectory = File.createTempFile("print", "dir");
+    tmpDirectory.delete();    
+    assertTrue("Couldn't create tmp directory", tmpDirectory.mkdir());
+    String pdfFileBase = "test";
     // Show print to PDF dialog box
     tester.invokeLater(new Runnable() { 
         public void run() {
@@ -237,16 +238,18 @@
     final JFileChooserTester fileChooserTester = new JFileChooserTester();
     final JFileChooser fileChooser = (JFileChooser)new BasicFinder().find(printToPdfDialog, 
         new ClassMatcher(JFileChooser.class));
-    fileChooserTester.actionSetDirectory(fileChooser, System.getProperty("user.dir"));
+    fileChooserTester.actionSetDirectory(fileChooser, tmpDirectory.getAbsolutePath());
     fileChooserTester.actionSetFilename(fileChooser, pdfFileBase);
     // Select Ok option to hide dialog box
     fileChooserTester.actionApprove(fileChooser);
+    assertFalse("Print to pdf dialog still showing", printToPdfDialog.isShowing());
     // Wait PDF generation  
+    File pdfFile = new File(tmpDirectory, pdfFileBase + ".pdf");
     Thread.sleep(2000);
-    assertFalse("Print to pdf dialog still showing", printToPdfDialog.isShowing());
-    assertTrue("PDF file doesn't exist", pdfFile.exists());
+    assertTrue("PDF file " + pdfFile + " doesn't exist", pdfFile.exists());
     assertTrue("PDF file is empty", pdfFile.length() > 0);
     pdfFile.delete();
+    tmpDirectory.delete();
   }
   
   /**
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.mtl sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.mtl
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.mtl	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.mtl	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,42 @@
+# 
+
+newmtl ground_1
+illum 0
+Ka 0.8784314 0.8784314 0.8784314
+Kd 0.8784314 0.8784314 0.8784314
+Ks 0.8784314 0.8784314 0.8784314
+
+newmtl wall_1_2
+illum 1
+Ka 0.2 0.2 0.2
+Kd 1.0 1.0 1.0
+Ks 0.0 0.0 0.0
+Ns 0.0
+Ni 1
+d 1.0
+
+newmtl piece_a_18
+illum 9
+Ka 0.78125 0.78125 0.78125
+Kd 0.78125 0.78125 0.78125
+Ks 0.78125 0.78125 0.78125
+Ns 64.0
+d 0.0
+
+newmtl room_1_20
+illum 1
+Ka 0.0 0.0 1.0
+Kd 0.0 0.0 1.0
+Ks 0.0 0.0 0.0
+Ns 0.0
+Ni 1
+d 1.0
+
+newmtl room_2_22
+illum 1
+Ka 0.8 0.0 0.2
+Kd 0.8 0.0 0.2
+Ks 0.0 0.0 0.0
+Ns 0.0
+Ni 1
+d 1.0
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.obj sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.obj
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.obj	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.obj	2011-12-21 00:48:52.000000000 +0000
@@ -0,0 +1,411 @@
+# 
+mtllib holes.mtl
+g ground_1
+usemtl ground_1
+v -0.5 0.0 -4.4
+v -0.5 0.0 303.60013
+v 507.5 0.0 303.60013
+v 507.5 0.0 -4.4
+v 499.5 0.0 3.6
+v 499.5 0.0 295.6
+v 7.5 0.0 295.6
+v 7.5 0.0 3.6
+f 7 2 3
+f 6 7 3
+f 6 3 4
+f 5 6 4
+f 5 4 1
+f 8 5 1
+f 8 1 2
+f 8 2 7
+g wall_1_2
+usemtl wall_1_2
+v 3.5 0.0 -0.4000001
+v 3.5 250.1 -0.4000001
+v -0.5 250.1 -4.4
+v 503.5 0.0 -0.4000001
+v 507.5 250.1 -4.4
+v 503.5 250.1 -0.4000001
+vn -0.70710677 0.0 0.70710677
+vn 0.70710677 0.0 0.70710677
+vn 0.0 0.0 -1.0
+vn 0.0 0.0 0.0
+f 1//1 9//1 10//1 11//1
+f 12//2 4//2 13//2 14//2
+f 4//3 1//3 11//3 13//3
+vn 0.0 -1.0 0.0
+f 4//5 12//5 9//5
+f 4//5 9//5 1//5
+vn 0.0 1.0 0.0
+f 11//6 10//6 14//6
+f 11//6 14//6 13//6
+g wall_1_3
+usemtl wall_1_2
+v 7.5 250.1 3.6
+v 499.5 250.1 3.6
+vn 0.0 0.0 1.0
+f 9//1 8//1 15//1 10//1
+f 8//7 5//7 16//7 15//7
+f 5//2 12//2 14//2 16//2
+f 12//5 5//5 8//5
+f 12//5 8//5 9//5
+f 10//6 15//6 16//6
+f 10//6 16//6 14//6
+g wall_2_4
+usemtl wall_1_2
+v 503.5 0.0 299.6
+v 507.5 0.0 303.6
+v 507.5 250.1 303.6
+v 503.5 250.1 299.6
+vn -0.70710677 0.0 -0.70710677
+vn 1.0 0.0 0.0
+f 4//8 12//8 14//8 13//8
+f 17//1 18//1 19//1 20//1
+f 18//9 4//9 13//9 19//9
+f 18//5 17//5 12//5
+f 18//5 12//5 4//5
+f 13//6 14//6 20//6
+f 13//6 20//6 19//6
+g wall_2_5
+usemtl wall_1_2
+v 499.5 250.1 295.6
+vn -1.0 0.0 0.0
+f 12//8 5//8 16//8 14//8
+f 5//10 6//10 21//10 16//10
+f 6//1 17//1 20//1 21//1
+f 17//5 6//5 5//5
+f 17//5 5//5 12//5
+f 14//6 16//6 21//6
+f 14//6 21//6 20//6
+g wall_3_6
+usemtl wall_1_2
+v 3.5 0.0 299.6
+v -0.5 0.0 303.6
+v -0.5 250.1 303.6
+v 3.5 250.1 299.6
+v 125.0 0.0 303.6
+v 125.0 250.1 303.6
+v 125.0 0.0 299.6
+v 125.0 250.1 299.6
+f 22//8 23//8 24//8 25//8
+f 23//7 26//7 27//7 24//7
+f 26//9 28//9 29//9 27//9
+f 28//5 26//5 23//5
+f 28//5 23//5 22//5
+f 25//6 24//6 27//6
+f 25//6 27//6 29//6
+v 375.0 0.0 299.6
+v 375.0 0.0 303.6
+v 375.0 250.1 303.6
+v 375.0 250.1 299.6
+vn 0.70710677 0.0 -0.70710677
+f 30//10 31//10 32//10 33//10
+f 31//7 18//7 19//7 32//7
+f 18//11 17//11 20//11 19//11
+f 17//5 18//5 31//5
+f 17//5 31//5 30//5
+f 33//6 32//6 19//6
+f 33//6 19//6 20//6
+v 125.0 100.0 303.6
+v 125.0 100.0 299.6
+v 375.0 100.0 303.6
+v 375.0 100.0 299.6
+f 28//10 26//10 34//10 35//10
+f 26//7 31//7 36//7 34//7
+f 31//9 30//9 37//9 36//9
+f 30//5 31//5 26//5
+f 30//5 26//5 28//5
+f 35//6 34//6 36//6
+f 35//6 36//6 37//6
+v 125.0 200.0 299.6
+v 125.0 200.0 303.6
+v 375.0 200.0 303.6
+v 375.0 200.0 299.6
+f 38//10 39//10 27//10 29//10
+f 39//7 40//7 32//7 27//7
+f 40//9 41//9 33//9 32//9
+f 41//5 40//5 39//5
+f 41//5 39//5 38//5
+f 29//6 27//6 32//6
+f 29//6 32//6 33//6
+g wall_3_7
+usemtl wall_1_2
+v 7.5 250.1 295.6
+v 125.0 0.0 295.6
+v 125.0 250.1 295.6
+f 7//8 22//8 25//8 42//8
+f 28//9 43//9 44//9 29//9
+f 43//3 7//3 42//3 44//3
+f 43//5 28//5 22//5
+f 43//5 22//5 7//5
+f 42//6 25//6 29//6
+f 42//6 29//6 44//6
+v 375.0 0.0 295.6
+v 375.0 250.1 295.6
+f 45//10 30//10 33//10 46//10
+f 17//11 6//11 21//11 20//11
+f 6//3 45//3 46//3 21//3
+f 6//5 17//5 30//5
+f 6//5 30//5 45//5
+f 46//6 33//6 20//6
+f 46//6 20//6 21//6
+v 125.0 100.0 295.6
+v 375.0 100.0 295.6
+f 43//10 28//10 35//10 47//10
+f 30//9 45//9 48//9 37//9
+f 45//3 43//3 47//3 48//3
+f 45//5 30//5 28//5
+f 45//5 28//5 43//5
+f 47//6 35//6 37//6
+f 47//6 37//6 48//6
+v 125.0 200.0 295.6
+v 375.0 200.0 295.6
+f 49//10 38//10 29//10 44//10
+f 41//9 50//9 46//9 33//9
+f 50//3 49//3 44//3 46//3
+f 50//5 41//5 38//5
+f 50//5 38//5 49//5
+f 44//6 29//6 33//6
+f 44//6 33//6 46//6
+g wall_4_8
+usemtl wall_1_2
+f 22//2 7//2 42//2 25//2
+f 7//9 8//9 15//9 42//9
+f 8//11 9//11 10//11 15//11
+f 8//5 7//5 22//5
+f 8//5 22//5 9//5
+f 10//6 25//6 42//6
+f 10//6 42//6 15//6
+g wall_4_9
+usemtl wall_1_2
+f 1//10 23//10 24//10 11//10
+f 23//2 22//2 25//2 24//2
+f 9//11 1//11 11//11 10//11
+f 9//5 22//5 23//5
+f 9//5 23//5 1//5
+f 11//6 24//6 25//6
+f 11//6 25//6 10//6
+g wall_5_10
+usemtl wall_1_2
+v 3.5 312.1 -0.4000001
+v -0.5 312.1 -4.4
+v 507.5 312.1 -4.4
+v 503.5 312.1 -0.4000001
+f 11//1 10//1 51//1 52//1
+f 14//2 13//2 53//2 54//2
+f 13//3 11//3 52//3 53//3
+f 13//5 14//5 10//5
+f 13//5 10//5 11//5
+f 52//6 51//6 54//6
+f 52//6 54//6 53//6
+g wall_5_11
+usemtl wall_1_2
+v 7.5 312.1 3.6
+v 499.5 312.1 3.6
+f 10//1 15//1 55//1 51//1
+f 15//7 16//7 56//7 55//7
+f 16//2 14//2 54//2 56//2
+f 14//5 16//5 15//5
+f 14//5 15//5 10//5
+f 51//6 55//6 56//6
+f 51//6 56//6 54//6
+g wall_6_12
+usemtl wall_1_2
+v 507.5 312.1 303.6
+v 503.5 312.1 299.6
+f 13//8 14//8 54//8 53//8
+f 20//1 19//1 57//1 58//1
+f 19//9 13//9 53//9 57//9
+f 19//5 20//5 14//5
+f 19//5 14//5 13//5
+f 53//6 54//6 58//6
+f 53//6 58//6 57//6
+g wall_6_13
+usemtl wall_1_2
+v 499.5 312.1 295.6
+f 14//8 16//8 56//8 54//8
+f 16//10 21//10 59//10 56//10
+f 21//1 20//1 58//1 59//1
+f 20//5 21//5 16//5
+f 20//5 16//5 14//5
+f 54//6 56//6 59//6
+f 54//6 59//6 58//6
+g wall_7_14
+usemtl wall_1_2
+v -0.5 312.1 303.6
+v 3.5 312.1 299.6
+f 25//8 24//8 60//8 61//8
+f 24//7 19//7 57//7 60//7
+f 19//11 20//11 58//11 57//11
+f 20//5 19//5 24//5
+f 20//5 24//5 25//5
+f 61//6 60//6 57//6
+f 61//6 57//6 58//6
+g wall_7_15
+usemtl wall_1_2
+v 7.5 312.1 295.6
+f 42//8 25//8 61//8 62//8
+f 20//11 21//11 59//11 58//11
+f 21//3 42//3 62//3 59//3
+f 21//5 20//5 25//5
+f 21//5 25//5 42//5
+f 62//6 61//6 58//6
+f 62//6 58//6 59//6
+g wall_8_16
+usemtl wall_1_2
+f 25//2 42//2 62//2 61//2
+f 42//9 15//9 55//9 62//9
+f 15//11 10//11 51//11 55//11
+f 15//5 42//5 25//5
+f 15//5 25//5 10//5
+f 51//6 61//6 62//6
+f 51//6 62//6 55//6
+g wall_8_17
+usemtl wall_1_2
+f 11//10 24//10 60//10 52//10
+f 24//2 25//2 61//2 60//2
+f 10//11 11//11 52//11 51//11
+f 10//5 25//5 24//5
+f 10//5 24//5 11//5
+f 52//6 60//6 61//6
+f 52//6 61//6 51//6
+g piece_a_18
+usemtl piece_a_18
+v 125.0 100.0 295.59988
+v 375.0 100.0 295.59988
+v 250.0 100.0 299.6
+v 125.0 100.0 303.60013
+v 375.0 100.0 303.60013
+v 125.0 150.0 299.6
+v 125.0 200.0 303.60013
+v 125.0 200.0 295.59988
+v 250.0 150.0 295.59988
+v 375.0 200.0 295.59988
+v 375.0 150.0 299.6
+v 375.0 200.0 303.60013
+v 250.0 200.0 299.6
+v 250.0 150.0 303.60013
+vn -1.0 0.0 -0.0000001
+vn 0.0000001 0.0 -1.0
+vn 1.0 0.0 0.0000001
+vn -0.0000001 0.0 1.0
+f 63//5 64//5 65//5
+f 66//5 63//5 65//5
+f 67//5 66//5 65//5
+f 64//5 67//5 65//5
+f 63//12 66//12 68//12
+f 66//12 69//12 68//12
+f 69//12 70//12 68//12
+f 70//12 63//12 68//12
+f 64//13 63//13 71//13
+f 63//13 70//13 71//13
+f 70//13 72//13 71//13
+f 72//13 64//13 71//13
+f 67//14 64//14 73//14
+f 64//14 72//14 73//14
+f 72//14 74//14 73//14
+f 74//14 67//14 73//14
+f 72//6 70//6 75//6
+f 70//6 69//6 75//6
+f 69//6 74//6 75//6
+f 74//6 72//6 75//6
+f 66//15 67//15 76//15
+f 67//15 74//15 76//15
+f 74//15 69//15 76//15
+f 69//15 66//15 76//15
+g piece_a_19
+usemtl piece_a_18
+v 200.0 0.0 200.0
+v 100.0 0.0 200.0
+v 150.0 0.0 150.0
+v 200.0 0.0 100.0
+v 100.0 0.0 100.0
+v 200.0 132.5 150.0
+v 200.0 265.0 100.0
+v 200.0 265.0 200.0
+v 150.0 132.5 200.0
+v 100.0 265.0 200.0
+v 100.0 132.5 150.0
+v 100.0 265.0 100.0
+v 150.0 265.0 150.0
+v 150.0 132.5 100.0
+f 77//5 78//5 79//5
+f 80//5 77//5 79//5
+f 81//5 80//5 79//5
+f 78//5 81//5 79//5
+f 77//9 80//9 82//9
+f 80//9 83//9 82//9
+f 83//9 84//9 82//9
+f 84//9 77//9 82//9
+f 78//7 77//7 85//7
+f 77//7 84//7 85//7
+f 84//7 86//7 85//7
+f 86//7 78//7 85//7
+f 81//10 78//10 87//10
+f 78//10 86//10 87//10
+f 86//10 88//10 87//10
+f 88//10 81//10 87//10
+f 86//6 84//6 89//6
+f 84//6 83//6 89//6
+f 83//6 88//6 89//6
+f 88//6 86//6 89//6
+f 80//3 81//3 90//3
+f 81//3 88//3 90//3
+f 88//3 83//3 90//3
+f 83//3 80//3 90//3
+g room_1_20
+usemtl room_1_20
+f 8//6 7//6 6//6
+f 8//6 6//6 5//6
+g room_1_21
+usemtl wall_1_2
+v 499.5 250.0 3.6
+v 499.5 250.0 295.6
+v 7.5 250.0 295.6
+v 7.5 250.0 3.6
+v 200.0 250.0 100.0
+v 200.0 250.0 200.0
+v 100.0 250.0 200.0
+v 100.0 250.0 100.0
+f 96//5 92//5 93//5
+f 97//5 96//5 93//5
+f 97//5 93//5 94//5
+f 98//5 97//5 94//5
+f 98//5 94//5 91//5
+f 95//5 98//5 91//5
+f 95//5 91//5 92//5
+f 95//5 92//5 96//5
+g room_2_22
+usemtl room_2_22
+v 7.5 262.0 3.6
+v 7.5 262.0 295.6
+v 499.5 262.0 295.6
+v 499.5 262.0 3.6
+v 100.0 262.0 100.0
+v 100.0 262.0 200.0
+v 200.0 262.0 200.0
+v 200.0 262.0 100.0
+f 99//10 94//10 93//10
+f 99//10 93//10 100//10
+f 100//7 93//7 92//7
+f 100//7 92//7 101//7
+f 101//9 92//9 91//9
+f 101//9 91//9 102//9
+f 102//3 91//3 94//3
+f 102//3 94//3 99//3
+f 103//9 104//9 97//9
+f 103//9 97//9 98//9
+f 104//3 105//3 96//3
+f 104//3 96//3 97//3
+f 105//10 106//10 95//10
+f 105//10 95//10 96//10
+f 106//7 103//7 98//7
+f 106//7 98//7 95//7
+f 104//6 100//6 101//6
+f 105//6 104//6 101//6
+f 105//6 101//6 102//6
+f 106//6 105//6 102//6
+f 106//6 102//6 99//6
+f 103//6 106//6 99//6
+f 103//6 99//6 100//6
+f 103//6 100//6 104//6
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.sh3d and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/resources/holes.sh3d differ
Binary files /tmp/r0SPsMjHS1/sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/resources/home1.sh3d and /tmp/cnTLyWV7DL/sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/resources/home1.sh3d differ
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/RoomTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/RoomTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/RoomTest.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/RoomTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -50,6 +50,7 @@
 import com.eteks.sweethome3d.viewcontroller.HomeController;
 import com.eteks.sweethome3d.viewcontroller.HomeView;
 import com.eteks.sweethome3d.viewcontroller.PlanController;
+import com.eteks.sweethome3d.viewcontroller.PlanView;
 import com.eteks.sweethome3d.viewcontroller.ViewFactory;
 
 /**
@@ -95,7 +96,7 @@
     // Check room point count and area
     Room room = frame.home.getRooms().get(0);
     assertEquals("Wrong point count", 5, room.getPoints().length);
-    assertEquals("Wrong room area", 69273.02f, room.getArea());
+    assertEquals("Wrong room area", 69244.76f, room.getArea());
     
     // 4. Edit created room
     JDialog attributesDialog = showRoomPanel(frame.preferences, frame.homeController, frame, tester);
@@ -196,7 +197,6 @@
   /**
    * Runs <code>actionPerformed</code> method matching <code>actionType</code> 
    * in <code>HomePane</code>. 
-   * @param tester TODO
    */
   private void runAction(final HomeController controller,
                          final HomePane.ActionType actionType, JComponentTester tester) {
@@ -251,7 +251,12 @@
           public void write() throws RecorderException {
           }
         };
-      ViewFactory viewFactory = new SwingViewFactory();
+      ViewFactory viewFactory = new SwingViewFactory() {
+          @Override
+          public PlanView createPlanView(Home home, UserPreferences preferences, PlanController controller) {
+            return new PlanComponent(home, preferences, controller);
+          }
+        };
       FileContentManager contentManager = new FileContentManager(this.preferences);
       this.homeController = new HomeController(this.home, this.preferences, viewFactory, contentManager);
       setRootPane((JRootPane)this.homeController.getView());
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/UserPreferencesPanelTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/UserPreferencesPanelTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/UserPreferencesPanelTest.java	2011-07-26 19:10:22.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/UserPreferencesPanelTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -55,6 +55,7 @@
 import com.eteks.sweethome3d.viewcontroller.ImportedFurnitureWizardController;
 import com.eteks.sweethome3d.viewcontroller.ImportedTextureWizardController;
 import com.eteks.sweethome3d.viewcontroller.LabelController;
+import com.eteks.sweethome3d.viewcontroller.LevelController;
 import com.eteks.sweethome3d.viewcontroller.PageSetupController;
 import com.eteks.sweethome3d.viewcontroller.PhotoController;
 import com.eteks.sweethome3d.viewcontroller.PlanController;
@@ -330,6 +331,7 @@
       new PrintPreviewController(home, preferences, homeController, viewFactory).getView();
       new UserPreferencesController(preferences, viewFactory, contentManager).getView();
       new HomeFurnitureController(home, preferences, viewFactory, contentManager, undoableEditSupport).getView();
+      new LevelController(home, preferences, viewFactory, undoableEditSupport).getView();
       new WallController(home, preferences, viewFactory, contentManager, undoableEditSupport).getView();
       new RoomController(home, preferences, viewFactory, contentManager, undoableEditSupport).getView();
       new LabelController(home, preferences, viewFactory, undoableEditSupport).getView();
diff -Nru sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/WallPanelTest.java sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/WallPanelTest.java
--- sweethome3d-3.3+dfsg/test/com/eteks/sweethome3d/junit/WallPanelTest.java	2011-07-26 19:10:24.000000000 +0000
+++ sweethome3d-3.4+dfsg/test/com/eteks/sweethome3d/junit/WallPanelTest.java	2011-12-21 00:48:52.000000000 +0000
@@ -51,7 +51,7 @@
     ViewFactory viewFactory = new SwingViewFactory();
     // Create a home and add a selected wall to it
     Home home = new Home();
-    Wall wall1 = new Wall(0.1f, 0.2f, 100.1f, 100.2f, 7.5f);
+    Wall wall1 = new Wall(0.1f, 0.2f, 100.1f, 100.2f, 7.5f, home.getWallHeight());
     home.addWall(wall1);
     wall1.setLeftSideColor(10);
     wall1.setRightSideColor(20);
@@ -91,7 +91,7 @@
     assertTrue("Wrong Y end", Math.abs(wall1.getYEnd() + 20f * (float)Math.sin(Math.PI / 4) - wallController.getYEnd()) < 1E-5);
     
     // 5. Add a second selected wall to home
-    Wall wall2 = new Wall(0.1f, 0.3f, 200.1f, 200.2f, 5f);
+    Wall wall2 = new Wall(0.1f, 0.3f, 200.1f, 200.2f, 5f, home.getWallHeight());
     home.addWall(wall2);
     wall2.setHeight(300f);
     wall2.setLeftSideColor(10);
@@ -144,7 +144,7 @@
   public static void main(String [] args) {
     // Create a selected wall in a home and display it in a wall panel
     Home home = new Home();
-    Wall wall1 = new Wall(0.1f, 0.2f, 100.1f, 100.2f, 7.5f);
+    Wall wall1 = new Wall(0.1f, 0.2f, 100.1f, 100.2f, 7.5f, home.getWallHeight());
     home.addWall(wall1);
     wall1.setLeftSideColor(null);
     wall1.setRightSideColor(0xFFFF00);
diff -Nru sweethome3d-3.3+dfsg/THIRDPARTY-LICENSE-BATIK.TXT sweethome3d-3.4+dfsg/THIRDPARTY-LICENSE-BATIK.TXT
--- sweethome3d-3.3+dfsg/THIRDPARTY-LICENSE-BATIK.TXT	1970-01-01 00:00:00.000000000 +0000
+++ sweethome3d-3.4+dfsg/THIRDPARTY-LICENSE-BATIK.TXT	2011-12-21 00:48:48.000000000 +0000
@@ -0,0 +1,215 @@
+The following additional provisions apply to batik-svgpathparser-1.7.jar third party software
+included as part of this product.
+
+batik-svgpathparser library is useful in Sweet Home 3D to parse paths defined with the  
+syntax of the d attribute of a SVG path element.
+http://www.w3.org/TR/SVG/paths.html
+
+batik-svgpathparser library is a subset of batik library available at:
+http://xmlgraphics.apache.org/batik/ 
+and source code can be downloaded at:
+http://www.apache.org/dist/xmlgraphics/batik/batik-src-1.7.zip
+
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file