From 8eb640b6f2e140e7c5a1adbe5532cf3662d850b5 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 7 Nov 2017 09:08:08 +0100 Subject: [PATCH] Move localizations to new folder, remove lrelease prebuild step. --- .gitignore | 1 + .../localizations => localization}/qt_bg.qm | Bin .../localizations => localization}/qt_ca.qm | Bin .../localizations => localization}/qt_cs.qm | Bin .../localizations => localization}/qt_da.qm | Bin .../localizations => localization}/qt_de.qm | Bin .../localizations => localization}/qt_en.qm | Bin .../localizations => localization}/qt_es.qm | Bin .../localizations => localization}/qt_fi.qm | Bin .../localizations => localization}/qt_fr.qm | Bin .../localizations => localization}/qt_gd.qm | Bin .../localizations => localization}/qt_he.qm | Bin .../localizations => localization}/qt_hu.qm | Bin .../localizations => localization}/qt_it.qm | Bin .../localizations => localization}/qt_ja.qm | Bin .../localizations => localization}/qt_ko.qm | Bin .../localizations => localization}/qt_lv.qm | Bin .../localizations => localization}/qt_pl.qm | Bin .../localizations => localization}/qt_ru.qm | Bin .../localizations => localization}/qt_sk.qm | Bin .../localizations => localization}/qt_uk.qm | Bin resources/binaries | 2 +- resources/rssguard.qrc | 74 +++++++++--------- rssguard.pro | 7 -- src/definitions/definitions.h | 2 +- 25 files changed, 40 insertions(+), 46 deletions(-) rename {resources/localizations => localization}/qt_bg.qm (100%) rename {resources/localizations => localization}/qt_ca.qm (100%) rename {resources/localizations => localization}/qt_cs.qm (100%) rename {resources/localizations => localization}/qt_da.qm (100%) rename {resources/localizations => localization}/qt_de.qm (100%) rename {resources/localizations => localization}/qt_en.qm (100%) rename {resources/localizations => localization}/qt_es.qm (100%) rename {resources/localizations => localization}/qt_fi.qm (100%) rename {resources/localizations => localization}/qt_fr.qm (100%) rename {resources/localizations => localization}/qt_gd.qm (100%) rename {resources/localizations => localization}/qt_he.qm (100%) rename {resources/localizations => localization}/qt_hu.qm (100%) rename {resources/localizations => localization}/qt_it.qm (100%) rename {resources/localizations => localization}/qt_ja.qm (100%) rename {resources/localizations => localization}/qt_ko.qm (100%) rename {resources/localizations => localization}/qt_lv.qm (100%) rename {resources/localizations => localization}/qt_pl.qm (100%) rename {resources/localizations => localization}/qt_ru.qm (100%) rename {resources/localizations => localization}/qt_sk.qm (100%) rename {resources/localizations => localization}/qt_uk.qm (100%) diff --git a/.gitignore b/.gitignore index 6efc1eea7..12e1d3544 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ *.autosave *.user* resources/localizations/*rssguard* +localization/rssguard*qm \ No newline at end of file diff --git a/resources/localizations/qt_bg.qm b/localization/qt_bg.qm similarity index 100% rename from resources/localizations/qt_bg.qm rename to localization/qt_bg.qm diff --git a/resources/localizations/qt_ca.qm b/localization/qt_ca.qm similarity index 100% rename from resources/localizations/qt_ca.qm rename to localization/qt_ca.qm diff --git a/resources/localizations/qt_cs.qm b/localization/qt_cs.qm similarity index 100% rename from resources/localizations/qt_cs.qm rename to localization/qt_cs.qm diff --git a/resources/localizations/qt_da.qm b/localization/qt_da.qm similarity index 100% rename from resources/localizations/qt_da.qm rename to localization/qt_da.qm diff --git a/resources/localizations/qt_de.qm b/localization/qt_de.qm similarity index 100% rename from resources/localizations/qt_de.qm rename to localization/qt_de.qm diff --git a/resources/localizations/qt_en.qm b/localization/qt_en.qm similarity index 100% rename from resources/localizations/qt_en.qm rename to localization/qt_en.qm diff --git a/resources/localizations/qt_es.qm b/localization/qt_es.qm similarity index 100% rename from resources/localizations/qt_es.qm rename to localization/qt_es.qm diff --git a/resources/localizations/qt_fi.qm b/localization/qt_fi.qm similarity index 100% rename from resources/localizations/qt_fi.qm rename to localization/qt_fi.qm diff --git a/resources/localizations/qt_fr.qm b/localization/qt_fr.qm similarity index 100% rename from resources/localizations/qt_fr.qm rename to localization/qt_fr.qm diff --git a/resources/localizations/qt_gd.qm b/localization/qt_gd.qm similarity index 100% rename from resources/localizations/qt_gd.qm rename to localization/qt_gd.qm diff --git a/resources/localizations/qt_he.qm b/localization/qt_he.qm similarity index 100% rename from resources/localizations/qt_he.qm rename to localization/qt_he.qm diff --git a/resources/localizations/qt_hu.qm b/localization/qt_hu.qm similarity index 100% rename from resources/localizations/qt_hu.qm rename to localization/qt_hu.qm diff --git a/resources/localizations/qt_it.qm b/localization/qt_it.qm similarity index 100% rename from resources/localizations/qt_it.qm rename to localization/qt_it.qm diff --git a/resources/localizations/qt_ja.qm b/localization/qt_ja.qm similarity index 100% rename from resources/localizations/qt_ja.qm rename to localization/qt_ja.qm diff --git a/resources/localizations/qt_ko.qm b/localization/qt_ko.qm similarity index 100% rename from resources/localizations/qt_ko.qm rename to localization/qt_ko.qm diff --git a/resources/localizations/qt_lv.qm b/localization/qt_lv.qm similarity index 100% rename from resources/localizations/qt_lv.qm rename to localization/qt_lv.qm diff --git a/resources/localizations/qt_pl.qm b/localization/qt_pl.qm similarity index 100% rename from resources/localizations/qt_pl.qm rename to localization/qt_pl.qm diff --git a/resources/localizations/qt_ru.qm b/localization/qt_ru.qm similarity index 100% rename from resources/localizations/qt_ru.qm rename to localization/qt_ru.qm diff --git a/resources/localizations/qt_sk.qm b/localization/qt_sk.qm similarity index 100% rename from resources/localizations/qt_sk.qm rename to localization/qt_sk.qm diff --git a/resources/localizations/qt_uk.qm b/localization/qt_uk.qm similarity index 100% rename from resources/localizations/qt_uk.qm rename to localization/qt_uk.qm diff --git a/resources/binaries b/resources/binaries index ae7084718..4a01edaec 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit ae7084718c41afc01919779e58cd449e0eebd401 +Subproject commit 4a01edaec7d67d3b2ae81aeea2a3c876216fbab8 diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc index ebe1079a2..85f4fd45c 100755 --- a/resources/rssguard.qrc +++ b/resources/rssguard.qrc @@ -1516,44 +1516,44 @@ skins/vergilius/metadata.xml skins/vergilius/theme.css initial_feeds/feeds-en.opml - localizations/rssguard_cs.qm - localizations/rssguard_da.qm - localizations/rssguard_de.qm - localizations/rssguard_en.qm - localizations/rssguard_en_GB.qm - localizations/rssguard_es.qm - localizations/rssguard_fr.qm - localizations/rssguard_he.qm - localizations/rssguard_id.qm - localizations/rssguard_it.qm - localizations/rssguard_ja.qm - localizations/rssguard_lt.qm - localizations/rssguard_nl.qm - localizations/rssguard_pl.qm - localizations/rssguard_pt.qm - localizations/rssguard_sv.qm - localizations/rssguard_zh.qm + ../localization/rssguard_cs.qm + ../localization/rssguard_da.qm + ../localization/rssguard_de.qm + ../localization/rssguard_en.qm + ../localization/rssguard_en_GB.qm + ../localization/rssguard_es.qm + ../localization/rssguard_fr.qm + ../localization/rssguard_he.qm + ../localization/rssguard_id.qm + ../localization/rssguard_it.qm + ../localization/rssguard_ja.qm + ../localization/rssguard_lt.qm + ../localization/rssguard_nl.qm + ../localization/rssguard_pl.qm + ../localization/rssguard_pt.qm + ../localization/rssguard_sv.qm + ../localization/rssguard_zh.qm desktop/com.github.rssguard.desktop desktop/com.github.rssguard.desktop.autostart - localizations/qt_bg.qm - localizations/qt_ca.qm - localizations/qt_cs.qm - localizations/qt_da.qm - localizations/qt_de.qm - localizations/qt_en.qm - localizations/qt_es.qm - localizations/qt_fi.qm - localizations/qt_fr.qm - localizations/qt_gd.qm - localizations/qt_he.qm - localizations/qt_hu.qm - localizations/qt_it.qm - localizations/qt_ja.qm - localizations/qt_ko.qm - localizations/qt_lv.qm - localizations/qt_pl.qm - localizations/qt_ru.qm - localizations/qt_sk.qm - localizations/qt_uk.qm + ../localization/qt_bg.qm + ../localization/qt_ca.qm + ../localization/qt_cs.qm + ../localization/qt_da.qm + ../localization/qt_de.qm + ../localization/qt_en.qm + ../localization/qt_es.qm + ../localization/qt_fi.qm + ../localization/qt_fr.qm + ../localization/qt_gd.qm + ../localization/qt_he.qm + ../localization/qt_hu.qm + ../localization/qt_it.qm + ../localization/qt_ja.qm + ../localization/qt_ko.qm + ../localization/qt_lv.qm + ../localization/qt_pl.qm + ../localization/qt_ru.qm + ../localization/qt_sk.qm + ../localization/qt_uk.qm diff --git a/rssguard.pro b/rssguard.pro index dab7897d1..919dd0989 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -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 { diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h index b0beba7e2..332c51d9d 100755 --- a/src/definitions/definitions.h +++ b/src/definitions/definitions.h @@ -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"