diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-03 15:02:55 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-03 15:02:55 +0200 |
| commit | 2df4ccafb5cab2963bde1f2d54293b6c3579d0f8 (patch) | |
| tree | efb321417634bdd8183dee5577afef2df4efc22e /OpenPGP-Keychain/src/main/res | |
| parent | 11b08c4d985854ded125d5a43e8a13207dee393d (diff) | |
| download | open-keychain-2df4ccafb5cab2963bde1f2d54293b6c3579d0f8.tar.gz open-keychain-2df4ccafb5cab2963bde1f2d54293b6c3579d0f8.tar.bz2 open-keychain-2df4ccafb5cab2963bde1f2d54293b6c3579d0f8.zip | |
Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml | 27 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 2 |
2 files changed, 14 insertions, 15 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml index 16234762c..3e0d35c9b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml @@ -28,20 +28,6 @@ android:src="@drawable/overlay_error" /> </RelativeLayout> - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/lookup_key" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="50dp" - android:padding="4dp" - android:text="@string/btn_lookup_key" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="info" - bootstrapbutton:bb_size="small" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> - <TextView android:id="@+id/mainUserId" android:layout_width="wrap_content" @@ -60,4 +46,17 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:layout_below="@+id/mainUserId" android:layout_toRightOf="@+id/relativeLayout" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/lookup_key" + android:layout_width="wrap_content" + android:layout_height="50dp" + android:padding="4dp" + android:text="@string/btn_lookup_key" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="info" + bootstrapbutton:bb_size="small" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> </RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 54db372ab..b9df68cb3 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -406,7 +406,7 @@ <string name="import_qr_code_start_with_one">Please start with QR Code with ID 1</string> <string name="import_qr_code_wrong">QR Code malformed! Please try again!</string> <string name="import_qr_code_finished">QR Code scanning finished!</string> - <string name="import_qr_code_too_short_fingerprint">Fingerprint contained in this QR Code is too short (< 16 characters)</string> + <string name="import_qr_code_too_short_fingerprint">Fingerprint is too short (< 16 characters)</string> <string name="import_qr_scan_button">Scan QR Code with \'Barcode Scanner\'</string> <string name="import_nfc_text">To receive keys via NFC, the device needs to be unlocked.</string> <string name="import_nfc_help_button">Help</string> |