[sweethome3d-textures-editor] 02/04: Merge tag 'upstream/1.4'

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository sweethome3d-textures-editor.

commit 00c213738be723fb15a4bd334180e86677b2849c
Merge: a550e0e 5e8a00a
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Nov 8 02:45:24 2014 +0100

    Merge tag 'upstream/1.4'
    
    Upstream version 1.4

 README.TXT                                            | 10 +++++-----
 build.xml                                             |  4 ++--
 .../swing/ImportTexturesTaskPanel.java                | 19 +++++++++++++++++--
 .../textureslibraryeditor/swing/TexturesPanel.java    |  8 +++-----
 .../textureslibraryeditor/swing/package.properties    |  4 ++--
 .../viewcontroller/DefaultCategories.properties       |  3 +++
 .../viewcontroller/DefaultCategories_bg.properties    |  3 +++
 .../viewcontroller/DefaultCategories_cs.properties    |  3 +++
 .../viewcontroller/DefaultCategories_de.properties    |  5 ++++-
 .../viewcontroller/DefaultCategories_el.properties    |  3 +++
 .../viewcontroller/DefaultCategories_es.properties    |  3 +++
 .../viewcontroller/DefaultCategories_fi.properties    |  3 +++
 .../viewcontroller/DefaultCategories_fr.properties    |  5 ++++-
 .../viewcontroller/DefaultCategories_hu.properties    |  6 +++++-
 .../viewcontroller/DefaultCategories_it.properties    |  3 +++
 .../viewcontroller/DefaultCategories_ja.properties    |  3 +++
 .../viewcontroller/DefaultCategories_nl.properties    |  5 ++++-
 .../viewcontroller/DefaultCategories_pl.properties    |  3 +++
 ....properties => DefaultCategories_pt_PT.properties} | 15 +++++++++------
 .../viewcontroller/DefaultCategories_ru.properties    |  3 +++
 .../viewcontroller/DefaultCategories_sv.properties    |  5 ++++-
 .../viewcontroller/DefaultCategories_tr.properties    |  3 +++
 .../viewcontroller/DefaultCategories_vi.properties    |  5 ++++-
 .../viewcontroller/DefaultCategories_zh_CN.properties |  3 +++
 .../viewcontroller/DefaultCategories_zh_TW.properties |  5 ++++-
 .../viewcontroller/TexturesController.java            | 15 ++++++++-------
 26 files changed, 111 insertions(+), 36 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d-textures-editor.git