Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify

2 files changed, 58 insertions, 17 deletions

diff --git a/OpenKeychain/src/main/res/layout/add_key_activity.xml b/OpenKeychain/src/main/res/layout/add_keys_activity.xml
index 624ef9ed4..b058c8268 100644
--- a/OpenKeychain/src/main/res/layout/add_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/add_keys_activity.xml
@@ -21,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="Secure Exchange" />
+            android:text="@string/add_keys_section_secure_exchange" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="My key:"
+                android:text="@string/add_keys_my_key"
                 android:paddingRight="8dp" />
 
             <org.sufficientlysecure.keychain.ui.widget.ExchangeKeySpinner
@@ -61,7 +61,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="0dip"
                 android:layout_height="match_parent"
-                android:text="Start exchange"
+                android:text="@string/add_keys_start_exchange"
                 android:layout_weight="1"
                 android:gravity="center_vertical" />
 
@@ -87,7 +87,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
-            android:text="Secure add" />
+            android:text="@string/add_keys_section_secure_add" />
 
         <TextView
             android:id="@+id/add_keys_qr_code"
@@ -99,12 +99,33 @@
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:clickable="true"
             style="@style/SelectableItem"
-            android:text="QR Code"
+            android:text="@string/add_keys_qr_code"
             android:drawableRight="@drawable/ic_action_qr_code"
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
         <View
+            android:id="@+id/view_key_action_certify_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/add_keys_nfc"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/add_keys_nfc"
+            android:drawableRight="@drawable/ic_action_nfc"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
             android:background="?android:attr/listDivider"
@@ -115,7 +136,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
-            android:text="Import (untrusted)" />
+            android:text="@string/add_keys_section_import" />
 
         <TextView
             android:id="@+id/add_keys_search_cloud"
@@ -127,11 +148,17 @@
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:clickable="true"
             style="@style/SelectableItem"
-            android:text="Search cloud"
+            android:text="@string/add_keys_cloud"
             android:drawableRight="@drawable/ic_action_search"
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            android:layout_marginBottom="8dp" />
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 438f976e3..e61f4912a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -261,18 +261,8 @@
     <string name="error_jelly_bean_needed">"You need Android 4.1 to use Android's NFC Beam feature!"</string>
     <string name="error_nfc_needed">"NFC is not available on your device!"</string>
     <string name="error_nothing_import">"No keys found!"</string>
-    <string name="error_query_too_short">"Search query too short. Please refine your query!"</string>
-    <string name="error_searching_keys">"An error occurred when searching for keys."</string>
-    <string name="error_too_many_responses">"Key search query returned too many candidates. Please refine your query!"</string>
-    <string name="error_too_short_or_too_many_responses">"Either no keys or too many have been found. Please improve your query!"</string>
     <string name="error_contacts_key_id_missing">"Retrieving the key ID from contacts failed!"</string>
-
-    <string name="error_import_no_valid_keys">"No valid keys found in File/Clipboard!"</string>
     <string name="error_generic_report_bug">"A generic error occurred, please create a new bug report for OpenKeychain."</string>
-    <plurals name="error_import_non_pgp_part">
-        <item quantity="one">"part of the loaded file is a valid OpenPGP object but not a OpenPGP key"</item>
-        <item quantity="other">"parts of the loaded file are valid OpenPGP objects but not OpenPGP keys"</item>
-    </plurals>
 
     <!-- results shown after decryption/verification -->
     <string name="decrypt_result_invalid_signature">"Invalid signature!"</string>
@@ -284,6 +274,17 @@
     <string name="decrypt_result_decrypted_and_signature_uncertified">"Successfully decrypted and valid signature (uncertified)"</string>
     <string name="decrypt_result_decrypted_and_signature_certified">"Successfully decrypted and valid signature (certified)"</string>
 
+    <!-- Add keys -->
+    <string name="add_keys_section_secure_exchange">"Secure Exchange"</string>
+    <string name="add_keys_section_secure_add">"Secure Add"</string>
+    <string name="add_keys_section_import">"Import (untrusted)"</string>
+    <string name="add_keys_my_key">"My key:"</string>
+    <string name="add_keys_start_exchange">"Start exchange"</string>
+    <string name="add_keys_qr_code">"Scan QR Code"</string>
+    <string name="add_keys_nfc">"Receive via NFC"</string>
+    <string name="add_keys_cloud">"Search cloud"</string>
+
+
     <!-- progress dialogs, usually ending in '…' -->
     <string name="progress_done">"Done."</string>
     <string name="progress_cancel">"Cancel"</string>
@@ -916,6 +917,19 @@
 
     <string name="msg_acc_saved">"Account saved"</string>
 
+    <string name="msg_download_success">"Downloaded successfully!"</string>
+    <string name="msg_download_no_valid_keys">"No valid keys found in File/Clipboard!"</string>
+    <string name="msg_download_no_pgp_parts">"TODO: plurals!"</string>
+    <plurals name="error_import_non_pgp_part">
+        <item quantity="one">"part of the loaded file is a valid OpenPGP object but not a OpenPGP key"</item>
+        <item quantity="other">"parts of the loaded file are valid OpenPGP objects but not OpenPGP keys"</item>
+    </plurals>
+    <string name="msg_download_query_too_short">"Search query too short. Please refine your query!"</string>
+    <string name="msg_download_too_many_responses">"Key search query returned too many candidates. Please refine your query!"</string>
+    <string name="msg_download_query_too_short_or_too_many_responses">"Either no keys or too many have been found. Please improve your query!"</string>
+
+    <string name="msg_download_query_failed">"An error occurred when searching for keys."</string>
+
     <!-- PassphraseCache -->
     <string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string>
     <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passphrases"</string>