Merge branch 'develop'

Fixes: https://github.com/IJHack/qtpass/issues/81
Fixes: https://github.com/IJHack/qtpass/issues/82

7 files changed, 29 insertions, 11 deletions

diff --git a/localization/localization_nl_NL.qm b/localization/localization_nl_NL.qm
index 83d25523..1c766e4c 100644
--- a/localization/localization_nl_NL.qm
+++ b/localization/localization_nl_NL.qm
diff --git a/localization/localization_nl_NL.ts b/localization/localization_nl_NL.ts
index 5eaa7c72..8e2ef5af 100644
--- a/localization/localization_nl_NL.ts
+++ b/localization/localization_nl_NL.ts
@@ -260,7 +260,7 @@
     <message>
         <location filename="../keygendialog.ui" line="14"/>
         <source>Generate GnuPG keypair</source>
-        <translation>Genereer GnuPG keypair</translation>
+        <translation>Genereer GnuPG sleutelpaar</translation>
     </message>
     <message>
         <location filename="../keygendialog.ui" line="38"/>
@@ -344,7 +344,7 @@ Expire-Date: 0
     <message>
         <location filename="../mainwindow.ui" line="75"/>
         <source>Push</source>
-        <translation></translation>
+        <translation>Uploaden</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="82"/>
@@ -368,7 +368,15 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Please report any &lt;a href=&quot;https://github.com/IJHack/qtpass/issues&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#4183c4;&quot;&gt;issues&lt;/span&gt;&lt;/a&gt; you might have with this software.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://qtpass.org/&quot;&gt;&lt;span style=&quot; font-family:&apos;Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif&apos;; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;Documentation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://github.com/IJHack/qtpass&quot;&gt;&lt;span style=&quot; font-family:&apos;Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif&apos;; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;Source code&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;.Helvetica Neue DeskInterface&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif&apos;; font-weight:600; color:#333333;&quot;&gt;QtPass&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif&apos;; color:#333333;&quot;&gt; is een GUI voor &lt;/span&gt;&lt;a href=&quot;http://www.passwordstore.org/&quot;&gt;&lt;span style=&quot; font-family:&apos;Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif&apos;; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;pass&lt;/span&gt;&lt;/a&gt;, de standaard unix password manager.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Meld alstublieft eventuele &lt;a href=&quot;https://github.com/IJHack/qtpass/issues&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#4183c4;&quot;&gt;issues&lt;/span&gt;&lt;/a&gt; die u ondervindt in het gebruik.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://qtpass.org/&quot;&gt;&lt;span style=&quot; font-family:&apos;Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif&apos;; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;Documentatie&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://github.com/IJHack/qtpass&quot;&gt;&lt;span style=&quot; font-family:&apos;Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif&apos;; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;Broncode&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="23"/>
@@ -383,7 +391,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mainwindow.ui" line="147"/>
         <source>X</source>
-        <translation></translation>
+        <translation>Wissen</translation>
     </message>
     <message>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -670,7 +678,7 @@ Rode inzendingen zijn niet geldig, je zult niet in staat zijn om te coderen voor
     <message>
         <location filename="../usersdialog.ui" line="62"/>
         <source>X</source>
-        <translation></translation>
+        <translation>Wissen</translation>
     </message>
     <message>
         <location filename="../usersdialog.ui" line="69"/>
diff --git a/localization/localization_zh_CN.qm b/localization/localization_zh_CN.qm
index ee96be39..4a8c78b6 100644
--- a/localization/localization_zh_CN.qm
+++ b/localization/localization_zh_CN.qm
diff --git a/localization/localization_zh_CN.ts b/localization/localization_zh_CN.ts
index 9c303923..f4e62176 100644
--- a/localization/localization_zh_CN.ts
+++ b/localization/localization_zh_CN.ts
@@ -210,7 +210,7 @@
     <message>
         <location filename="../dialog.cpp" line="511"/>
         <source>Would you like to create a password-store at %1?</source>
-        <translation>您需要在哪里创建密码路径？</translation>
+        <translation>您需要里创建密码路径%1?</translation>
     </message>
     <message>
         <location filename="../dialog.cpp" line="520"/>
@@ -220,7 +220,7 @@
     <message>
         <location filename="../dialog.cpp" line="521"/>
         <source>The folder %1 doesn&apos;t seem to be a password store or is not yet initialised.</source>
-        <translation>文件夹未找到或未初始化</translation>
+        <translation>文件夹未%1找到或未初始化</translation>
     </message>
 </context>
 <context>
diff --git a/main.cpp b/main.cpp
index 5af83749..82e706cc 100644
--- a/main.cpp
+++ b/main.cpp
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
     //Setup and load translator for localization
     QTranslator translator;
     QString locale = QLocale::system().name();
-    //locale = "zh_CN";
+    //locale = "nl_NL";
     translator.load(QString(":localization/localization_") + locale + QString(".qm"));
     app.installTranslator(&translator);
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ff504121..6b74e90d 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -938,7 +938,7 @@ void MainWindow::setPassword(QString file, bool overwrite, bool isNew = false)
             QString path = file;
             path.replace(QRegExp("\\.gpg$"), "");
             path.replace(QRegExp("^" + passStore), "");
-            executeWrapper(gitExecutable, "commit \"" + file + "\" -m \"" + (overwrite ? "Edit" : "Add") + " for " + path + " using QtPass\"");
+            executeWrapper(gitExecutable, "commit \"" + file + "\" -m \"" + (overwrite ? "Edit" : "Add") + " for " + path + " using QtPass.\"");
         }
     }
 }
@@ -985,6 +985,7 @@ void MainWindow::on_deleteButton_clicked()
         } else {
             if (useGit) {
                 executeWrapper(gitExecutable, "rm -f \"" + file + '"');
+                executeWrapper(gitExecutable, "commit \"" + file + "\" -m \" Remove for " + getFile(ui->treeView->currentIndex(), true) + " using QtPass.\"");
             } else {
                 QFile(file).remove();
             }
@@ -1189,7 +1190,7 @@ void MainWindow::on_usersButton_clicked()
         }
         QString path = gpgIdFile;
         path.replace(QRegExp("\\.gpg$"), "");
-        executeWrapper(gitExecutable, "commit \"" + gpgIdFile + "\" -m \"Added "+ path + " using QtPass\"");
+        executeWrapper(gitExecutable, "commit \"" + gpgIdFile + "\" -m \"Added "+ path + " using QtPass.\"");
     }
 }
 
diff --git a/usersdialog.cpp b/usersdialog.cpp
index ed826fa0..ffc4d996 100644
--- a/usersdialog.cpp
+++ b/usersdialog.cpp
@@ -63,10 +63,19 @@ void UsersDialog::populateList(const QString &filter)
                 item->setCheckState(user.enabled ? Qt::Checked : Qt::Unchecked);
                 item->setData(Qt::UserRole, QVariant::fromValue(&user));
                 if (user.have_secret) {
+                    //item->setForeground(QColor(32, 74, 135));
                     item->setForeground(Qt::blue);
+                    QFont font;
+                    font.setFamily(font.defaultFamily());
+                    font.setBold(true);
+                    item->setFont(font);
                 } else if (user.validity == '-') {
-                    item->setBackground(Qt::red);
+                    item->setBackground(QColor(164, 0, 0));
+                    item->setForeground(Qt::white);
+                } else if (user.expiry.toTime_t() > 0 && user.expiry.daysTo(QDateTime::currentDateTime()) > 0) {
+                    item->setForeground(QColor(164, 0, 0));
                 }
+
                 ui->listWidget->addItem(item);
             }
         }