This is an automated email from the git hooks/post-receive script. gg0-guest pushed a commit to branch master in repository sweethome3d.
commit 68049b0aa0035453140af4ba3f66208e7a2ca6b5 Merge: db01147 bdc5e73 Author: Gabriele Giacone <[email protected]> Date: Mon Aug 26 01:32:36 2013 +0200 Merge tag 'upstream/4.1+dfsg' Upstream version 4.1+dfsg .classpath | 2 +- ChangeLog | 57 +- LICENSE.TXT | 2 +- README.TXT | 4 +- THIRDPARTY-LICENSE-SUNFLOW.TXT | 4 +- build.xml | 132 ++-- deploy/SweetHome3D.jnlp | 13 +- deploy/SweetHome3DApplet.html | 2 +- install/jar/MANIFEST.MF | 3 - install/linux/SweetHome3D | 2 +- install/macosx/Sweet Home 3D/Contents/Info.plist | 8 +- install/windows/Bulgarian.isl | 54 +- install/windows/ChineseSimp.isl | 504 ++++++++------- install/windows/Greek.isl | 368 ----------- install/windows/Japanese.isl | 312 ---------- install/windows/Swedish.isl | 649 ++++++++++---------- install/windows/installerInnoSetup.iss | 46 +- install/windows/installerLaunch4j.xml | 15 +- install/windows/signedInstallerInnoSetup.iss | 48 +- src/com/eteks/sweethome3d/HomeFramePane.java | 13 + src/com/eteks/sweethome3d/SweetHome3D.java | 26 +- .../eteks/sweethome3d/SweetHome3DBootstrap.java | 20 +- .../sweethome3d/applet/AppletApplication.java | 18 +- .../sweethome3d/applet/SweetHome3DApplet.java | 21 +- .../eteks/sweethome3d/applet/package.properties | 3 +- .../eteks/sweethome3d/applet/package_fr.properties | 1 + .../sweethome3d/io/DefaultFurnitureCatalog.java | 17 +- .../sweethome3d/io/DefaultHomeInputStream.java | 7 +- .../sweethome3d/io/DefaultHomeOutputStream.java | 31 +- .../sweethome3d/io/DefaultTexturesCatalog.java | 16 +- .../eteks/sweethome3d/io/FileUserPreferences.java | 53 +- src/com/eteks/sweethome3d/io/HomeURLContent.java | 2 +- .../sweethome3d/io/URLContentClassLoader.java | 51 ++ src/com/eteks/sweethome3d/j3d/DAELoader.java | 42 +- src/com/eteks/sweethome3d/j3d/ModelManager.java | 71 ++- src/com/eteks/sweethome3d/j3d/OBJLoader.java | 50 +- src/com/eteks/sweethome3d/j3d/OBJWriter.java | 43 +- src/com/eteks/sweethome3d/model/Home.java | 2 +- .../sweethome3d/model/HomePieceOfFurniture.java | 8 +- ...es.properties => SupportedLanguages.properties} | 4 +- .../eteks/sweethome3d/model/UserPreferences.java | 18 +- src/com/eteks/sweethome3d/package.properties | 2 +- src/com/eteks/sweethome3d/swing/ColorButton.java | 6 +- .../swing/FurnitureCatalogListPanel.java | 44 +- .../sweethome3d/swing/FurnitureCatalogTree.java | 42 +- .../eteks/sweethome3d/swing/FurnitureToolTip.java | 127 ++++ .../sweethome3d/swing/HomePrintableComponent.java | 38 +- .../swing/ImportedFurnitureWizardStepsPanel.java | 18 +- .../sweethome3d/swing/ModelMaterialsComponent.java | 6 +- .../sweethome3d/swing/ModelPreviewComponent.java | 78 ++- src/com/eteks/sweethome3d/swing/PlanComponent.java | 2 +- src/com/eteks/sweethome3d/swing/package.properties | 3 +- .../eteks/sweethome3d/swing/package_bg.properties | 1 + .../eteks/sweethome3d/swing/package_cs.properties | 3 +- .../eteks/sweethome3d/swing/package_de.properties | 3 +- .../eteks/sweethome3d/swing/package_el.properties | 3 +- .../eteks/sweethome3d/swing/package_es.properties | 7 +- .../eteks/sweethome3d/swing/package_fr.properties | 7 +- .../eteks/sweethome3d/swing/package_hu.properties | 5 +- .../eteks/sweethome3d/swing/package_it.properties | 5 +- .../eteks/sweethome3d/swing/package_ja.properties | 7 +- .../eteks/sweethome3d/swing/package_pl.properties | 3 +- .../eteks/sweethome3d/swing/package_pt.properties | 7 +- .../eteks/sweethome3d/swing/package_ru.properties | 1 + .../eteks/sweethome3d/swing/package_sv.properties | 3 +- .../eteks/sweethome3d/swing/package_vi.properties | 5 +- .../sweethome3d/swing/package_zh_CN.properties | 7 +- .../sweethome3d/tools/ExtensionsClassLoader.java | 65 +- .../eteks/sweethome3d/tools/OperatingSystem.java | 65 +- src/com/eteks/sweethome3d/tools/URLContent.java | 23 +- .../sweethome3d/viewcontroller/HomeController.java | 21 +- .../viewcontroller/HomeController3D.java | 33 +- .../sweethome3d/viewcontroller/PlanController.java | 2 +- .../sweethome3d/viewcontroller/package.properties | 2 +- .../viewcontroller/package_ru.properties | 2 +- .../resources/help/bg/addingLevels.html | 4 +- .../resources/help/bg/creatingHome.html | 3 +- .../resources/help/bg/creatingPhotos.html | 4 +- .../resources/help/bg/creatingVideos.html | 4 +- .../resources/help/bg/drawingWalls.html | 7 +- .../resources/help/bg/editing3DView.html | 3 +- .../resources/help/bg/editingCompass.html | 4 +- .../resources/help/bg/editingDimensions.html | 3 +- .../resources/help/bg/editingFurniture.html | 3 +- .../resources/help/bg/editingPreferences.html | 14 +- .../resources/help/bg/editingRooms.html | 3 +- .../resources/help/bg/editingWalls.html | 3 +- .../resources/help/bg/importingBackground.html | 3 +- .../resources/help/bg/printingHome.html | 3 +- .../resources/help/bg/savingHome.html | 8 +- .../viewcontroller/resources/help/bg/tips.html | 3 +- .../resources/help/es/creatingPhotos.html | 8 +- .../resources/help/es/editing3DView.html | 12 +- .../resources/help/es/editingFurniture.html | 47 +- .../resources/help/es/editingPreferences.html | 40 +- .../resources/help/es/editingRooms.html | 22 +- .../resources/help/es/editingWalls.html | 5 +- .../es/images/creatingPhotosAtPointsOfView.png | Bin 0 -> 17984 bytes .../resources/help/es/images/editingMaterials.png | Bin 0 -> 12053 bytes .../resources/help/es/importingFurniture.html | 9 +- .../resources/help/es/savingHome.html | 2 + .../viewcontroller/resources/help/es/tips.html | 63 +- .../viewcontroller/resources/help/fr/index.html | 3 +- .../viewcontroller/resources/help/pl/tocStart.html | 3 +- test/com/eteks/sweethome3d/junit/LevelTest.java | 10 +- .../com/eteks/sweethome3d/junit/OBJWriterTest.java | 9 +- .../eteks/sweethome3d/junit/PhotoCreationTest.java | 5 +- 107 files changed, 1899 insertions(+), 1799 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
