diff options
author | Anne Jan Brouwer <brouwer@annejan.com> | 2019-10-24 11:09:16 +0200 |
---|---|---|
committer | Anne Jan Brouwer <brouwer@annejan.com> | 2019-10-24 11:09:16 +0200 |
commit | bfff658b1804a450524e42049969f763653dcc94 (patch) | |
tree | 3497f54315d1b73310bec5fef16c53905af57f03 | |
parent | 89e99ba6a748189827d2944a9a65468ea0f77abe (diff) | |
parent | eb48855e2c66e1eae6c549263418c27ac5a51e63 (diff) |
Merge branch 'master' into CMake
36 files changed, 8318 insertions, 1005 deletions
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 94026dcb..e6c3a004 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1,6 +1,6 @@ name: C/C++ CI -on: [push] +on: [push, pull_request] jobs: build: @@ -11,9 +11,11 @@ jobs: - uses: actions/checkout@v1 - name: Install Qt uses: jurplel/install-qt-action@v1 + - name: Install Linux packages + run: sudo apt update && sudo apt install -y --no-install-recommends libgl1-mesa-dev - name: qmake run: qmake - name: make run: make - name: make check - run: make check + run: make check TESTARGS="--platform offscreen" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2840d4f0..8dbec927 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,17 +7,24 @@ **Fixed bugs:** - Will not run on Windows 10 1903 b18362.418 [\#486](https://github.com/IJHack/QtPass/issues/486) -- Strange behavior when clearing filter [\#402](https://github.com/IJHack/QtPass/issues/402) **Closed issues:** +- Translations need updating and checking [\#488](https://github.com/IJHack/QtPass/issues/488) - How to let QtPass use the real "pass" on windows [\#458](https://github.com/IJHack/QtPass/issues/458) - Fresh install of Antergos with Deepin - High DPI scaling is not working [\#417](https://github.com/IJHack/QtPass/issues/417) +- Strange behavior when clearing filter [\#402](https://github.com/IJHack/QtPass/issues/402) - Tray icon remains after quitting program [\#401](https://github.com/IJHack/QtPass/issues/401) - QtPass doesn't work will pass in WSL [\#375](https://github.com/IJHack/QtPass/issues/375) - UI is blurry on HiDPI screens on MacOS \(retina\) since 1.2.x [\#355](https://github.com/IJHack/QtPass/issues/355) - Config dialog's Password Generation field got crowded between 1.1.3 and 1.1.6 [\#278](https://github.com/IJHack/QtPass/issues/278) +**Merged pull requests:** + +- Spelling: Git, GPG, PWGen, etc. [\#492](https://github.com/IJHack/QtPass/pull/492) ([comradekingu](https://github.com/comradekingu)) +- Don't use a deprecated method [\#491](https://github.com/IJHack/QtPass/pull/491) ([amarsman](https://github.com/amarsman)) +- Issue \#402: 'deselect\(\)' on clearing filter [\#490](https://github.com/IJHack/QtPass/pull/490) ([petr-nehez](https://github.com/petr-nehez)) + ## [v1.3.2](https://github.com/IJHack/QtPass/tree/v1.3.2) (2019-10-09) [Full Changelog](https://github.com/IJHack/QtPass/compare/v1.3.1...v1.3.2) @@ -70,6 +77,7 @@ - Restore directories-first order of passwords tree view on non-Mac platforms [\#475](https://github.com/IJHack/QtPass/pull/475) ([maciejsszmigiero](https://github.com/maciejsszmigiero)) - Add missing finishedShow\(\) signal connection in PasswordDialog constructor \(fixes the "Edit password" function\) [\#473](https://github.com/IJHack/QtPass/pull/473) ([maciejsszmigiero](https://github.com/maciejsszmigiero)) - Sorted profiles dropdown as in \#404 [\#472](https://github.com/IJHack/QtPass/pull/472) ([Noettore](https://github.com/Noettore)) +- Add support for passwords and directories renaming as requested in \#463 [\#469](https://github.com/IJHack/QtPass/pull/469) ([Noettore](https://github.com/Noettore)) - Fix missing app ID and icon on Wayland. [\#468](https://github.com/IJHack/QtPass/pull/468) ([lightbulbjim](https://github.com/lightbulbjim)) ## [v1.3.0](https://github.com/IJHack/QtPass/tree/v1.3.0) (2019-08-20) @@ -111,7 +119,6 @@ **Merged pull requests:** -- Add support for passwords and directories renaming as requested in \#463 [\#469](https://github.com/IJHack/QtPass/pull/469) ([Noettore](https://github.com/Noettore)) - 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)) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d19bc79..267839b9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,16 +8,28 @@ Thank you for wanting to contribute to making QtPass awesome. This document is still in a very early stage and needs a lot more work. +## Pull Request Process + +1. Ensure install or build dependencies and artefacts are not commmitted. +2. When adding big new features or changes to the build system, update the [README.md](README.md) to reflect those. +3. Make sure you update all of the CI configs if need be. These are ran on every Pull Request. +3. Increase the version numbers in relevant files when applicable. + The versioning scheme we use is [SemVer](http://semver.org/). +4. You may merge the Pull Request in once you have the sign-off of one other developer, or if you + do not have permission to do that, you may request a reviewer to merge it for you. + ## Translations * Add you language to the `qtpass.pro` file under TRANSLATIONS and in the `resources.qrc` file. -* Next run the command `lupdate qtpass.pro` which will create the localization files. +* 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` Qt Linguist has very nice in-context translation options [for translators](https://doc.qt.io/qt-5/linguist-translators.html) +You can do online translations via [Weblate](https://hosted.weblate.org/projects/qtpass/qtpass/) + ## IRC For questions or brainstorming about features please join #ijhack on freenode. @@ -25,3 +37,8 @@ For questions or brainstorming about features please join #ijhack on freenode. ## Gitter Or if you prefer to use [gitter](https://gitter.im/IJHack/qtpass) + +## License + +QtPass is released under the GNU GPL v3.0 license. +http://www.gnu.org/licenses/gpl-3.0.html diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index 6049fc97..f6f4b593 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -4,360 +4,456 @@ <context> <name>ConfigDialog</name> <message> + <location filename="../src/configdialog.ui" line="20"/> <source>Configuration</source> - <translation type="unfinished"></translation> + <translation>إعدادات</translation> </message> <message> + <location filename="../src/configdialog.ui" line="42"/> <source>Settings</source> - <translation type="unfinished"></translation> + <translation>الإعدادات</translation> </message> <message> + <location filename="../src/configdialog.ui" line="68"/> <source>Clipboard behaviour:</source> - <translation type="unfinished"></translation> + <translation>سلوك الحافظة:</translation> </message> <message> + <location filename="../src/configdialog.ui" line="87"/> <source>Use primary selection</source> - <translation type="unfinished"></translation> + <translation>استخدام الاختيار الأساسي</translation> </message> <message> + <location filename="../src/configdialog.ui" line="94"/> <source>Autoclear after:</source> - <translation type="unfinished"></translation> + <translation>اوتولير بعد:</translation> </message> <message> + <location filename="../src/configdialog.ui" line="111"/> + <location filename="../src/configdialog.ui" line="194"/> <source>Seconds</source> - <translation type="unfinished"></translation> + <translation>ثواني</translation> </message> <message> + <location filename="../src/configdialog.ui" line="143"/> <source>Content panel behaviour:</source> - <translation type="unfinished"></translation> + <translation>سلوك لوحة المحتوى:</translation> </message> <message> + <location filename="../src/configdialog.ui" line="155"/> <source>Hide content</source> - <translation type="unfinished"></translation> + <translation>إخفاء المحتوى</translation> </message> <message> + <location filename="../src/configdialog.ui" line="162"/> <source>Hide password</source> - <translation type="unfinished"></translation> + <translation>اخفاء كلمة المرور</translation> </message> <message> + <location filename="../src/configdialog.ui" line="171"/> <source>Autoclear panel after:</source> - <translation type="unfinished"></translation> + <translation>لوحه اوتوكلير بعد:</translation> </message> <message> + <location filename="../src/configdialog.ui" line="228"/> <source>Password Generation:</source> - <translation type="unfinished"></translation> + <translation>إنشاء كلمه المرور:</translation> </message> <message> + <location filename="../src/configdialog.ui" line="240"/> <source>Password Length:</source> - <translation type="unfinished"></translation> + <translation>طول كلمة المرور:</translation> </message> <message> + <location filename="../src/configdialog.ui" line="274"/> <source>Characters</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="302"/> <source>Use characters:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="320"/> <source>Select character set for password generation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="324"/> <source>All Characters</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="329"/> <source>Alphabetical</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="334"/> <source>Alphanumerical</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="339"/> <source>Custom</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="377"/> <source>ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789</source> <translation type="unfinished"></translation> </message> <message> - <source>Use pwgen</source> + <location filename="../src/configdialog.ui" line="915"/> + <source>Current path</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="401"/> <source>Exclude capital letters</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="411"/> <source>Include special symbols </source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="418"/> <source>Generate easy to memorize but less secure passwords</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="425"/> <source>Exclude numbers</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="444"/> <source>Git:</source> <translation type="unfinished"></translation> </message> <message> - <source>Use git</source> - <translation type="unfinished"></translation> - </message> - <message> + <location filename="../src/configdialog.ui" line="470"/> <source>Automatically add .gpg-id files</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="477"/> <source>Automatically push</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="484"/> <source>Automatically pull</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="516"/> <source>Extensions:</source> <translation type="unfinished"></translation> </message> <message> - <source>Use qrencode</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Use pass otp extension</source> - <translation type="unfinished"></translation> - </message> - <message> + <location filename="../src/configdialog.ui" line="561"/> <source>System:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="573"/> <source>Use TrayIcon</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="580"/> <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="587"/> <source>Hide on close</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="594"/> <source>Always on top</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="619"/> <source>Programs</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="637"/> <source>Select password storage program:</source> <translation type="unfinished"></translation> </message> <message> - <source>Nati&ve git/gpg</source> - <translation type="unfinished"></translation> - </message> - <message> + <location filename="../src/configdialog.ui" line="653"/> <source>&Use pass</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="677"/> <source>Native</source> <translation type="unfinished"></translation> </message> <message> - <source>git</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>...</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>gpg</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>pwgen</source> - <translation type="unfinished"></translation> - </message> - <message> + <location filename="../src/configdialog.ui" line="737"/> <source>Pass</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="748"/> <source>pass</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="767"/> <source><html><head/><body><p><a href="https://www.passwordstore.org/"><span style=" text-decoration: underline;">www.passwordstore.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="798"/> <source>Autodetect</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="821"/> <source>Profiles</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="870"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="875"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="885"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="900"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <source>Current password-store</source> - <translation type="unfinished"></translation> - </message> - <message> + <location filename="../src/configdialog.ui" line="935"/> <source>Template</source> <translation type="unfinished"></translation> </message> <message> - <source>Templates add extra fields in the password generation dialogue and in the password view.</source> - <translation type="unfinished"></translation> - </message> - <message> + <location filename="../src/configdialog.ui" line="965"/> <source>Use template</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="972"/> <source>Show all lines beginning with a word followed by a colon as fields in password fields, not only the listed ones</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.ui" line="975"/> <source>Show all fields templated</source> <translation type="unfinished"></translation> </message> <message> - <source>login -url -email</source> - <translation type="unfinished"></translation> - </message> - <message> + <location filename="../src/configdialog.ui" line="1002"/> <source><a href="https://QtPass.org/">QtPass</a> version </source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="47"/> <source>System tray is not available</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="72"/> <source>Pass OTP extension needs to be installed</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="77"/> <source>qrencode needs to be installed</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="101"/> <source>No Clipboard</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="102"/> <source>Always copy to clipboard</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="103"/> <source>On-demand copy to clipboard</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="522"/> <source>No profile selected</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="523"/> <source>No profile selected to delete</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="588"/> <source>GnuPG not found</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="591"/> <source>Please install GnuPG on your system.<br>Install <strong>Ubuntu</strong> from the Microsoft Store to get it.<br>If you already did so, make sure you started it once and<br>click "Autodetect" in the next dialog.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="596"/> <source>Please install GnuPG on your system.<br>Install <strong>Ubuntu</strong> from the Microsoft Store<br>or <a href="https://www.gnupg.org/download/#sec-1-2">download</a> it from GnuPG.org</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="602"/> <source>Please install GnuPG on your system.<br>Install <strong>gpg</strong> using your favorite package manager<br>or <a href="https://www.gnupg.org/download/#sec-1-2">download</a> it from GnuPG.org</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="629"/> <source>Create password-store?</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="630"/> <source>Would you like to create a password-store at %1?</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="649"/> <source>Password store not initialised</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/configdialog.cpp" line="650"/> <source>The folder %1 doesn't seem to be a password store or is not yet initialised.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/configdialog.ui" line="394"/> + <source>Use PWGen</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="456"/> + <source>Use Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="525"/> + <source>Use QRencode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="539"/> + <source>Use pass-otp extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="646"/> + <source>Nati&ve Git/GPG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="683"/> + <source>Git</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="693"/> + <location filename="../src/configdialog.ui" line="700"/> + <location filename="../src/configdialog.ui" line="727"/> + <location filename="../src/configdialog.ui" line="758"/> + <location filename="../src/configdialog.ui" line="922"/> + <source>…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="707"/> + <source>GPG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="720"/> + <source>PWGen</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="956"/> + <source>Templates add extra fields in the password generation dialogue, and in the password view.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/configdialog.ui" line="987"/> + |