From 5eb12ef88f93bfadb51ac28e31bcf4935647b827 Mon Sep 17 00:00:00 2001
From: Daniel Hammann <github@honnel.de>
Date: Wed, 12 Mar 2014 21:36:42 +0100
Subject: Squashed commit of the following:

commit 1df4d4a9e047f70f284183185d81070e49097ad3
Author: Daniel Hammann <github@honnel.de>
Date:   Wed Mar 12 21:33:13 2014 +0100

    Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up).
---
 README.md | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4b997c59f..8954bdcda 100644
--- a/README.md
+++ b/README.md
@@ -156,12 +156,21 @@ See http://source.android.com/source/code-style.html
 See http://www.androidpolice.com/2009/11/04/auto-formatting-android-xml-files-with-eclipse/
 
 ### Automated syntax check with CheckStyle
-* Paste the tools/checkstyle.xml file to ~/.AndroidStudioPreview/config/codestyles/ (in Linux/Unix)
-  or  ~/Library/Preferences/AndroidStudioPreview/codestyles (in Mac OSX)
-* Go to Settings (or Preferences in Mac OS X) > Code Style > Java, select OpenPgpChecker, 
-  as well as Code Style > XML and select OpenPgpChecker again.
-* Start code inspection and see the results by selecting Analyze > Inspect Code from Android-Studio
-  or you can directly run checkstyle via cli with .tools/checkstyle. Make sure it's executable first.
+
+####Linux
+1. Paste the `tools/checkstyle.xml` file to `~/.AndroidStudioPreview/config/codestyles/`
+2. Go to Settings > Code Style > Java, select OpenPgpChecker, as well as Code Style > XML and select OpenPgpChecker again.
+3. Start code inspection and see the results by selecting Analyze > Inspect Code from Android-Studio or you can directly run checkstyle via cli with `.tools/checkstyle`. Make sure it's executable first.
+
+####Mac OSX
+1. Paste the `tools/checkstyle.xml` file to `~/Library/Preferences/AndroidStudioPreview/codestyles`
+2. Go to Preferences > Code Style > Java, select OpenPgpChecker, as well as Code Style > XML and select OpenPgpChecker again.
+3. Start code inspection and see the results by selecting Analyze > Inspect Code from Android-Studio or you can directly run checkstyle via cli with `.tools/checkstyle`. Make sure it's executable first.
+
+####Windows
+1. Paste the `tools/checkstyle.xml` file to `C:\Users\<UserName>\.AndroidStudioPreview\config\codestyles`
+2. Go to File > Settings > Code Style > Java, select OpenPgpChecker, as well as Code Style > XML and select OpenPgpChecker again.
+3. Start code inspection and see the results by selecting Analyze > Inspect Code from Android-Studio.
 
 ## Licenses
 OpenPGP Kechain is licensed under GPLv3+.
-- 
cgit v1.2.3


From b39d37f59c5d1633f22a45a37c7dc94d6c37d010 Mon Sep 17 00:00:00 2001
From: Daniel Hammann <github@honnel.de>
Date: Mon, 17 Mar 2014 22:17:05 +0100
Subject: #429 4) In the clicking for a particular contact , two icon in the
 actionbar show the same hint ('Share'). Second icon hint can be 'Keyserver'
 or just only 'server'

---
 OpenPGP-Keychain/src/main/res/menu/key_view.xml  | 2 +-
 OpenPGP-Keychain/src/main/res/values/arrays.xml  | 2 +-
 OpenPGP-Keychain/src/main/res/values/strings.xml | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
index cd84cc91a..105368cbb 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
@@ -52,7 +52,7 @@
         android:id="@+id/menu_key_keyserver"
         android:icon="@drawable/ic_action_import_export"
         app:showAsAction="always"
-        android:title="@string/menu_share">
+        android:title="@string/menu_key_server">
         <menu>
             <item
                 android:id="@+id/menu_key_view_update"
diff --git a/OpenPGP-Keychain/src/main/res/values/arrays.xml b/OpenPGP-Keychain/src/main/res/values/arrays.xml
index 5244de419..c84c2648d 100644
--- a/OpenPGP-Keychain/src/main/res/values/arrays.xml
+++ b/OpenPGP-Keychain/src/main/res/values/arrays.xml
@@ -36,7 +36,7 @@
         <item>@string/key_size_4096</item>
     </string-array>
     <string-array name="import_action_list" translatable="false">
-        <item>@string/menu_key_server</item>
+        <item>@string/menu_import_from_key_server</item>
         <item>@string/menu_import_from_file</item>
         <item>@string/menu_import_from_qr_code</item>
         <item>@string/import_from_clipboard</item>
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 77891d6c7..d6550d63d 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -84,10 +84,11 @@
     <string name="menu_create_key">Create key</string>
     <string name="menu_create_key_expert">Create key (expert)</string>
     <string name="menu_search">Search</string>
-    <string name="menu_key_server">Import from keyserver</string>
+    <string name="menu_import_from_key_server">Keyserver</string>
+    <string name="menu_key_server">Keyserver…</string>
     <string name="menu_update_key">Update from keyserver</string>
     <string name="menu_export_key_to_server">Upload to key server</string>
-    <string name="menu_share">Share</string>
+    <string name="menu_share">Share…</string>
     <string name="menu_share_title_fingerprint">Share fingerprint…</string>
     <string name="menu_share_title">Share whole key…</string>
     <string name="menu_share_default_fingerprint">with…</string>
-- 
cgit v1.2.3