Move localizations to new folder, remove lrelease prebuild step.

This commit is contained in:
Martin Rotter 2017-11-07 09:08:08 +01:00
parent b6e5cfeefe
commit 8eb640b6f2
25 changed files with 40 additions and 46 deletions

1
.gitignore vendored
View File

@ -24,3 +24,4 @@
*.autosave
*.user*
resources/localizations/*rssguard*
localization/rssguard*qm

@ -1 +1 @@
Subproject commit ae7084718c41afc01919779e58cd449e0eebd401
Subproject commit 4a01edaec7d67d3b2ae81aeea2a3c876216fbab8

View File

@ -1516,44 +1516,44 @@
<file>skins/vergilius/metadata.xml</file>
<file>skins/vergilius/theme.css</file>
<file>initial_feeds/feeds-en.opml</file>
<file>localizations/rssguard_cs.qm</file>
<file>localizations/rssguard_da.qm</file>
<file>localizations/rssguard_de.qm</file>
<file>localizations/rssguard_en.qm</file>
<file>localizations/rssguard_en_GB.qm</file>
<file>localizations/rssguard_es.qm</file>
<file>localizations/rssguard_fr.qm</file>
<file>localizations/rssguard_he.qm</file>
<file>localizations/rssguard_id.qm</file>
<file>localizations/rssguard_it.qm</file>
<file>localizations/rssguard_ja.qm</file>
<file>localizations/rssguard_lt.qm</file>
<file>localizations/rssguard_nl.qm</file>
<file>localizations/rssguard_pl.qm</file>
<file>localizations/rssguard_pt.qm</file>
<file>localizations/rssguard_sv.qm</file>
<file>localizations/rssguard_zh.qm</file>
<file>../localization/rssguard_cs.qm</file>
<file>../localization/rssguard_da.qm</file>
<file>../localization/rssguard_de.qm</file>
<file>../localization/rssguard_en.qm</file>
<file>../localization/rssguard_en_GB.qm</file>
<file>../localization/rssguard_es.qm</file>
<file>../localization/rssguard_fr.qm</file>
<file>../localization/rssguard_he.qm</file>
<file>../localization/rssguard_id.qm</file>
<file>../localization/rssguard_it.qm</file>
<file>../localization/rssguard_ja.qm</file>
<file>../localization/rssguard_lt.qm</file>
<file>../localization/rssguard_nl.qm</file>
<file>../localization/rssguard_pl.qm</file>
<file>../localization/rssguard_pt.qm</file>
<file>../localization/rssguard_sv.qm</file>
<file>../localization/rssguard_zh.qm</file>
<file>desktop/com.github.rssguard.desktop</file>
<file>desktop/com.github.rssguard.desktop.autostart</file>
<file>localizations/qt_bg.qm</file>
<file>localizations/qt_ca.qm</file>
<file>localizations/qt_cs.qm</file>
<file>localizations/qt_da.qm</file>
<file>localizations/qt_de.qm</file>
<file>localizations/qt_en.qm</file>
<file>localizations/qt_es.qm</file>
<file>localizations/qt_fi.qm</file>
<file>localizations/qt_fr.qm</file>
<file>localizations/qt_gd.qm</file>
<file>localizations/qt_he.qm</file>
<file>localizations/qt_hu.qm</file>
<file>localizations/qt_it.qm</file>
<file>localizations/qt_ja.qm</file>
<file>localizations/qt_ko.qm</file>
<file>localizations/qt_lv.qm</file>
<file>localizations/qt_pl.qm</file>
<file>localizations/qt_ru.qm</file>
<file>localizations/qt_sk.qm</file>
<file>localizations/qt_uk.qm</file>
<file>../localization/qt_bg.qm</file>
<file>../localization/qt_ca.qm</file>
<file>../localization/qt_cs.qm</file>
<file>../localization/qt_da.qm</file>
<file>../localization/qt_de.qm</file>
<file>../localization/qt_en.qm</file>
<file>../localization/qt_es.qm</file>
<file>../localization/qt_fi.qm</file>
<file>../localization/qt_fr.qm</file>
<file>../localization/qt_gd.qm</file>
<file>../localization/qt_he.qm</file>
<file>../localization/qt_hu.qm</file>
<file>../localization/qt_it.qm</file>
<file>../localization/qt_ja.qm</file>
<file>../localization/qt_ko.qm</file>
<file>../localization/qt_lv.qm</file>
<file>../localization/qt_pl.qm</file>
<file>../localization/qt_ru.qm</file>
<file>../localization/qt_sk.qm</file>
<file>../localization/qt_uk.qm</file>
</qresource>
</RCC>

View File

@ -599,18 +599,11 @@ INCLUDEPATH += $$PWD/. \
$$PWD/src/gui/dialogs \
$$PWD/src/dynamic-shortcuts
# Make sure QM translations are gnerated.
lrelease.input = TRANSLATIONS
lrelease.output = $$PWD/resources/localizations/${QMAKE_FILE_BASE}.qm
lrelease.commands = $$LRELEASE_EXECUTABLE -compress ${QMAKE_FILE_IN} -qm $$PWD/resources/localizations/${QMAKE_FILE_BASE}.qm
lrelease.CONFIG += no_link target_predeps
# Create new "make lupdate" target.
lupdate.target = lupdate
lupdate.commands = lupdate $$shell_path($$PWD/rssguard.pro)
QMAKE_EXTRA_TARGETS += lupdate
QMAKE_EXTRA_COMPILERS += lrelease
# Create new "make 7zip" target and "make zip" target.
win32 {

View File

@ -225,7 +225,7 @@
#define APP_ICON_PLAIN_PATH QSL(":/graphics/rssguard_plain.png")
#define APP_SKIN_PATH QSL(":/skins")
#define APP_INITIAL_FEEDS_PATH QSL(":/initial_feeds")
#define APP_LANG_PATH QSL(":/localizations")
#define APP_LANG_PATH QSL(":/localization")
#if defined(Q_OS_LINUX)
#define APP_DESKTOP_SOURCE_ENTRY_FILE "com.github.rssguard.desktop.autostart"