Hyunin Song 0a5d056bdb Merge branch 'stable-1.2' ...

# Conflicts:
        #       .travis/osx..install.sh
        #       .travis/osx..script.sh
        #       cmake/linux/package_linux.sh.in
        #       data/locale/en.ts
        #       src/core/CMakeLists.txt
        #       src/core/ProjectRenderer.cpp
        #       src/gui/FileBrowser.cpp

2018-03-07 23:54:28 +09:00

..

update_locales

update i18n and add i18n maint script

2017-12-30 01:21:00 -07:00