From 050aed1ef5d62ec47c915a33e61752aebbfb581f Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 5 Sep 2017 03:22:11 +0200 Subject: [PATCH] token-import: extract string resources --- .../create_security_token_import_fragment.xml | 22 +++++++++---------- OpenKeychain/src/main/res/values/strings.xml | 9 ++++++++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/OpenKeychain/src/main/res/layout/create_security_token_import_fragment.xml b/OpenKeychain/src/main/res/layout/create_security_token_import_fragment.xml index 367f8b226..4a9f9b2ec 100644 --- a/OpenKeychain/src/main/res/layout/create_security_token_import_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_security_token_import_fragment.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - android:text="Gathering information for Security Token…" + android:text="@string/token_status_title" style="?android:textAppearanceMedium"/> @@ -78,7 +78,7 @@ android:drawableStart="@drawable/ic_repeat_grey_24dp" android:drawablePadding="12dp" android:textColor="@color/card_view_button" - android:text="Retry Search" + android:text="@string/token_status_retry" style="?borderlessButtonStyle" /> @@ -90,7 +90,7 @@ android:drawableStart="@drawable/ic_folder_grey_24dp" android:drawablePadding="12dp" android:textColor="@color/card_view_button" - android:text="Load from File" + android:text="@string/token_status_load_from_file" style="?borderlessButtonStyle" /> @@ -102,7 +102,7 @@ android:drawableStart="@drawable/ic_bomb_24dp" android:drawablePadding="12dp" android:textColor="@color/android_red_dark" - android:text="Reset Security Token" + android:text="@string/token_status_reset" style="?borderlessButtonStyle" /> @@ -119,7 +119,7 @@ android:layout_height="wrap_content" android:minHeight="?listPreferredItemHeight" android:gravity="center_vertical" - android:text="Key found!" + android:text="@string/token_status_key_found" style="?android:textAppearanceLarge" /> @@ -131,7 +131,7 @@ android:drawableStart="@drawable/ic_key_plus_grey600_24dp" android:drawablePadding="12dp" android:textColor="@color/card_view_button" - android:text="Import" + android:text="@string/token_status_import" style="?borderlessButtonStyle" /> @@ -143,7 +143,7 @@ android:drawableStart="@drawable/ic_bomb_24dp" android:drawablePadding="12dp" android:textColor="@color/android_red_dark" - android:text="Reset Security Token" + android:text="@string/token_status_reset" style="?borderlessButtonStyle" /> @@ -160,7 +160,7 @@ android:layout_height="wrap_content" android:minHeight="?listPreferredItemHeight" android:gravity="center_vertical" - android:text="Ready for use!" + android:text="@string/token_status_token_ok" style="?android:textAppearanceLarge" /> @@ -172,7 +172,7 @@ android:drawableStart="@drawable/ic_vpn_key_grey_24dp" android:drawablePadding="12dp" android:textColor="@color/card_view_button" - android:text="View Key" + android:text="@string/token_status_view_key" style="?borderlessButtonStyle" /> @@ -184,7 +184,7 @@ android:drawableStart="@drawable/ic_bomb_24dp" android:drawablePadding="12dp" android:textColor="@color/android_red_dark" - android:text="Reset Security Token" + android:text="@string/token_status_reset" style="?borderlessButtonStyle" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 991d4bd24..f366c37c3 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1928,5 +1928,14 @@ Reset Security Token? This will irrecoverably delete the key stored on this Security Token. You will no longer be able to use this key for decryption! Are you sure? Reset + Gathering information for Security Token… + Key not found! + Retry Search + Load from File + Reset Security Token + Key found! + Import + Ready for use! + View Key