diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2020-01-07 13:33:35 +0100 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2020-01-07 13:33:35 +0100 |
| commit | 4adbce9101e4b2b46116f4f04a36ff8524ce8654 (patch) | |
| tree | 0da5eba3aa8e14ab3f5a4d38be56714d95fc1558 | |
| parent | ccecb45cf630214799ee1ee92859267b4da63268 (diff) | |
| parent | e06f8d41de7a8715916f7ac39032be24f9943c68 (diff) | |
Merge branch 'master' of github.com:IJHack/QtPass
34 files changed, 54 insertions, 108 deletions
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index e6c3a004..3feddfcf 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Install Qt - uses: jurplel/install-qt-action@v1 + uses: jurplel/install-qt-action@v2 - name: Install Linux packages run: sudo apt update && sudo apt install -y --no-install-recommends libgl1-mesa-dev - name: qmake 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/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index 7cf0c283..dbb01ab6 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -846,7 +846,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translatorcomment>Flips interface</translatorcomment> <translation>RTL</translation> diff --git a/localization/localization_ca.ts b/localization/localization_ca.ts index 36824bdb..7f36471c 100644 --- a/localization/localization_ca.ts +++ b/localization/localization_ca.ts @@ -1078,7 +1078,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts index 94abf68d..087d2793 100644 --- a/localization/localization_cs_CZ.ts +++ b/localization/localization_cs_CZ.ts @@ -1030,7 +1030,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 6ce5078b..f3c3b292 100644 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -1023,7 +1023,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index 590ff2d1..da25e791 100644 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts @@ -1018,7 +1018,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_el_GR.ts b/localization/localization_el_GR.ts index e53d2ca7..8f966a29 100644 --- a/localization/localization_el_GR.ts +++ b/localization/localization_el_GR.ts @@ -868,7 +868,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_en_GB.ts b/localization/localization_en_GB.ts index ae5ce273..5b30a757 100644 --- a/localization/localization_en_GB.ts +++ b/localization/localization_en_GB.ts @@ -1075,7 +1075,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_en_US.ts b/localization/localization_en_US.ts index efe31841..40db768a 100644 --- a/localization/localization_en_US.ts +++ b/localization/localization_en_US.ts @@ -1075,7 +1075,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_es_ES.ts b/localization/localization_es_ES.ts index e7fefe84..053a6bab 100644 --- a/localization/localization_es_ES.ts +++ b/localization/localization_es_ES.ts @@ -974,7 +974,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_fr_BE.ts b/localization/localization_fr_BE.ts index e6c4ed44..b5175d12 100644 --- a/localization/localization_fr_BE.ts +++ b/localization/localization_fr_BE.ts @@ -1038,7 +1038,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_fr_FR.ts b/localization/localization_fr_FR.ts index e2ee73d7..37709a7f 100644 --- a/localization/localization_fr_FR.ts +++ b/localization/localization_fr_FR.ts @@ -1038,7 +1038,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_fr_LU.ts b/localization/localization_fr_LU.ts index 84730ca8..2c5c4ce7 100644 --- a/localization/localization_fr_LU.ts +++ b/localization/localization_fr_LU.ts @@ -1038,7 +1038,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_gl_ES.ts b/localization/localization_gl_ES.ts index 7ec50ad5..17ffba6d 100644 --- a/localization/localization_gl_ES.ts +++ b/localization/localization_gl_ES.ts @@ -993,7 +993,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_he_IL.ts b/localization/localization_he_IL.ts index fd2754b9..43ddb1b2 100644 --- a/localization/localization_he_IL.ts +++ b/localization/localization_he_IL.ts @@ -846,7 +846,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translatorcomment>Flips interface</translatorcomment> <translation>RTL</translation> diff --git a/localization/localization_hu_HU.ts b/localization/localization_hu_HU.ts index 6e853595..589de351 100644 --- a/localization/localization_hu_HU.ts +++ b/localization/localization_hu_HU.ts @@ -949,7 +949,7 @@ Lejárat-dátum: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_it_IT.ts b/localization/localization_it_IT.ts index a84017b9..9ef8fc4a 100644 --- a/localization/localization_it_IT.ts +++ b/localization/localization_it_IT.ts @@ -1089,7 +1089,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_lb_LU.ts b/localization/localization_lb_LU.ts index 18624ddc..d6f6bf04 100644 --- a/localization/localization_lb_LU.ts +++ b/localization/localization_lb_LU.ts @@ -868,7 +868,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_nb_NO.ts b/localization/localization_nb_NO.ts index 86e29fc6..022b8522 100644 --- a/localization/localization_nb_NO.ts +++ b/localization/localization_nb_NO.ts @@ -846,7 +846,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>VTH</translation> </message> diff --git a/localization/localization_nl_BE.ts b/localization/localization_nl_BE.ts index b62971af..ba416a27 100644 --- a/localization/localization_nl_BE.ts +++ b/localization/localization_nl_BE.ts @@ -1089,7 +1089,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_nl_NL.ts b/localization/localization_nl_NL.ts index 85545a35..74856e14 100644 --- a/localization/localization_nl_NL.ts +++ b/localization/localization_nl_NL.ts @@ -1089,7 +1089,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_pl_PL.ts b/localization/localization_pl_PL.ts index 35d7b476..dfc66884 100644 --- a/localization/localization_pl_PL.ts +++ b/localization/localization_pl_PL.ts @@ -850,7 +850,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_pt_PT.ts b/localization/localization_pt_PT.ts index 26dc4797..4332eba9 100644 --- a/localization/localization_pt_PT.ts +++ b/localization/localization_pt_PT.ts @@ -1020,7 +1020,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_ru_RU.ts b/localization/localization_ru_RU.ts index 06daadd5..3234d878 100644 --- a/localization/localization_ru_RU.ts +++ b/localization/localization_ru_RU.ts @@ -1025,7 +1025,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> diff --git a/localization/localization_sq_AL.ts b/localization/localization_sq_AL.ts index e9865bb8..f9bdd4ca 100644 --- a/localization/localization_sq_AL.ts +++ b/localization/localization_sq_AL.ts @@ -878,7 +878,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translatorcomment>Kjo është për të mbajtur ndërfaqen nga e majta në të djathtë.</translatorcomment> <translation>LTR</translation> diff --git a/localization/localization_sv_SE.ts b/localization/localization_sv_SE.ts index 4554256c..261108c3 100644 --- a/localization/localization_sv_SE.ts +++ b/localization/localization_sv_SE.ts @@ -972,7 +972,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation></translation> </message> diff --git a/localization/localization_tr_TR.ts b/localization/localization_tr_TR.ts index 65013773..6beea35d 100644 --- a/localization/localization_tr_TR.ts +++ b/localization/localization_tr_TR.ts @@ -868,7 +868,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation></translation> </message> diff --git a/localization/localization_zh_CN.ts b/localization/localization_zh_CN.ts index aaddc43c..b03ccc19 100644 --- a/localization/localization_zh_CN.ts +++ b/localization/localization_zh_CN.ts @@ -1037,7 +1037,7 @@ Expire-Date: 0 <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="87"/> + <location filename="../main/main.cpp" line="88"/> <source>LTR</source> <translation>LTR</translation> </message> 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"); @@ -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/configdialog.cpp b/src/configdialog.cpp index ba2a6f34..544af1ff 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -567,9 +567,7 @@ bool ConfigDialog::isPassOtpAvailable() { #elif defined(__APPLE__) return false; #else - QFileInfo file("/usr/lib/password-store/extensions/otp.bash"); - - return file.exists(); + return true; #endif } 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 |