aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-07 11:17:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-07 11:17:58 +0200
commit65fd0de7e100fed42a6b2e52e994d7a0d6371037 (patch)
tree0915459c8b7ecc3e011aa398b6d5037efa840494
parentd4105420f708742fbf5a27807f6cabeb0bb02cd0 (diff)
downloadopen-keychain-65fd0de7e100fed42a6b2e52e994d7a0d6371037.tar.gz
open-keychain-65fd0de7e100fed42a6b2e52e994d7a0d6371037.tar.bz2
open-keychain-65fd0de7e100fed42a6b2e52e994d7a0d6371037.zip
passphrase instead of pass phrase
-rw-r--r--CHANGELOG4
-rw-r--r--OpenKeychain/src/main/res/raw/help_changelog.html4
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index be5ea325c..4c63a7779 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -92,14 +92,14 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
1.0.8
* Basic keyserver support (HKP, please report bugs :))
* App2sd (untested, let me know if there are problems)
-* More choices for pass phrase cache: 1, 2, 4, 8, hours
+* More choices for passphrase cache: 1, 2, 4, 8, hours
* Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
* Bugfixes
* Optimizations
1.0.7
* Clear sign problem with lacking trailing newline fixed
-* More options for pass phrase cache time to live (20, 40, 60 mins)
+* More options for passphrase cache time to live (20, 40, 60 mins)
1.0.6
* Account adding crash on Froyo fixed
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html
index b2c798615..f2455d243 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw/help_changelog.html
@@ -125,7 +125,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
<ul>
<li>Basic keyserver support</li>
<li>App2sd</li>
-<li>More choices for pass phrase cache: 1, 2, 4, 8, hours</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
<li>Bugfixes</li>
<li>Optimizations</li>
@@ -134,7 +134,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
<h2>1.0.7</h2>
<ul>
<li>Fixed problem with signature verification of texts with trailing newline</li>
-<li>More options for pass phrase cache time to live (20, 40, 60 mins)</li>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
</ul>
<h2>1.0.6</h2>