diff options
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | localization/localization_it_IT.ts | 14 | ||||
| -rw-r--r-- | qtpass.pro | 2 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/pass.h | 5 |
5 files changed, 17 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 30fd22b2..9cd535b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Implemented enhancements:** +- Localization makes commits absolutely unreadable [\#405](https://github.com/IJHack/QtPass/issues/405) - Add otp \(two factor authentication\) support [\#327](https://github.com/IJHack/QtPass/issues/327) **Fixed bugs:** @@ -21,6 +22,10 @@ - Compiling for Linux Mint 18 Ubuntu 16 [\#357](https://github.com/IJHack/QtPass/issues/357) - \[OS X\] Password input dialog suddenly stopped popping up [\#191](https://github.com/IJHack/QtPass/issues/191) +**Merged pull requests:** + +- \#390 make box cheched when opening a folder users panel [\#403](https://github.com/IJHack/QtPass/pull/403) ([kenji21](https://github.com/kenji21)) + ## [v1.2.3](https://github.com/IJHack/QtPass/tree/v1.2.3) (2018-06-04) [Full Changelog](https://github.com/IJHack/QtPass/compare/v1.2.2...v1.2.3) diff --git a/localization/localization_it_IT.ts b/localization/localization_it_IT.ts index e2dd2603..b5ee8dd0 100644 --- a/localization/localization_it_IT.ts +++ b/localization/localization_it_IT.ts @@ -167,7 +167,7 @@ <message> <location filename="../src/configdialog.ui" line="528"/> <source>Use pass otp extension</source> - <translation>Usa l'estensione Pass OTP</translation> + <translation>Usa estensione pass OTP</translation> </message> <message> <location filename="../src/configdialog.ui" line="550"/> @@ -610,11 +610,11 @@ p, li { white-space: pre-wrap; } <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lato';">QtPass</span> è una GUI per <a href="https://www.passwordstore.org/"><span style=" text-decoration: underline; color:#0000ff;">pass</span></a>, the standard unix password manager.<br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Si prega di segnalare qualsiasi <a href="https://github.com/IJHack/qtpass/issues"><span style=" text-decoration: underline; color:#0000ff;">problema</span></a> riscontrato con il software.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://qtpass.org/"><span style=" text-decoration: underline; color:#0000ff;">Documentazione</span></a></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/IJHack/qtpass"><span style=" text-decoration: underline; color:#0000ff;">Codice sorgente</span></a></p></body></html></translation> +</style></head><body style=" font-family:'Noto Sans'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; font-weight:600; color:#333333;">QtPass</span><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;"> è un'interfaccia per </span><a href="https://www.passwordstore.org/"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4; background-color:transparent;">pass</span></a><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;">, the standard unix password manager.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;"><br />Ti preghiamo di segnalare qualsiasi </span><a href="https://github.com/IJHack/qtpass/issues"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4;">problema</span></a><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;"> che potresti incontrare con questo software.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://qtpass.org/"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4; background-color:transparent;">Documentazione</span></a></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/IJHack/qtpass"><span style=" font-size:12pt; text-decoration: underline; color:#4183c4;">Codice sorgente</span></a></p></body></html></translation> </message> <message> <location filename="../src/mainwindow.ui" line="369"/> @@ -1018,7 +1018,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../src/qtpass.cpp" line="99"/> <source>QProcess::UnknownError</source> - <translation>QProcess::WriteError</translation> + <translation>QProcess::UnknownError</translation> </message> <message> <location filename="../src/qtpass.cpp" line="226"/> @@ -83,6 +83,6 @@ TRANSLATIONS += localization/localization_nl_NL.ts \ localization/localization_it_IT.ts \ localization/localization_pt_PT.ts -system($$QMAKE_LUPDATE $$_PRO_FILE_) +system($$QMAKE_LUPDATE -locations relative -no-ui-lines $$_PRO_FILE_) system($$QMAKE_LRELEASE $$_PRO_FILE_) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5c0c239c..2ebcb6d0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -856,7 +856,7 @@ void MainWindow::onUsers() { users.append(i); } } - } + } UsersDialog d(this); d.setUsers(&users); if (!d.exec()) { @@ -59,8 +59,9 @@ public: void updateEnv(); static QStringList getRecipientList(QString for_file); // TODO(bezet): getRecipientString is useless, refactor - static QStringList getRecipientString(QString for_file, QString separator = " ", - int *count = NULL); + static QStringList getRecipientString(QString for_file, + QString separator = " ", + int *count = NULL); protected: void executeWrapper(PROCESS id, const QString &app, const QStringList &args, |