From 382ae968d643b45ccfc4998a7b00d801d8aea37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 24 Sep 2014 02:36:24 +0200
Subject: [PATCH] Fix strings reported by yahoe.001

---
 CHANGELOG                                         | 2 +-
 OpenKeychain/src/main/res/raw/help_changelog.html | 2 +-
 OpenKeychain/src/main/res/values/strings.xml      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e3338db86..0124426bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -104,7 +104,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 2.0
   * Complete redesign
-  * Share public keys via qr codes, nfc beam
+  * Share public keys via QR codes, NFC beam
   * Sign keys
   * Upload keys to server
   * Fixes import issues
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html
index 9c8e83c71..2a47aded9 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw/help_changelog.html
@@ -141,7 +141,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <h2>2.0</h2>
 <ul>
 <li>Complete redesign</li>
-<li>Share public keys via qr codes, nfc beam</li>
+<li>Share public keys via QR codes, NFC beam</li>
 <li>Sign keys</li>
 <li>Upload keys to server</li>
 <li>Fixes import issues</li>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e77106705..d39235984 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -584,7 +584,7 @@
     <string name="msg_ip_master_flags_cexx">"Master flags: certify, encrypt"</string>
     <string name="msg_ip_master_flags_cxsa">"Master flags: certify, sign, authenticate"</string>
     <string name="msg_ip_master_flags_cxsx">"Master flags: certify, sign"</string>
-    <string name="msg_ip_master_flags_cxxa">"Master flags: certify, authentcate"</string>
+    <string name="msg_ip_master_flags_cxxa">"Master flags: certify, authenticate"</string>
     <string name="msg_ip_master_flags_cxxx">"Master flags: certify"</string>
     <string name="msg_ip_master_flags_xesa">"Master flags: encrypt, sign, authenticate"</string>
     <string name="msg_ip_master_flags_xesx">"Master flags: encrypt, sign"</string>
@@ -604,7 +604,7 @@
     <string name="msg_ip_subkey_flags_cexx">"Subkey flags: certify, encrypt"</string>
     <string name="msg_ip_subkey_flags_cxsa">"Subkey flags: certify, sign, authenticate"</string>
     <string name="msg_ip_subkey_flags_cxsx">"Subkey flags: certify, sign"</string>
-    <string name="msg_ip_subkey_flags_cxxa">"Subkey flags: certify, authentcate"</string>
+    <string name="msg_ip_subkey_flags_cxxa">"Subkey flags: certify, authenticate"</string>
     <string name="msg_ip_subkey_flags_cxxx">"Subkey flags: certify"</string>
     <string name="msg_ip_subkey_flags_xesa">"Subkey flags: encrypt, sign, authenticate"</string>
     <string name="msg_ip_subkey_flags_xesx">"Subkey flags: encrypt, sign"</string>