summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--main/main.cpp1
-rw-r--r--qtpass.pro28
-rw-r--r--resources.qrc22
-rw-r--r--src/src.pro47
5 files changed, 25 insertions, 77 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 267839b9..c5ae9933 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,8 +20,8 @@ This document is still in a very early stage and needs a lot more work.
## Translations
-* Add you language to the `qtpass.pro` file
- under TRANSLATIONS and in the `resources.qrc` file.
+* Add you language to the `src/src.pro` file
+ under TRANSLATIONS.
* Next run the command `qmake` which will create and update the localization files.
* Edit your file with (let's imagine your language is sv_SE (Swedish)
`linguist localization/localization_sv_SE.ts`
diff --git a/main/main.cpp b/main/main.cpp
index c5688537..97d7611d 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -69,6 +69,7 @@ int main(int argc, char *argv[]) {
#endif
Q_INIT_RESOURCE(resources);
+ Q_INIT_RESOURCE(qmake_qmake_qm_files); // qmake names the file
QCoreApplication::setOrganizationName("IJHack");
QCoreApplication::setOrganizationDomain("ijhack.org");
diff --git a/qtpass.pro b/qtpass.pro
index c1b3da24..438b09e8 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -56,32 +56,4 @@ CONFIG(coverage) {
QMAKE_DISTCLEAN += -r src/$$OBJECTS_DIR/lcov/
}
-TRANSLATIONS += localization/localization_ca.ts \
- localization/localization_nl_NL.ts \
- localization/localization_nl_BE.ts \
- localization/localization_de_DE.ts \
- localization/localization_es_ES.ts \
- localization/localization_gl_ES.ts \
- localization/localization_hu_HU.ts \
- localization/localization_sv_SE.ts \
- localization/localization_pl_PL.ts \
- localization/localization_ru_RU.ts \
- localization/localization_he_IL.ts \
- localization/localization_zh_CN.ts \
- localization/localization_ar_MA.ts \
- localization/localization_fr_FR.ts \
- localization/localization_fr_BE.ts \
- localization/localization_fr_LU.ts \
- localization/localization_de_LU.ts \
- localization/localization_lb_LU.ts \
- localization/localization_en_GB.ts \
- localization/localization_en_US.ts \
- localization/localization_el_GR.ts \
- localization/localization_cs_CZ.ts \
- localization/localization_it_IT.ts \
- localization/localization_sq_AL.ts \
- localization/localization_pt_PT.ts \
- localization/localization_tr_TR.ts \
- localization/localization_nb_NO.ts
-
system($$QMAKE_LUPDATE -locations absolute ./src ./main -ts localization/*.ts)
diff --git a/resources.qrc b/resources.qrc
index f173a433..6166c119 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -4,28 +4,6 @@
<file>artwork/icon.ico</file>
<file>artwork/icon.png</file>
<file>artwork/icon.svg</file>
- <file>localization/localization_ar_MA.qm</file>
- <file>localization/localization_ca.qm</file>
- <file>localization/localization_de_DE.qm</file>
- <file>localization/localization_es_ES.qm</file>
- <file>localization/localization_gl_ES.qm</file>
- <file>localization/localization_hu_HU.qm</file>
- <file>localization/localization_nl_BE.qm</file>
- <file>localization/localization_nl_NL.qm</file>
- <file>localization/localization_sv_SE.qm</file>
- <file>localization/localization_pl_PL.qm</file>
- <file>localization/localization_ru_RU.qm</file>
- <file>localization/localization_zh_CN.qm</file>
- <file>localization/localization_he_IL.qm</file>
- <file>localization/localization_cs_CZ.qm</file>
- <file>localization/localization_fr_FR.qm</file>
- <file>localization/localization_en_GB.qm</file>
- <file>localization/localization_en_US.qm</file>
- <file>localization/localization_pt_PT.qm</file>
- <file>localization/localization_it_IT.qm</file>
- <file>localization/localization_sq_AL.qm</file>
- <file>localization/localization_nb_NO.qm</file>
- <file>localization/localization_tr_TR.qm</file>
</qresource>
<qresource prefix="/icons">
<file alias="document-new.svg">icons/document-new.svg</file>
diff --git a/src/src.pro b/src/src.pro
index 2b3a951e..524ab25a 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -7,33 +7,36 @@ TARGET = qtpass
CONFIG += c++11 staticlib
CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
-TRANSLATIONS += ../localization/localization_nl_NL.ts \
- ../localization/localization_ca.ts \
+TRANSLATIONS += ../localization/localization_ar_MA.ts \
+ ../localization/localization_ca.ts \
+ ../localization/localization_cs_CZ.ts \
../localization/localization_de_DE.ts \
+ ../localization/localization_de_LU.ts \
+ ../localization/localization_el_GR.ts \
+ ../localization/localization_en_GB.ts \
+ ../localization/localization_en_US.ts \
../localization/localization_es_ES.ts \
+ ../localization/localization_fr_BE.ts \
+ ../localization/localization_fr_FR.ts \
+ ../localization/localization_fr_LU.ts \
../localization/localization_gl_ES.ts \
+ ../localization/localization_he_IL.ts \
../localization/localization_hu_HU.ts \
- ../localization/localization_sv_SE.ts \
+ ../localization/localization_it_IT.ts \
+ ../localization/localization_lb_LU.ts \
+ ../localization/localization_nb_NO.ts \
+ ../localization/localization_nl_BE.ts \
+ ../localization/localization_nl_NL.ts \
../localization/localization_pl_PL.ts \
+ ../localization/localization_pt_PT.ts \
../localization/localization_ru_RU.ts \
- ../localization/localization_he_IL.ts \
- ../localization/localization_zh_CN.ts \
- ../localization/localization_ar_MA.ts \
- ../localization/localization_fr_FR.ts \
- ../localization/localization_fr_BE.ts \
- ../localization/localization_nl_BE.ts \
- ../localization/localization_fr_LU.ts \
- ../localization/localization_de_LU.ts \
- ../localization/localization_lb_LU.ts \
- ../localization/localization_en_GB.ts \
- ../localization/localization_en_US.ts \
- ../localization/localization_el_GR.ts \
- ../localization/localization_cs_CZ.ts \
- ../localization/localization_it_IT.ts \
../localization/localization_sq_AL.ts \
- ../localization/localization_pt_PT.ts \
+ ../localization/localization_sv_SE.ts \
../localization/localization_tr_TR.ts \
- ../localization/localization_nb_NO.ts
+ ../localization/localization_zh_CN.ts \
+
+CONFIG += lrelease embed_translations
+QM_FILES_RESOURCE_PREFIX=/localization
SOURCES += mainwindow.cpp \
configdialog.cpp \
@@ -88,12 +91,6 @@ FORMS += mainwindow.ui \
keygendialog.ui \
passworddialog.ui
-updateqm.input = TRANSLATIONS
-updateqm.output = ../localization/${QMAKE_FILE_BASE}.qm
-updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ../localization/${QMAKE_FILE_BASE}.qm
-updateqm.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += updateqm
-
!nosingleapp {
SOURCES += singleapplication.cpp
HEADERS += singleapplication.h