aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/res/layout/key_server_query.xml2
-rw-r--r--OpenPGP-Keychain/res/raw/help_changelog.html13
2 files changed, 14 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/res/layout/key_server_query.xml b/OpenPGP-Keychain/res/layout/key_server_query.xml
index ab76d3aed..5ba90de47 100644
--- a/OpenPGP-Keychain/res/layout/key_server_query.xml
+++ b/OpenPGP-Keychain/res/layout/key_server_query.xml
@@ -19,7 +19,7 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:hint="@string/hint_secret_keys"
+ android:hint="@string/hint_public_keys"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:singleLine="true" />
diff --git a/OpenPGP-Keychain/res/raw/help_changelog.html b/OpenPGP-Keychain/res/raw/help_changelog.html
index a3e124577..cfe2c8e34 100644
--- a/OpenPGP-Keychain/res/raw/help_changelog.html
+++ b/OpenPGP-Keychain/res/raw/help_changelog.html
@@ -5,6 +5,19 @@ And don't add newlines before or after p tags because of transifex -->
<head>
</head>
<body>
+<h2>2.2</h2>
+<ul>
+<li>New design with navigation drawer</li>
+<li>New public key list design</li>
+<li>New public key view</li>
+<li>Bug fixes for importing of keys</li>
+<li>Key cross-certification (thanks to Ash Hughes)</li>
+<li>Handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
+<li>First version with new languages (thanks to the contributors on Transifex)</li>
+<li>Sharing of keys via QR Codes fixed and improved</li>
+<li>Package signature verification for API</li>
+</ul>
+
<h2>2.1.1</h2>
<ul>
<li>API Updates, preparation for k9mail integration</li>