diff options
Diffstat (limited to 'OpenPGP-Keychain/res')
4 files changed, 20 insertions, 7 deletions
diff --git a/OpenPGP-Keychain/res/layout/edit_key_activity.xml b/OpenPGP-Keychain/res/layout/edit_key_activity.xml index f8597b0df..351aec512 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_activity.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_activity.xml @@ -45,7 +45,7 @@ <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/edit_key_btn_change_pass_phrase" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="60dp" android:padding="4dp" android:text="@string/btn_set_passphrase" bootstrapbutton:bb_icon_left="fa-pencil" diff --git a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml index 11bce64ee..ad6bd6779 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml @@ -82,7 +82,7 @@ <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/expiry" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="60dp" android:text="@string/none" bootstrapbutton:bb_type="default" /> </TableRow> diff --git a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml index f3c09a41d..5229e7cf5 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="60dp" android:layout_margin="10dp" - android:text="@string/menu_import_from_qr_code" + android:text="@string/import_qr_scan_button" bootstrapbutton:bb_icon_left="fa-barcode" bootstrapbutton:bb_size="default" bootstrapbutton:bb_type="default" /> @@ -18,13 +18,19 @@ <TextView android:id="@+id/import_qrcode_text" android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:visibility="gone" /> <ProgressBar android:id="@+id/import_qrcode_progress" style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:progress="0" /> + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:progress="0" + android:visibility="gone" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index 72709965a..746a13015 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -322,9 +322,16 @@ <string name="import_import">Import selected keys</string> <string name="import_sign_and_upload">Import, Sign, and upload selected keys</string> <string name="import_from_clipboard">Import from Clipboard</string> - <string name="import_qr_code_missing">Missing QR Codes: %1$s</string> + + <plurals name="import_qr_code_missing"> + <item quantity="one">Missing QR Code with ID %1$s</item> + <item quantity="other">Missing QR Codes with IDs %1$s</item> + </plurals> + + <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_scan_button">Scan QR Code with \'Barcode Scanner\'</string> <!-- Intent labels --> <string name="intent_decrypt_file">OpenPGP: Decrypt File</string> @@ -354,7 +361,7 @@ <!-- Share --> <string name="share_qr_code_dialog_start">Go through all QR Codes using \'Next\', and scan them one by one.</string> - <string name="share_qr_code_dialog_progress">QR Code %1$d of %2$d</string> + <string name="share_qr_code_dialog_progress">QR Code with ID %1$d of %2$d</string> <string name="share_nfc_dialog">Share with NFC</string> <!-- Key list --> |