diff options
51 files changed, 281 insertions, 278 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f410aca..85f0923f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,8 @@ **Merged pull requests:** +- Use key fingerprint as ID instead of “long” ID. [\#452](https://github.com/IJHack/QtPass/pull/452) ([Natureshadow](https://github.com/Natureshadow)) +- Typo: dialouge to dialogue. [\#444](https://github.com/IJHack/QtPass/pull/444) ([georgjaehnig](https://github.com/georgjaehnig)) - Scripts and logic specific to Windows Store releases [\#439](https://github.com/IJHack/QtPass/pull/439) ([rdoeffinger](https://github.com/rdoeffinger)) - For config check, check that the selected binary is available. [\#438](https://github.com/IJHack/QtPass/pull/438) ([rdoeffinger](https://github.com/rdoeffinger)) - Fix character encoding issues for non-UTF-8 locales. [\#435](https://github.com/IJHack/QtPass/pull/435) ([rdoeffinger](https://github.com/rdoeffinger)) @@ -43,6 +43,8 @@ fi * On some esotheric systems it might be necessary to create a symbolic link `/usr/bin/pinentry` to your pinentry application of choice eg: `ln -s /usr/bin/pinentry-qt5 /usr/bin/pinentry` +* On MacOs `pinentry-program /usr/local/bin/pinentry-mac` works after installing `pinentry-mac` from homebrew. + ### I have an other issue with gpg @@ -68,7 +68,7 @@ Windows At runtime the only real dependency is `gpg2` but to make the most of it, you'll need `git` and `pass` too. Your GPG has to be set-up with a graphical pinentry when applicable, same goes for git authentication. -On Mac OS X this currently seems to only work with MacGPG2 from gpgtools or pinentry-mac from homebrew. +On Mac OS X this currently seems to only work best with `pinentry-mac` from homebrew, although gpgtools works too. On most unix systems all you need is: ``` diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index 3298de5d..96500292 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -399,7 +399,7 @@ email</source> <context> <name>ImitatePass</name> <message> - <location filename="../src/imitatepass.cpp" line="+94"/> + <location filename="../src/imitatepass.cpp" line="+95"/> <location line="+203"/> <source>Can not edit</source> <translation type="unfinished"></translation> @@ -655,12 +655,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+4"/> - <location line="+641"/> + <location line="+640"/> <source>Password</source> <translation type="unfinished"></translation> </message> <message> - <location line="-617"/> + <location line="-616"/> <source>OTP Code</source> <translation type="unfinished"></translation> </message> @@ -804,7 +804,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="+83"/> + <location filename="../main/main.cpp" line="+84"/> <source>LTR</source> <translatorcomment>Flips interface</translatorcomment> <translation>RTL</translation> @@ -813,7 +813,7 @@ p, li { white-space: pre-wrap; } <context> <name>QtPass</name> <message> - <location filename="../src/qtpass.cpp" line="+136"/> + <location filename="../src/qtpass.cpp" line="+138"/> <source>Generating GPG key pair</source> <translation type="unfinished"></translation> </message> @@ -894,7 +894,7 @@ p, li { white-space: pre-wrap; } <context> <name>StoreModel</name> <message> - <location filename="../src/storemodel.cpp" line="+246"/> + <location filename="../src/storemodel.cpp" line="+245"/> <source>force overwrite?</source> <translation type="unfinished"></translation> </message> @@ -963,7 +963,7 @@ Red entries are not valid, you will not be able to encrypt to these.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/usersdialog.cpp" line="+24"/> + <location filename="../src/usersdialog.cpp" line="+25"/> <source>Can not get key list</source> <translation type="unfinished"></translation> </message> @@ -978,7 +978,7 @@ Red entries are not valid, you will not be able to encrypt to these.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+94"/> + <location line="+92"/> <source>created</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_ca.ts b/localization/localization_ca.ts index 16394839..0ccb0b23 100644 --- a/localization/localization_ca.ts +++ b/localization/localization_ca.ts @@ -405,7 +405,7 @@ email</translation> <context> <name>ImitatePass</name> <message> - <location filename="../src/imitatepass.cpp" line="+94"/> + <location filename="../src/imitatepass.cpp" line="+95"/> <location line="+203"/> <source>Can not edit</source> <translation>No es pot editar</translation> @@ -748,12 +748,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+4"/> - <location line="+641"/> + <location line="+640"/> <source>Password</source> <translation>Contrasenya</translation> </message> <message> - <location line="-617"/> + <location line="-616"/> <source>OTP Code</source> <translation>Codi OTP</translation> </message> @@ -963,7 +963,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="+83"/> + <location filename="../main/main.cpp" line="+84"/> <source>LTR</source> <translation>LTR</translation> </message> @@ -971,7 +971,7 @@ p, li { white-space: pre-wrap; } <context> <name>QtPass</name> <message> - <location filename="../src/qtpass.cpp" line="+136"/> + <location filename="../src/qtpass.cpp" line="+138"/> <source>Generating GPG key pair</source> <translation type="unfinished">Generació del parell de claus GPG</translation> </message> @@ -1055,7 +1055,7 @@ p, li { white-space: pre-wrap; } <context> <name>StoreModel</name> <message> - <location filename="../src/storemodel.cpp" line="+246"/> + <location filename="../src/storemodel.cpp" line="+245"/> <source>force overwrite?</source> <translation>voleu forçar la sobreescriptura?</translation> </message> @@ -1127,7 +1127,7 @@ Les entrades vermelles no són vàlides, no podreu xifrar.</translation> <translation>Mostra les claus inutilitzables</translation> </message> <message> - <location filename="../src/usersdialog.cpp" line="+24"/> + <location filename="../src/usersdialog.cpp" line="+25"/> <source>Can not get key list</source> <translation type="unfinished">No es pot obtenir la llista de claus</translation> </message> @@ -1142,7 +1142,7 @@ Les entrades vermelles no són vàlides, no podreu xifrar.</translation> <translation type="unfinished">No s'ha trobat la clau a l'anell de claus</translation> </message> <message> - <location line="+94"/> + <location line="+92"/> <source>created</source> <translation>creada</translation> </message> diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts index 836ca5ac..85188cd4 100644 --- a/localization/localization_cs_CZ.ts +++ b/localization/localization_cs_CZ.ts @@ -405,7 +405,7 @@ email</translation> <context> <name>ImitatePass</name> <message> - <location filename="../src/imitatepass.cpp" line="+94"/> + <location filename="../src/imitatepass.cpp" line="+95"/> <location line="+203"/> <source>Can not edit</source> <translation type="unfinished">Nelze upravovat</translation> @@ -730,12 +730,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+4"/> - <location line="+641"/> + <location line="+640"/> <source>Password</source> <translation type="unfinished">Heslo</translation> </message> <message> - <location line="-617"/> + <location line="-616"/> <source>OTP Code</source> <translation type="unfinished"></translation> </message> @@ -941,7 +941,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="+83"/> + <location filename="../main/main.cpp" line="+84"/> <source>LTR</source> <translation>LTR</translation> </message> @@ -949,7 +949,7 @@ p, li { white-space: pre-wrap; } <context> <name>QtPass</name> <message> - <location filename="../src/qtpass.cpp" line="+136"/> + <location filename="../src/qtpass.cpp" line="+138"/> <source>Generating GPG key pair</source> <translation type="unfinished">Generování páru GPG klíčů</translation> </message> @@ -1033,7 +1033,7 @@ p, li { white-space: pre-wrap; } <context> <name>StoreModel</name> <message> - <location filename="../src/storemodel.cpp" line="+246"/> + <location filename="../src/storemodel.cpp" line="+245"/> <source>force overwrite?</source> <translation type="unfinished"></translation> </message> @@ -1105,7 +1105,7 @@ Modře označené záznamy poskytují tajný klíč, vyberte jeden z nich, kter <translation>Zobrazit nepoužitelné klíče</translation> </message> <message> - <location filename="../src/usersdialog.cpp" line="+24"/> + <location filename="../src/usersdialog.cpp" line="+25"/> <source>Can not get key list</source> <translation type="unfinished">Nelze získat seznam klíčů</translation> </message> @@ -1120,7 +1120,7 @@ Modře označené záznamy poskytují tajný klíč, vyberte jeden z nich, kter <translation type="unfinished">Klíč nebyl v klíčence nalezen</translation> </message> <message> - <location line="+94"/> + <location line="+92"/> <source>created</source> <translation>vytvořen</translation> </message> diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 0db653d8..392edecb 100755 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -406,7 +406,7 @@ email</translation> <context> <name>ImitatePass</name> <message> - <location filename="../src/imitatepass.cpp" line="+94"/> + <location filename="../src/imitatepass.cpp" line="+95"/> <location line="+203"/> <source>Can not edit</source> <translation>Ändern nicht möglich</translation> @@ -723,12 +723,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+4"/> - <location line="+641"/> + <location line="+640"/> <source>Password</source> <translation>Passwort</translation> </message> <message> - <location line="-617"/> + <location line="-616"/> <source>OTP Code</source> <translation>OTP-Code</translation> </message> @@ -931,7 +931,7 @@ Neues Passwort-Datei: <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="+83"/> + <location filename="../main/main.cpp" line="+84"/> <source>LTR</source> <translation>LTR</translation> </message> @@ -939,7 +939,7 @@ Neues Passwort-Datei: <context> <name>QtPass</name> <message> - <location filename="../src/qtpass.cpp" line="+136"/> + <location filename="../src/qtpass.cpp" line="+138"/> <source>Generating GPG key pair</source> <translation type="unfinished">GPG Schlüssel-Paar wird generiert</translation> </message> @@ -1020,7 +1020,7 @@ Neues Passwort-Datei: <context> <name>StoreModel</name> <message> - <location filename="../src/storemodel.cpp" line="+246"/> + <location filename="../src/storemodel.cpp" line="+245"/> <source>force overwrite?</source> <translation>Überschreiben erzwingen?</translation> </message> @@ -1092,7 +1092,7 @@ Die roten Einträge sind ungültig / abgelaufen und für Entschlüsselung nicht <translation>unbrauchbare Schlüssel anzeigen</translation> </message> <message> - <location filename="../src/usersdialog.cpp" line="+24"/> + <location filename="../src/usersdialog.cpp" line="+25"/> <source>Can not get key list</source> <translation type="unfinished">Schlüssel-Liste nicht gefunden</translation> </message> @@ -1107,7 +1107,7 @@ Die roten Einträge sind ungültig / abgelaufen und für Entschlüsselung nicht <translation type="unfinished">Schlüssel nicht in Keyring gefunden</translation> </message> <message> - <location line="+94"/> + <location line="+92"/> <source>created</source> <translation>erstellt</translation> </message> diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index 79d1383d..be5c790a 100755 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts @@ -406,7 +406,7 @@ email</translation> <context> <name>ImitatePass</name> <message> - <location filename="../src/imitatepass.cpp" line="+94"/> + <location filename="../src/imitatepass.cpp" line="+95"/> <location line="+203"/> <source>Can not edit</source> <translation>Ändern nicht möglich</translation> @@ -722,12 +722,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+4"/> - <location line="+641"/> + <location line="+640"/> <source>Password</source> <translation>Passwort</translation> </message> <message> - <location line="-617"/> + <location line="-616"/> <source>OTP Code</source> <translation type="unfinished"></translation> </message> @@ -926,7 +926,7 @@ Neues Passwort-Datei: <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="+83"/> + <location filename="../main/main.cpp" line="+84"/> <source>LTR</source> <translation>LTR</translation> </message> @@ -934,7 +934,7 @@ Neues Passwort-Datei: <context> <name>QtPass</name> <message> - <location filename="../src/qtpass.cpp" line="+136"/> + <location filename="../src/qtpass.cpp" line="+138"/> <source>Generating GPG key pair</source> <translation type="unfinished">GPG Schlüssel-Paar wird generiert</translation> </message> @@ -1015,7 +1015,7 @@ Neues Passwort-Datei: <context> <name>StoreModel</name> <message> - <location filename="../src/storemodel.cpp" line="+246"/> + <location filename="../src/storemodel.cpp" line="+245"/> <source>force overwrite?</source> <translation type="unfinished"></translation> </message> @@ -1087,7 +1087,7 @@ Die roten Einträge sind ungültig / abgelaufen und für Entschlüsselung nicht <translation>unbrauchbare Schlüssel anzeigen</translation> </message> <message> - <location filename="../src/usersdialog.cpp" line="+24"/> + <location filename="../src/usersdialog.cpp" line="+25"/> <source>Can not get key list</source> <translation type="unfinished">Schlüssel-Liste nicht gefunden</translation> </message> @@ -1102,7 +1102,7 @@ Die roten Einträge sind ungültig / abgelaufen und für Entschlüsselung nicht <translation type="unfinished">Schlüssel nicht in Keyring gefunden</translation> </message> <message> - <location line="+94"/> + <location line="+92"/> <source>created</source> <translation>erstellt</translation> </message> diff --git a/localization/localization_el_GR.ts b/localization/localization_el_GR.ts index 262f82bc..2f123ee4 100644 --- a/localization/localization_el_GR.ts +++ b/localization/localization_el_GR.ts @@ -399,7 +399,7 @@ email</source> <context> <name>ImitatePass</name> <message> - <location filename="../src/imitatepass.cpp" line="+94"/> + <location filename="../src/imitatepass.cpp" line="+95"/> <location line="+203"/> <source>Can not edit</source> <translation type="unfinished"></translation> @@ -550,12 +550,12 @@ Expire-Date: 0 </message> <message> <location line="+4"/> - <location line="+641"/> + <location line="+640"/> <source>Password</source> <translation type="unfinished"></translation> </message> <message> - <location line="-617"/> + <location line="-616"/> <source>OTP Code</source> <translation type="unfinished"></translation> </message> @@ -808,7 +808,7 @@ p, li { white-space: pre-wrap; } <context> <name>QObject</name> <message> - <location filename="../main/main.cpp" line="+83"/> + <location filename="../main/main.cpp" line="+84"/> <source>LTR</source> <translation type="unfinished"></translation> </message> @@ -816,7 +816,7 @@ p, li { white-space: pre-wrap; } <context> <name>QtPass</name> <message> - <location filename="../src/qtpass.cpp" line="+136"/> + <location filename="../src/qtpass.cpp" line="+138"/> <source>Generating GPG key pair</source> <translation type="unfinished"></translation> </message> @@ -897,7 +897,7 @@ p, li { white-space: pre-wrap; } <context> <name>StoreModel</name> <message> - <location filename="../src/storemodel.cpp" line="+246"/> + <location filename="../src/storemodel.cpp" line="+245"/> <source>force overwrite?</source> <translation type="unfinished"></translation> </message> @@ -966,7 +966,7 @@ Red entries are not valid, you will not be able to encrypt to these.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/usersdialog.cpp" line="+24"/> + <location filename="../src/usersdialog.cpp" line="+25"/> <source>Can not get key list</source> <translation type="unfinished"></translation> </message> @@ -981,7 +981,7 @@ Red entries are not valid, you will not be able to encrypt to these.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+94"/> + <location line="+92"/> <source>created</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_en_GB.ts b/localization/localization_en_GB.ts index 9b3a2a91..a86b3c64 100644 --- a/localization/localization_en_GB.ts +++ b/localization/localization_en_GB.ts @@ -405,7 +405,7 @@ email</translation> <context> <name>ImitatePass</name> <message> - <location filename="../src/imitatepass.cpp" line="+94"/> + <location filename="../src/imitatepass.cpp" line="+95"/> <location line="+203"/> <source>Can not edit</source> <translation>Can not edit</translation> @@ -759,12 +759,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+4"/> - <location line="+641"/> + <location line="+640"/> <source>Password</source> <translation>Password</translation> </message> <message> - <location line="-617"/> + <location line="-616"/> <source>OTP Code</source> <translation>OTP Code</translation> </message> @@ -974,7 +974,7 @@ p, li { white-space: pre-wrap; } |