From dc382a2ddd40a2797ad3458a50afb5e88ec27b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 7 May 2014 09:05:28 +0200
Subject: [PATCH] Clarify language

---
 .../sufficientlysecure/keychain/ui/ViewKeyActivity.java   | 2 +-
 .../keychain/ui/ViewKeyShareFragment.java                 | 2 +-
 OpenKeychain/src/main/res/values-de/strings.xml           | 4 ++--
 OpenKeychain/src/main/res/values/strings.xml              | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 56aaba57b..7c920294c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -140,7 +140,7 @@ public class ViewKeyActivity extends ActionBarActivity implements
         Bundle keyDetailsBundle = new Bundle();
         keyDetailsBundle.putParcelable(ViewKeyKeysFragment.ARG_DATA_URI, dataUri);
         mTabsAdapter.addTab(ViewKeyKeysFragment.class,
-                keyDetailsBundle, getString(R.string.key_view_tab_keys_details));
+                keyDetailsBundle, getString(R.string.key_view_tab_keys));
 
         Bundle certBundle = new Bundle();
         certBundle.putParcelable(ViewKeyCertsFragment.ARG_DATA_URI, dataUri);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java
index aacf30429..fce402136 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java
@@ -187,7 +187,7 @@ public class ViewKeyShareFragment extends Fragment implements
                 if (fingerprintOnly) {
                     title = getResources().getString(R.string.title_share_fingerprint_with);
                 } else {
-                    title = getResources().getString(R.string.title_share_key_with);
+                    title = getResources().getString(R.string.title_share_key);
                 }
                 startActivity(Intent.createChooser(sendIntent, title));
             }
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 6b71380ad..3a771d44f 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -14,7 +14,7 @@
   <string name="title_change_passphrase">Passphrase ändern</string>
   <string name="title_set_passphrase">Passwort setzen</string>
   <string name="title_share_fingerprint_with">Teile Fingerabdruck über…</string>
-  <string name="title_share_key_with">Teile Schlüssel über...</string>
+  <string name="title_share_key">Teile Schlüssel über...</string>
   <string name="title_share_file">Datei teilen mit…</string>
   <string name="title_encrypt_to_file">In eine Datei verschlüsseln</string>
   <string name="title_decrypt_to_file">In eine Datei entschlüsseln</string>
@@ -417,7 +417,7 @@
   <string name="key_view_action_share_nfc">über NFC (Geräte Rückseite an Rückseite halten)</string>
   <string name="key_view_tab_main">Informationen</string>
   <string name="key_view_tab_share">Teilen</string>
-  <string name="key_view_tab_keys_details">Schlüsseldetails</string>
+  <string name="key_view_tab_keys">Schlüsseldetails</string>
   <string name="key_view_tab_certs">Beglaubigungen</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Schlüssel</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2109476c3..c59f4a05b 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="title_set_passphrase">Set Passphrase</string>
     <string name="title_share_with">Share with…</string>
     <string name="title_share_fingerprint_with">Share fingerprint with…</string>
-    <string name="title_share_key_with">Share key with…</string>
+    <string name="title_share_key">Whole key</string>
     <string name="title_share_file">Share file with…</string>
     <string name="title_encrypt_to_file">Encrypt To File</string>
     <string name="title_decrypt_to_file">Decrypt To File</string>
@@ -459,11 +459,11 @@
     <string name="key_view_action_edit">Edit key</string>
     <string name="key_view_action_encrypt">Encrypt with this key</string>
     <string name="key_view_action_certify">Certify identities</string>
-    <string name="key_view_action_share_with">with…</string>
-    <string name="key_view_action_share_nfc">over NFC by holding the devices back to back</string>
+    <string name="key_view_action_share_with">Share with…</string>
+    <string name="key_view_action_share_nfc">Share over NFC by holding the devices back to back</string>
     <string name="key_view_tab_main">Main Info</string>
     <string name="key_view_tab_share">Share</string>
-    <string name="key_view_tab_keys_details">Key Details</string>
+    <string name="key_view_tab_keys">Subkeys</string>
     <string name="key_view_tab_certs">Certificates</string>
 
     <!-- Navigation Drawer -->