summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2019-09-28 17:11:22 +0200
committerAnne Jan Brouwer <brouwer@annejan.com>2019-09-28 17:11:22 +0200
commit00373f156d6428b8bf1c9898c83b3ab2b8236c33 (patch)
tree6fd09b04d2bb81869c659b96ff038901acd004c9
parentcdafb56f989a5a89095f555f43274f6e03497e0a (diff)
CHANGELOG and localization_nl cleanup
-rw-r--r--CHANGELOG.md14
-rw-r--r--localization/localization_nl_BE.ts12
-rw-r--r--localization/localization_nl_NL.ts12
3 files changed, 20 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9744f70d..a9764c0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@
**Merged pull requests:**
+- Add missing overrides [\#478](https://github.com/IJHack/QtPass/pull/478) ([amarsman](https://github.com/amarsman))
+- Main window entry details improvements [\#477](https://github.com/IJHack/QtPass/pull/477) ([maciejsszmigiero](https://github.com/maciejsszmigiero))
- Fix html links color and NL translation building error [\#476](https://github.com/IJHack/QtPass/pull/476) ([a-andreyev](https://github.com/a-andreyev))
- 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))
@@ -465,10 +467,15 @@
## [v1.0.5](https://github.com/IJHack/QtPass/tree/v1.0.5) (2015-11-18)
[Full Changelog](https://github.com/IJHack/QtPass/compare/v1.0.4...v1.0.5)
+**Implemented enhancements:**
+
+- Password file named 'git' returns error [\#105](https://github.com/IJHack/QtPass/issues/105)
+
**Fixed bugs:**
- using pwgen adds carriage-return [\#115](https://github.com/IJHack/QtPass/issues/115)
- Enhancement: color code git results [\#111](https://github.com/IJHack/QtPass/issues/111)
+- Password file named 'git' returns error [\#105](https://github.com/IJHack/QtPass/issues/105)
**Merged pull requests:**
@@ -487,11 +494,6 @@
**Implemented enhancements:**
- Get PREFIX variable from environment [\#106](https://github.com/IJHack/QtPass/issues/106)
-- Password file named 'git' returns error [\#105](https://github.com/IJHack/QtPass/issues/105)
-
-**Fixed bugs:**
-
-- Password file named 'git' returns error [\#105](https://github.com/IJHack/QtPass/issues/105)
**Merged pull requests:**
@@ -597,7 +599,6 @@
**Merged pull requests:**
-- Many deadlocks and other nasty bug fixes [\#64](https://github.com/IJHack/QtPass/pull/64) ([annejan](https://github.com/annejan))
- Mention qt5-default package in README [\#62](https://github.com/IJHack/QtPass/pull/62) ([lorrin](https://github.com/lorrin))
- Some hacks I needed for portable gpg4win release [\#54](https://github.com/IJHack/QtPass/pull/54) ([rdoeffinger](https://github.com/rdoeffinger))
@@ -657,6 +658,7 @@
**Merged pull requests:**
+- Many deadlocks and other nasty bug fixes [\#64](https://github.com/IJHack/QtPass/pull/64) ([annejan](https://github.com/annejan))
- SingleApplication per user and leading newline removed from output [\#44](https://github.com/IJHack/QtPass/pull/44) ([annejan](https://github.com/annejan))
- User filtering and many fixes [\#42](https://github.com/IJHack/QtPass/pull/42) ([annejan](https://github.com/annejan))
- Re-enable Windows WebDAV support. [\#37](https://github.com/IJHack/QtPass/pull/37) ([rdoeffinger](https://github.com/rdoeffinger))
diff --git a/localization/localization_nl_BE.ts b/localization/localization_nl_BE.ts
index 39ee40f1..9f878134 100644
--- a/localization/localization_nl_BE.ts
+++ b/localization/localization_nl_BE.ts
@@ -576,7 +576,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <location filename="../src/mainwindow.cpp" line="+899"/>
+ <location filename="../src/mainwindow.cpp" line="+897"/>
<source>Add password</source>
<translation type="unfinished"></translation>
</message>
@@ -660,12 +660,12 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainwindow.cpp" line="-712"/>
+ <location filename="../src/mainwindow.cpp" line="-710"/>
<source>Welcome to QtPass %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+87"/>
<location line="+12"/>
<source>Updating password-store</source>
<translation type="unfinished"></translation>
@@ -677,7 +677,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+4"/>
- <location line="+701"/>
+ <location line="+703"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
@@ -840,12 +840,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>QtPass</name>
<message>
- <location filename="../src/qtpass.cpp" line="+140"/>
+ <location filename="../src/qtpass.cpp" line="+143"/>
<source>Generating GPG key pair</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+52"/>
<source>Failed to connect WebDAV:
</source>
<translation type="unfinished"></translation>
diff --git a/localization/localization_nl_NL.ts b/localization/localization_nl_NL.ts
index 54ca792d..4c561014 100644
--- a/localization/localization_nl_NL.ts
+++ b/localization/localization_nl_NL.ts
@@ -576,7 +576,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <location filename="../src/mainwindow.cpp" line="+899"/>
+ <location filename="../src/mainwindow.cpp" line="+897"/>
<source>Add password</source>
<translation type="unfinished"></translation>
</message>
@@ -660,12 +660,12 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainwindow.cpp" line="-712"/>
+ <location filename="../src/mainwindow.cpp" line="-710"/>
<source>Welcome to QtPass %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+87"/>
<location line="+12"/>
<source>Updating password-store</source>
<translation type="unfinished"></translation>
@@ -677,7 +677,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+4"/>
- <location line="+701"/>
+ <location line="+703"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
@@ -840,12 +840,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>QtPass</name>
<message>
- <location filename="../src/qtpass.cpp" line="+140"/>
+ <location filename="../src/qtpass.cpp" line="+143"/>
<source>Generating GPG key pair</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+52"/>
<source>Failed to connect WebDAV:
</source>
<translation type="unfinished"></translation>