aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-01-10 17:17:57 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-01-10 17:17:57 +0100
commit0fd5b45df913d1524aa400a644c48dc91044d9bf (patch)
tree8a1c879bffd5143ef3c79a3a0702bddd085bf50e /OpenKeychain/src/main/res
parent9163b93a907a29dab04e1ca99b175b097d1e9d91 (diff)
downloadopen-keychain-0fd5b45df913d1524aa400a644c48dc91044d9bf.tar.gz
open-keychain-0fd5b45df913d1524aa400a644c48dc91044d9bf.tar.bz2
open-keychain-0fd5b45df913d1524aa400a644c48dc91044d9bf.zip
Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_start_fragment.xml56
-rw-r--r--OpenKeychain/src/main/res/layout/create_security_token_import_reset_fragment.xml (renamed from OpenKeychain/src/main/res/layout/create_yubi_key_import_reset_fragment.xml)20
-rw-r--r--OpenKeychain/src/main/res/layout/create_security_token_wait_fragment.xml (renamed from OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml)2
-rw-r--r--OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/security_token_operation_activity.xml (renamed from OpenKeychain/src/main/res/layout/nfc_operation_activity.xml)54
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_security_token.xml (renamed from OpenKeychain/src/main/res/layout/view_key_yubikey.xml)8
-rw-r--r--OpenKeychain/src/main/res/values-cs/strings.xml6
-rw-r--r--OpenKeychain/src/main/res/values-de/strings.xml74
-rw-r--r--OpenKeychain/src/main/res/values-es-rMX/strings.xml6
-rw-r--r--OpenKeychain/src/main/res/values-es/strings.xml84
-rw-r--r--OpenKeychain/src/main/res/values-eu/strings.xml66
-rw-r--r--OpenKeychain/src/main/res/values-fa/strings.xml4
-rw-r--r--OpenKeychain/src/main/res/values-fi/strings.xml4
-rw-r--r--OpenKeychain/src/main/res/values-fr/strings.xml84
-rw-r--r--OpenKeychain/src/main/res/values-it/strings.xml6
-rw-r--r--OpenKeychain/src/main/res/values-ja/strings.xml84
-rw-r--r--OpenKeychain/src/main/res/values-ko/strings.xml12
-rw-r--r--OpenKeychain/src/main/res/values-nl/strings.xml64
-rw-r--r--OpenKeychain/src/main/res/values-pl/strings.xml2
-rw-r--r--OpenKeychain/src/main/res/values-ru/strings.xml16
-rw-r--r--OpenKeychain/src/main/res/values-sl/strings.xml4
-rw-r--r--OpenKeychain/src/main/res/values-sr/strings.xml78
-rw-r--r--OpenKeychain/src/main/res/values-sv/strings.xml16
-rw-r--r--OpenKeychain/src/main/res/values-tr/strings.xml2
-rw-r--r--OpenKeychain/src/main/res/values-uk/strings.xml2
-rw-r--r--OpenKeychain/src/main/res/values-zh-rTW/strings.xml16
-rw-r--r--OpenKeychain/src/main/res/values-zh/strings.xml12
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml107
-rw-r--r--OpenKeychain/src/main/res/xml/passphrase_preferences.xml2
29 files changed, 462 insertions, 433 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
index 622cdf5a0..5221fa6e6 100644
--- a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
@@ -50,22 +50,52 @@
android:clickable="true"
style="?android:attr/borderlessButtonStyle" />
- <TextView
- android:id="@+id/create_key_yubikey_button"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ <RelativeLayout
+ android:id="@+id/create_key_security_token_button"
+ style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/first_time_yubikey"
- android:textAllCaps="true"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
- android:drawablePadding="8dp"
android:gravity="right|center_vertical"
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:layout_weight="1"
android:clickable="true"
- style="?android:attr/borderlessButtonStyle" />
+ android:minHeight="?android:attr/listPreferredItemHeight">
+
+ <TextView
+ android:id="@+id/textView4"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="16dp"
+ android:paddingRight="10dp"
+ android:text="@string/first_time_security_token"
+ android:textAllCaps="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_alignParentTop="true"
+ android:layout_toLeftOf="@+id/imageView5"
+ android:layout_toStartOf="@+id/imageView5" />
+
+ <ImageView
+ android:id="@+id/imageView5"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:paddingRight="10dp"
+ android:src="@drawable/ic_chevron_right_grey_24dp" />
+
+ <TextView
+ android:id="@+id/textView3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="16dp"
+ android:paddingRight="10dp"
+ android:text="@string/first_time_security_token_subtitle"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:layout_alignParentBottom="true"
+ android:layout_toLeftOf="@+id/imageView5"
+ android:layout_toStartOf="@+id/imageView5" />
+
+ </RelativeLayout>
<TextView
android:id="@+id/create_key_import_button"
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_import_reset_fragment.xml b/OpenKeychain/src/main/res/layout/create_security_token_import_reset_fragment.xml
index 7acc2dca9..e97b99076 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_import_reset_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_security_token_import_reset_fragment.xml
@@ -36,14 +36,14 @@
android:orientation="vertical">
<TextView
- android:id="@+id/yubikey_serno"
+ android:id="@+id/token_serno"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="Yubikey #" />
<TextView
- android:id="@+id/yubikey_userid"
+ android:id="@+id/token_userid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
- android:text="@string/yubikey_reset_or_import"
+ android:text="@string/security_token_reset_or_import"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RadioGroup
@@ -76,19 +76,19 @@
android:orientation="vertical">
<RadioButton
- android:id="@+id/yubikey_decision_import"
+ android:id="@+id/token_decision_import"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:text="@string/yubikey_import_radio" />
+ android:text="@string/security_token_import_radio" />
<RadioButton
- android:id="@+id/yubikey_decision_reset"
+ android:id="@+id/token_decision_reset"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
- android:text="@string/yubikey_reset_radio" />
+ android:text="@string/security_token_reset_radio" />
</RadioGroup>
</LinearLayout>
@@ -101,19 +101,19 @@
android:background="?android:attr/listDivider" />
<FrameLayout
- android:id="@+id/yubikey_import_fragment"
+ android:id="@+id/security_token_import_fragment"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_below="@id/yubikey_decision"
android:layout_marginTop="8dp">
<TextView
- android:id="@+id/yubikey_import_reset_warning"
+ android:id="@+id/token_import_reset_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="24dp"
- android:text="@string/yubikey_reset_warning"
+ android:text="@string/security_token_reset_warning"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/android_red_dark"
android:visibility="gone" />
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml b/OpenKeychain/src/main/res/layout/create_security_token_wait_fragment.xml
index 7f26995a7..4436cfe01 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_security_token_wait_fragment.xml
@@ -22,7 +22,7 @@
android:layout_marginTop="16dp"
android:layout_marginLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/yubikey_create" />
+ android:text="@string/security_token_create" />
<ImageView
android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
index 7e2bf2246..05c837059 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
@@ -22,7 +22,7 @@
android:layout_marginTop="16dp"
android:layout_marginLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/first_time_blank_yubikey" />
+ android:text="@string/first_time_blank_security_token" />
</LinearLayout>
</ScrollView>
@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
- android:text="@string/first_time_blank_yubikey_yes"
+ android:text="@string/first_time_blank_security_token_yes"
android:textAllCaps="true"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
diff --git a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml b/OpenKeychain/src/main/res/layout/security_token_operation_activity.xml
index d3ee363d5..1644f6a6f 100644
--- a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
+++ b/OpenKeychain/src/main/res/layout/security_token_operation_activity.xml
@@ -21,34 +21,34 @@
android:layout_height="wrap_content">
<TextView
- android:id="@+id/nfc_activity_0_text"
+ android:id="@+id/security_token_activity_0_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="24dp"
- android:text="@string/nfc_text"
+ android:text="@string/security_token_nfc_text"
android:textAppearance="@android:style/TextAppearance.Medium" />
<ImageView
- android:id="@+id/nfc_activity_0_image"
+ android:id="@+id/security_token_activity_0_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_0_text"
+ android:layout_below="@+id/security_token_activity_0_text"
android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
android:src="@drawable/yubikey_phone" />
<Button
- android:id="@+id/nfc_activity_0_cancel"
+ android:id="@+id/security_token_activity_0_cancel"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_0_image"
+ android:layout_below="@+id/security_token_activity_0_image"
android:layout_margin="8dp"
android:text="@string/progress_cancel" />
</RelativeLayout>
@@ -58,13 +58,13 @@
android:layout_height="wrap_content">
<TextView
- android:id="@+id/nfc_activity_1_text"
+ android:id="@+id/security_token_activity_1_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="24dp"
- android:text="@string/nfc_wait"
+ android:text="@string/security_token_nfc_wait"
android:textAppearance="@android:style/TextAppearance.Medium" />
<ProgressBar
@@ -77,12 +77,12 @@
<!-- placeholder to retain dialog size -->
<ImageView
- android:id="@+id/nfc_activity_1_placeholder"
+ android:id="@+id/security_token_activity_1_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_1_text"
+ android:layout_below="@+id/security_token_activity_1_text"
android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
@@ -90,12 +90,12 @@
android:visibility="invisible" />
<Button
- android:id="@+id/nfc_activity_1_button_placeholder"
+ android:id="@+id/security_token_activity_1_button_placeholder"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_1_placeholder"
+ android:layout_below="@+id/security_token_activity_1_placeholder"
android:layout_margin="8dp"
android:text=""
android:visibility="invisible" />
@@ -107,23 +107,23 @@
android:layout_height="wrap_content">
<TextView
- android:id="@+id/nfc_activity_2_text"
+ android:id="@+id/security_token_activity_2_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="24dp"
- android:text="@string/nfc_finished"
+ android:text="@string/security_token_nfc_finished"
android:textAppearance="@android:style/TextAppearance.Medium" />
<!-- placeholder to retain dialog size -->
<ImageView
- android:id="@+id/nfc_activity_2_placeholder"
+ android:id="@+id/security_token_activity_2_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_2_text"
+ android:layout_below="@+id/security_token_activity_2_text"
android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
@@ -140,12 +140,12 @@
android:src="@drawable/ic_check_circle_black_48dp" />
<Button
- android:id="@+id/nfc_activity_2_button_placeholder"
+ android:id="@+id/security_token_activity_2_button_placeholder"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_2_placeholder"
+ android:layout_below="@+id/security_token_activity_2_placeholder"
android:layout_margin="8dp"
android:text=""
android:visibility="invisible" />
@@ -157,11 +157,11 @@
android:layout_height="wrap_content">
<TextView
- android:id="@+id/nfc_activity_3_text_placeholder"
+ android:id="@+id/security_token_activity_3_text_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignEnd="@+id/nfc_activity_3_placeholder"
- android:layout_alignRight="@+id/nfc_activity_3_placeholder"
+ android:layout_alignEnd="@+id/security_token_activity_3_placeholder"
+ android:layout_alignRight="@+id/security_token_activity_3_placeholder"
android:layout_marginLeft="24dp"
android:layout_marginTop="24dp"
android:text=""
@@ -169,12 +169,12 @@
<!-- placeholder to retain dialog size -->
<ImageView
- android:id="@+id/nfc_activity_3_placeholder"
+ android:id="@+id/security_token_activity_3_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_below="@+id/nfc_activity_3_text_placeholder"
+ android:layout_below="@+id/security_token_activity_3_text_placeholder"
android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
@@ -182,7 +182,7 @@
android:visibility="invisible" />
<TextView
- android:id="@+id/nfc_activity_3_error_text"
+ android:id="@+id/security_token_activity_3_error_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
@@ -193,14 +193,14 @@
tools:text="Error text" />
<Button
- android:id="@+id/nfc_activity_3_error_try_again"
+ android:id="@+id/security_token_activity_3_error_try_again"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
- android:layout_below="@+id/nfc_activity_3_placeholder"
+ android:layout_below="@+id/security_token_activity_3_placeholder"
android:layout_margin="8dp"
- android:text="@string/error_nfc_try_again" />
+ android:text="@string/security_token_error_try_again" />
</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml b/OpenKeychain/src/main/res/layout/view_key_security_token.xml
index 5e2bfbfe6..27fa3d53c 100644
--- a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_security_token.xml
@@ -33,7 +33,7 @@
style="@style/CardViewHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/section_yubikey"/>
+ android:text="@string/section_security_token"/>
<LinearLayout
android:layout_width="match_parent"
@@ -56,7 +56,7 @@
android:orientation="vertical">
<TextView
- android:id="@+id/yubikey_serno"
+ android:id="@+id/token_serno"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -64,7 +64,7 @@
/>
<TextView
- android:id="@+id/yubikey_userid"
+ android:id="@+id/token_userid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -72,7 +72,7 @@
/>
<TextView
- android:id="@+id/yubikey_status"
+ android:id="@+id/token_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 6b080e665..9aacacd99 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -32,7 +32,7 @@
<string name="title_manage_my_keys">Spravovat klíče</string>
<!--section-->
<string name="section_user_ids">Identity</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">Propojený kontakt v systému</string>
<string name="section_should_you_trust">Důvěřujete tomuto klíči?</string>
<string name="section_proof_details">Doložit ověření</string>
@@ -98,7 +98,7 @@
<string name="label_file_ascii_armor">Povolit ASCII armor</string>
<string name="label_write_version_header">Dát ostatním vědět, že používáte OpenKeychain</string>
<string name="label_write_version_header_summary">Zapisovat \'OpenKeychain v2.7\' do OpenPGP podpisů, šifrovaného textu a exportovaných klíčů</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Použít numerickou klávesnici pro YubiKey PIN</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Použít numerickou klávesnici pro YubiKey PIN</string>
<string name="label_to">Zašifrovat pro:</string>
<string name="label_delete_after_encryption">Smazat soubory po zašifrování</string>
<string name="label_delete_after_decryption">Smazat po rozšifrování</string>
@@ -180,7 +180,7 @@
<string name="passphrase_must_not_be_empty">Zadejte heslo.</string>
<string name="passphrase_for">Zadejte heslo pro \'%s\'</string>
<string name="pin_for">Zadejte PIN pro \'%s\'</string>
- <string name="yubikey_pin_for">Zadejte PIN pro přístup k YubiKey pro \'%s\'</string>
+ <string name="security_token_pin_for">Zadejte PIN pro přístup k YubiKey pro \'%s\'</string>
<string name="file_delete_confirmation_title">Smazat původní soubory?</string>
<string name="file_delete_confirmation">Následjící soubory budou vymazány:%s</string>
<string name="file_delete_successful">%1$d z %2$d souborů bylo vymazáno.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 6a29c338f..aba8320d2 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">Meine Schlüssel verwalten</string>
<!--section-->
<string name="section_user_ids">Identitäten</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">Verknüpfter Systemkontakt</string>
<string name="section_keybase_proofs">Keybase.io-Nachweise</string>
<string name="section_should_you_trust">Sollte ich diesem Schlüssel vertrauen?</string>
@@ -128,7 +128,7 @@
<string name="label_file_ascii_armor">Aktiviere ASCII Armor</string>
<string name="label_write_version_header">Lass andere wissen dass du OpenKeychain nutzt</string>
<string name="label_write_version_header_summary">Fügt \'OpenKeychain v2.7\' zu OpenPGP-Signaturen, Daten und exportierten Schlüsseln hinzu</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Zifferntastatur für YubiKey-PINs verwenden</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Zifferntastatur für YubiKey-PINs verwenden</string>
<string name="label_asymmetric_from">Signiere mit:</string>
<string name="label_to">Verschlüsselt an:</string>
<string name="label_delete_after_encryption">Dateien nach Verschlüsselung löschen</string>
@@ -256,10 +256,10 @@
<string name="passphrase_for_backup">Backupcode eingeben</string>
<string name="passphrase_for">Passwort für \'%s\' eingeben</string>
<string name="pin_for">PIN für \'%s\' eingeben</string>
- <string name="yubikey_pin_for">PIN des YubiKeys für \'%s\' eingeben</string>
- <string name="nfc_text">Halte den YubiKey gegen die Rückseite deines Geräts in die Nähe der NFC-Markierung.</string>
- <string name="nfc_wait">Halte den YubiKey an die Rückseite!</string>
- <string name="nfc_finished">Entferne jetzt den YubiKey.</string>
+ <string name="security_token_pin_for">PIN des YubiKeys für \'%s\' eingeben</string>
+ <string name="security_token_nfc_text">Halte den YubiKey gegen die Rückseite deines Geräts in die Nähe der NFC-Markierung.</string>
+ <string name="security_token_nfc_wait">Halte den YubiKey an die Rückseite!</string>
+ <string name="security_token_nfc_finished">Entferne jetzt den YubiKey.</string>
<string name="file_delete_confirmation_title">Originaldateien löschen?</string>
<string name="file_delete_confirmation">Die folgenden Dateien werden gelöscht: %s</string>
<string name="file_delete_successful">%1$d von %2$d Dateien wurden gelöscht.%3$s</string>
@@ -650,9 +650,9 @@
<string name="edit_key_select_flag">Bitte mindestens ein Attribut wählen!</string>
<string name="edit_key_error_add_identity">Füge mindestens eine Identität hinzu!</string>
<string name="edit_key_error_add_subkey">Füge mindestens einen Unterschlüssel hinzu!</string>
- <string name="edit_key_error_bad_nfc_algo">Hash-Algorithmus wird von dieser Smartcard nicht unterstützt!</string>
- <string name="edit_key_error_bad_nfc_size">Die Schlüssellänge wird von dieser Smartcard nicht unterstützt!</string>
- <string name="edit_key_error_bad_nfc_stripped">Schlüssel kann nicht auf Smartcard verschoben werden (entweder er ist gekürzt oder \'auf Karte umgeleitet\')!</string>
+ <string name="edit_key_error_bad_security_token_algo">Hash-Algorithmus wird von dieser Smartcard nicht unterstützt!</string>
+ <string name="edit_key_error_bad_security_token_size">Die Schlüssellänge wird von dieser Smartcard nicht unterstützt!</string>
+ <string name="edit_key_error_bad_security_token_stripped">Schlüssel kann nicht auf Smartcard verschoben werden (entweder er ist gekürzt oder \'auf Karte umgeleitet\')!</string>
<!--Create key-->
<string name="create_key_upload">Mit dem Internet synchronisieren</string>
<string name="create_key_empty">Dieses Feld wird benötigt</string>
@@ -1250,10 +1250,10 @@
<string name="first_time_text1">Hol dir deine Privatsphäre mit OpenKeychain zurück!</string>
<string name="first_time_create_key">Meinen Schlüssel erzeugen</string>
<string name="first_time_import_key">Schlüssel aus Datei importieren</string>
- <string name="first_time_yubikey">YubiKey NEO verwenden</string>
+ <string name="first_time_security_token">YubiKey NEO verwenden</string>
<string name="first_time_skip">Setup überspringen</string>
- <string name="first_time_blank_yubikey">Möchtest du diesen leeren YubiKey NEO mit OpenKeychain verwenden?\n\nBitte nimm den YubiKey nun weg, du wirst aufgefordert, wenn er erneut benötigt wird!</string>
- <string name="first_time_blank_yubikey_yes">Diesen YubiKey verwenden</string>
+ <string name="first_time_blank_security_token">Möchtest du diesen leeren YubiKey NEO mit OpenKeychain verwenden?\n\nBitte nimm den YubiKey nun weg, du wirst aufgefordert, wenn er erneut benötigt wird!</string>
+ <string name="first_time_blank_security_token_yes">Diesen YubiKey verwenden</string>
<string name="backup_text">Backups, die deine eigenen Schlüssel beinhalten, dürfen unter keinen Umständen an anderen Personen gegeben werden.</string>
<string name="backup_all">Alle Schlüssel + deine eigenen Schlüssel</string>
<string name="backup_public_keys">Alle Schlüssel</string>
@@ -1319,38 +1319,38 @@
<string name="nfc_wrong_tag">Falscher Tag, bitte versuche es erneut.</string>
<string name="enable_nfc">Bitte aktiviere NFC in deinen Einstellungen.</string>
<string name="no_nfc_support">Dieses Gerät unterstützt kein NFC</string>
- <string name="nfc_write_succesful">Erfolgreich auf den NFC-Tag geschrieben</string>
+ <string name="nfc_write_successful">Erfolgreich auf den NFC-Tag geschrieben</string>
<string name="unlocked">Entsperrt</string>
<string name="nfc_settings">Einstellungen</string>
- <string name="snack_yubikey_view">Anzeigen</string>
- <string name="snack_yubikey_import">Import</string>
+ <string name="snack_security_token_view">Anzeigen</string>
+ <string name="snack_security_token_import">Import</string>
<string name="button_bind_key">Schlüssel verbinden</string>
- <string name="yubikey_serno">Seriennummer: %s</string>
- <string name="yubikey_key_holder">Schlüsselinhaber:</string>
- <string name="yubikey_key_holder_not_set"><![CDATA[Schlüsselinhaber: <nicht festgelegt>]]></string>
- <string name="yubikey_status_bound">YubiKey stimmt überein und ist mit dem Schlüssel gekoppelt</string>
- <string name="yubikey_status_unbound">YubiKey stimmt überein und kann mit dem Schlüssel gekoppelt werden</string>
- <string name="yubikey_status_partly">YubiKey stimmt überein und ist teilweise mit dem Schlüssel gekoppelt</string>
- <string name="yubikey_create">Halte den YubiKey gegen die Rückseite deines Geräts.</string>
+ <string name="security_token_serial_no">Seriennummer: %s</string>
+ <string name="security_token_key_holder">Schlüsselinhaber:</string>
+ <string name="security_token_key_holder_not_set"><![CDATA[Schlüsselinhaber: <nicht festgelegt>]]></string>
+ <string name="security_token_status_bound">YubiKey stimmt überein und ist mit dem Schlüssel gekoppelt</string>
+ <string name="security_token_status_unbound">YubiKey stimmt überein und kann mit dem Schlüssel gekoppelt werden</string>
+ <string name="security_token_status_partly">YubiKey stimmt überein und ist teilweise mit dem Schlüssel gekoppelt</string>
+ <string name="security_token_create">Halte den YubiKey gegen die Rückseite deines Geräts.</string>
<string name="btn_import">Import</string>
- <string name="snack_yubi_other">Anderer Schlüssel auf YubiKey gespeichert!</string>
- <string name="error_nfc">NFC-Fehler: %s</string>
- <plurals name="error_pin">
+ <string name="snack_security_token_other">Anderer Schlüssel auf YubiKey gespeichert!</string>
+ <string name="security_token_error">NFC-Fehler: %s</string>
+ <plurals name="security_token_error_pin">
<item quantity="one">PIN falsch!\n%d Versuch verbleibend.</item>
<item quantity="other">PIN falsch!\n%d Versuche verbleibend.</item>
</plurals>
- <string name="error_nfc_terminated">YubiKey befindet sich in beendetem Zustand.</string>
- <string name="error_nfc_wrong_length">Eingegebene PIN zu kurz. PINs müssen aus mindestens 6 Ziffern bestehen.</string>
- <string name="error_nfc_conditions_not_satisfied">Nutzungsbedingungen werden nicht erfüllt. </string>
- <string name="error_nfc_security_not_satisfied">Sicherheitsstatus nicht erfüllt.</string>
- <string name="error_nfc_authentication_blocked">PIN nach zu vielen Versuchen gesperrt.</string>
- <string name="error_nfc_data_not_found">Schlüssel oder Objekt nicht gefunden.</string>
- <string name="error_nfc_unknown">Unbekannter Fehler</string>
- <string name="error_nfc_bad_data">YubiKey meldete ungültige Daten.</string>
- <string name="error_nfc_chaining_error">YubiKey erwartete das letzte Kommando in einer Kette.</string>
- <string name="error_nfc_header">YubiKey meldete ungültige %s Byte.</string>
- <string name="error_nfc_tag_lost">YubiKey wurde zu früh abgenommen. Halte den YubiKey an die Rückseite, bis der Vorgang beendet ist.</string>
- <string name="error_nfc_try_again">Erneut versuchen</string>
+ <string name="security_token_error_terminated">YubiKey befindet sich in beendetem Zustand.</string>
+ <string name="security_token_error_wrong_length">Eingegebene PIN zu kurz. PINs müssen aus mindestens 6 Ziffern bestehen.</string>
+ <string name="security_token_error_conditions_not_satisfied">Nutzungsbedingungen werden nicht erfüllt. </string>
+ <string name="security_token_error_security_not_satisfied">Sicherheitsstatus nicht erfüllt.</string>
+ <string name="security_token_error_authentication_blocked">PIN nach zu vielen Versuchen gesperrt.</string>
+ <string name="security_token_error_data_not_found">Schlüssel oder Objekt nicht gefunden.</string>
+ <string name="security_token_error_unknown">Unbekannter Fehler</string>
+ <string name="security_token_error_bad_data">YubiKey meldete ungültige Daten.</string>
+ <string name="security_token_error_chaining_error">YubiKey erwartete das letzte Kommando in einer Kette.</string>
+ <string name="security_token_error_header">YubiKey meldete ungültige %s Byte.</string>
+ <string name="security_token_error_tag_lost">YubiKey wurde zu früh abgenommen. Halte den YubiKey an die Rückseite, bis der Vorgang beendet ist.</string>
+ <string name="security_token_error_try_again">Erneut versuchen</string>
<string name="error_temp_file">Erzeugen der temporären Datei fehlgeschlagen.</string>
<string name="btn_delete_original">Originaldatei löschen</string>
<string name="snack_encrypt_filenames_on">Dateinamen <b>sind</b> verschlüsselt.</string>
diff --git a/OpenKeychain/src/main/res/values-es-rMX/strings.xml b/OpenKeychain/src/main/res/values-es-rMX/strings.xml
index 6b4d5b332..083e5b813 100644
--- a/OpenKeychain/src/main/res/values-es-rMX/strings.xml
+++ b/OpenKeychain/src/main/res/values-es-rMX/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">Administrar mis claves</string>
<!--section-->
<string name="section_user_ids">Identidades</string>
- <string name="section_yubikey">Clave Yubi</string>
+ <string name="section_security_token">Clave Yubi</string>
<string name="section_should_you_trust">¿Debería confiar en esta clave?</string>
<string name="section_proof_details">Prueba de verificación</string>
<string name="section_keys">Subclave</string>
@@ -122,7 +122,7 @@
<string name="label_show_passphrase">Mostrar contraseña</string>
<string name="label_algorithm">Algoritmo</string>
<string name="label_write_version_header">Permitir que otros sepan que estás usando OpenKeychain</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Usar teclado numérico para NIP de clave Yubi</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Usar teclado numérico para NIP de clave Yubi</string>
<string name="label_asymmetric_from">Firmar con...</string>
<string name="label_to">Cifrar para:</string>
<string name="label_delete_after_encryption">Eliminar archivos después de cifrado</string>
@@ -233,7 +233,7 @@
<string name="passphrase_for_backup">Ingrese un código de respaldo</string>
<string name="passphrase_for">Ingrese una contraseña para \'%s\'</string>
<string name="pin_for">Ingrese un NIP para \'%s\'</string>
- <string name="yubikey_pin_for">Ingrese NIP para acceder a una clave Yubi para \'%s\'</string>
+ <string name="security_token_pin_for">Ingrese NIP para acceder a una clave Yubi para \'%s\'</string>
<!--errors
no punctuation, all lowercase,
they will be put after "error_message", e.g. "Error: file not found"-->
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index b895ced33..90c0c4940 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">Administrar mis claves</string>
<!--section-->
<string name="section_user_ids">Identidades</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">Contacto del sistema vinculado</string>
<string name="section_keybase_proofs">Pruebas de Keybase.io</string>
<string name="section_should_you_trust">¿Debería confiar en esta clave?</string>
@@ -130,7 +130,7 @@
<string name="label_file_ascii_armor">Habilitar armadura ASCII</string>
<string name="label_write_version_header">Permitir a otros conocer que usted está usando OpenKeychain</string>
<string name="label_write_version_header_summary">Escribe \'OpenKeychain v2.7\' en las firmas OpenPGP, texto cifrado, y claves exportadas</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Usar teclado numérico para el PIN de la YubiKey</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Usar teclado numérico para el PIN de la YubiKey</string>
<string name="label_asymmetric_from">Firmar con:</string>
<string name="label_to">Cifrar hacia:</string>
<string name="label_delete_after_encryption">Borrar ficheros tras el cifrado</string>
@@ -262,10 +262,10 @@
<string name="passphrase_for_backup">Ingrese código de respaldo</string>
<string name="passphrase_for">Introduzca contraseña para \'%s\'</string>
<string name="pin_for">Introduzca PIN para \'%s\'</string>
- <string name="yubikey_pin_for">Introduzca PIN para acceder a la YubiKey para \'%s\'</string>
- <string name="nfc_text">Sostenga la YubiKey contra el marcador NFC en el reverso de su dispositivo.</string>
- <string name="nfc_wait">¡Mantenga la YubiKey en el reverso!</string>
- <string name="nfc_finished">Retire la YubiKey ahora.</string>
+ <string name="security_token_pin_for">Introduzca PIN para acceder a la YubiKey para \'%s\'</string>
+ <string name="security_token_nfc_text">Sostenga la YubiKey contra el marcador NFC en el reverso de su dispositivo.</string>
+ <string name="security_token_nfc_wait">¡Mantenga la YubiKey en el reverso!</string>
+ <string name="security_token_nfc_finished">Retire la YubiKey ahora.</string>
<string name="file_delete_confirmation_title">¿Borrar ficheros originales?</string>
<string name="file_delete_confirmation">Se borrarán los siguientes ficheros:%s</string>
<string name="file_delete_successful">%1$d de %2$d ficheros han sido borrados.%3$s</string>
@@ -659,9 +659,9 @@
<string name="edit_key_select_flag">¡Por favor, seleccione al menos un indicador!</string>
<string name="edit_key_error_add_identity">¡Añada al menos una identidad!</string>
<string name="edit_key_error_add_subkey">¡Añadir al menos una subclave!</string>
- <string name="edit_key_error_bad_nfc_algo">¡Algoritmo no soportado por la tarjeta inteligente!</string>
- <string name="edit_key_error_bad_nfc_size">¡El tamaño de la clave no está soportado por la tarjeta inteligente!</string>
- <string name="edit_key_error_bad_nfc_stripped">¡No se puede mover la clave a la tarjeta inteligente (tanto desnuda como \'derivar-a-tarjeta\')!</string>
+ <string name="edit_key_error_bad_security_token_algo">¡Algoritmo no soportado por la tarjeta inteligente!</string>
+ <string name="edit_key_error_bad_security_token_size">¡El tamaño de la clave no está soportado por la tarjeta inteligente!</string>
+ <string name="edit_key_error_bad_security_token_stripped">¡No se puede mover la clave a la tarjeta inteligente (tanto desnuda como \'derivar-a-tarjeta\')!</string>
<!--Create key-->
<string name="create_key_upload">Sincronizar con Internet</string>
<string name="create_key_empty">Este campo es obligatorio</string>
@@ -1293,10 +1293,10 @@
<string name="first_time_text1">¡Recupere su privacidad con OpenKeychain!</string>
<string name="first_time_create_key">Crear mi clave</string>
<string name="first_time_import_key">Importar clave desde fichero</string>
- <string name="first_time_yubikey">Usar Yubikey NEO</string>
+ <string name="first_time_security_token">Usar Yubikey NEO</string>
<string name="first_time_skip">Omitir configuración</string>
- <string name="first_time_blank_yubikey">¿Desea usar esta YubiKey NEO en blanco con OpenKeychain?\n\n¡Por favor, retire ahora la YubiKey, se le solicitará cuando sea necesaria de nuevo!</string>
- <string name="first_time_blank_yubikey_yes">Usar esta YubiKey</string>
+ <string name="first_time_blank_security_token">¿Desea usar esta YubiKey NEO en blanco con OpenKeychain?\n\n¡Por favor, retire ahora la YubiKey, se le solicitará cuando sea necesaria de nuevo!</string>
+ <string name="first_time_blank_security_token_yes">Usar esta YubiKey</string>
<string name="backup_text">¡Las copias de seguridad que incluyen sus propias claves nunca se deben compartir con otras personas!</string>
<string name="backup_all">Todas las claves + sus propias claves</string>
<string name="backup_public_keys">Todas las claves</string>
@@ -1365,44 +1365,44 @@
<string name="nfc_wrong_tag">Etiqueta incorrecta. Por favor inténtelo de nuevo.</string>
<string name="enable_nfc">Por favor active NFC en su configuración</string>
<string name="no_nfc_support">Este dispositivo no soporta NFC</string>
- <string name="nfc_write_succesful">Se escribió con éxito en la etiqueta NFC</string>
+ <string name="nfc_write_successful">Se escribió con éxito en la etiqueta NFC</string>
<string name="unlocked">Desbloqueado</string>
<string name="nfc_settings">Configuración</string>
- <string name="snack_yubikey_view">Ver</string>
- <string name="snack_yubikey_import">Importar</string>
+ <string name="snack_security_token_view">Ver</string>
+ <string name="snack_security_token_import">Importar</string>
<string name="button_bind_key">Ligar clave</string>
- <string name="yubikey_serno">Nº de serie: %s</string>
- <string name="yubikey_key_holder">Titular de la clave:</string>
- <string name="yubikey_key_holder_not_set"><![CDATA[Titular de la clave: <not set>]]></string>
- <string name="yubikey_status_bound">La YubiKey coincide y está ligada a la clave</string>
- <string name="yubikey_status_unbound">La YubiKey coincide, puede ligarse a la clave</string>
- <string name="yubikey_status_partly">La YubiKey coincide, parcialmente ligada a la clave</string>
- <string name="yubikey_create">Sostenga la YubiKey contra el reverso de su dispositivo.</string>
- <string name="yubikey_reset_or_import">Esta YubiKey ya contiene una llave. Usted puede importar la llave usando la nube o reiniciando la YubiKey.</string>
+ <string name="security_token_serial_no">Nº de serie: %s</string>
+ <string name="security_token_key_holder">Titular de la clave:</string>
+ <string name="security_token_key_holder_not_set"><![CDATA[Titular de la clave: <not set>]]></string>
+ <string name="security_token_status_bound">La YubiKey coincide y está ligada a la clave</string>
+ <string name="security_token_status_unbound">La YubiKey coincide, puede ligarse a la clave</string>
+ <string name="security_token_status_partly">La YubiKey coincide, parcialmente ligada a la clave</string>
+ <string name="security_token_create">Sostenga la YubiKey contra el reverso de su dispositivo.</string>
+ <string name="security_token_reset_or_import">Esta YubiKey ya contiene una llave. Usted puede importar la llave usando la nube o reiniciando la YubiKey.</string>
<string name="btn_import">Importar</string>
<string name="btn_reset">Reiniciar</string>
- <string name="yubikey_import_radio">Importar llave</string>
- <string name="yubikey_reset_radio">Reiniciar la YubiKey</string>
- <string name="yubikey_reset_warning">¡Reiniciar la YubiKey destruirá completamente las llaves en ella. Más adelante, usted no podrá descifrar mensajes/archivos cifrados con esta llave!</string>
- <string name="snack_yubi_other">¡Clave almacenada en YubiKey distinta!</string>
- <string name="error_nfc">Error de NFC: %s</string>
- <plurals name="error_pin">
+ <string name="security_token_import_radio">Importar llave</string>
+ <string name="security_token_reset_radio">Reiniciar la YubiKey</string>
+ <string name="security_token_reset_warning">¡Reiniciar la YubiKey destruirá completamente las llaves en ella. Más adelante, usted no podrá descifrar mensajes/archivos cifrados con esta llave!</string>
+ <string name="snack_security_token_other">¡Clave almacenada en YubiKey distinta!</string>
+ <string name="security_token_error">Error de NFC: %s</string>
+ <plurals name="security_token_error_pin">
<item quantity="one">¡PIN incorrecto!\nLe queda %d intento.</item>
<item quantity="other">¡PIN incorrecto!\nLe quedan %d intentos.</item>
</plurals>
- <string name="error_nfc_terminated">YubiKey en estado de vencimiento.</string>
- <string name="error_nfc_wrong_length">El PIN introducido es demasiado corto. Los PINs tienen al menos 6 dígitos de largo.</string>
- <string name="error_nfc_conditions_not_satisfied">Condiciones de uso no satisfechas.</string>
- <string name="error_nfc_security_not_satisfied">Estado de seguridad no satisfecho.</string>
- <string name="error_nfc_authentication_blocked">PIN bloqueado después de demasiados intentos.</string>
- <string name="error_nfc_data_not_found">Clave u objeto no encontrado.</string>
- <string name="error_nfc_unknown">Error desconocido</string>
- <string name="error_nfc_bad_data">La YubiKey informó de datos no válidos.</string>
- <string name="error_nfc_chaining_error">La YubiKey esperaba el último comando en una cadena.</string>
- <string name="error_nfc_header">La YubiKey informó de un byte %s no válido.</string>
- <string name="error_nfc_tag_lost">La YubiKey ha sido retirada demasiado pronto. Mantenga la YubiKey en el reverso hasta que la operación finalice.</string>
- <string name="error_nfc_iso_dep_not_supported">La etiqueta no soporta ISO-DEP (ISO 14443-4)</string>
- <string name="error_nfc_try_again">Intentar de nuevo</string>
+ <string name="security_token_error_terminated">YubiKey en estado de vencimiento.</string>
+ <string name="security_token_error_wrong_length">El PIN introducido es demasiado corto. Los PINs tienen al menos 6 dígitos de largo.</string>
+ <string name="security_token_error_conditions_not_satisfied">Condiciones de uso no satisfechas.</string>
+ <string name="security_token_error_security_not_satisfied">Estado de seguridad no satisfecho.</string>
+ <string name="security_token_error_authentication_blocked">PIN bloqueado después de demasiados intentos.</string>
+ <string name="security_token_error_data_not_found">Clave u objeto no encontrado.</string>
+ <string name="security_token_error_unknown">Error desconocido</string>
+ <string name="security_token_error_bad_data">La YubiKey informó de datos no válidos.</string>
+ <string name="security_token_error_chaining_error">La YubiKey esperaba el último comando en una cadena.</string>
+ <string name="security_token_error_header">La YubiKey informó de un byte %s no válido.</string>
+ <string name="security_token_error_tag_lost">La YubiKey ha sido retirada demasiado pronto. Mantenga la YubiKey en el reverso hasta que la operación finalice.</string>
+ <string name="security_token_error_iso_dep_not_supported">La etiqueta no soporta ISO-DEP (ISO 14443-4)</string>
+ <string name="security_token_error_try_again">Intentar de nuevo</string>
<string name="error_pin_wrong">¡El NIP es incorrecto!</string>
<string name="error_temp_file">Error al crear fichero temporal.</string>
<string name="btn_delete_original">Borrar fichero original</string>
diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml
index b26be00ce..592f7b784 100644
--- a/OpenKeychain/src/main/res/values-eu/strings.xml
+++ b/OpenKeychain/src/main/res/values-eu/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">Kudeatu nire giltzak</string>
<!--section-->
<string name="section_user_ids">Nortasunak</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">Loturatutako Sistema Harremana</string>
<string name="section_keybase_proofs">Keybase.io Probak</string>
<string name="section_should_you_trust">Fidatu behar zara giltza honetaz?</string>
@@ -129,7 +129,7 @@
<string name="label_file_ascii_armor">Gaitu ASCII Armor</string>
<string name="label_write_version_header">Jakinarazi besteei OpenKeychain erabiltzen ari zarela</string>
<string name="label_write_version_header_summary">\'OpenKeychain v2.7\' idazten du OpenPGP sinadura, idazkia zifratzen du eta giltzak esportatzen ditu</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Erabili zenbaki teklatua YubiKey PIN-erako</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Erabili zenbaki teklatua YubiKey PIN-erako</string>
<string name="label_asymmetric_from">Hasi saioa honekin:</string>
<string name="label_to">Enkriptatu hona:</string>
<string name="label_delete_after_encryption">Ezabatu agiriak enkriptatu ondoren</string>
@@ -260,10 +260,10 @@
<string name="passphrase_for_backup">Sartu babeskopia kodea</string>
<string name="passphrase_for">Sartu \'%s\'-rako sarhitza</string>
<string name="pin_for">Sartu PIN-a \'%s\'-rako</string>
- <string name="yubikey_pin_for">Sartu PIN-a YubKey-ra sartzeko \'%s\'-rentzat</string>
- <string name="nfc_text">Heutsi YubiKey NFC markatzailearen kontra zure gailuaren atzealdean.</string>
- <string name="nfc_wait">Eduki YubiKey atzealdean!</string>
- <string name="nfc_finished">Irten YubiKey-tik orain</string>
+ <string name="security_token_pin_for">Sartu PIN-a YubKey-ra sartzeko \'%s\'-rentzat</string>
+ <string name="security_token_nfc_text">Heutsi YubiKey NFC markatzailearen kontra zure gailuaren atzealdean.</string>
+ <string name="security_token_nfc_wait">Eduki YubiKey atzealdean!</string>
+ <string name="security_token_nfc_finished">Irten YubiKey-tik orain</string>
<string name="file_delete_confirmation_title">Ezabatu jatorrizko agiriak?</string>
<string name="file_delete_confirmation">Hurrengo agiriak ezabatu egingo dira: %s</string>
<string name="file_delete_successful">%1$d -&gt; %2$d-tik agiri ezbatu dira.%3$s</string>
@@ -651,8 +651,8 @@
<string name="edit_key_select_flag">Mesedez hautatu gutxienez ikur bat!</string>
<string name="edit_key_error_add_identity">Gehitu nortasun bat gutxienez!</string>
<string name="edit_key_error_add_subkey">Gehitu azpigiltza bat gutxienez!</string>
- <string name="edit_key_error_bad_nfc_algo">Txartel adimentsuak ez du algoritmoa sostengatzen!</string>
- <string name="edit_key_error_bad_nfc_size">Txartel adimentsuak ez du giltzaren neurria sostengatzen!</string>
+ <string name="edit_key_error_bad_security_token_algo">Txartel adimentsuak ez du algoritmoa sostengatzen!</string>
+ <string name="edit_key_error_bad_security_token_size">Txartel adimentsuak ez du giltzaren neurria sostengatzen!</string>
<!--Create key-->
<string name="create_key_upload">Aldiberetu Internetekin</string>
<string name="create_key_empty">Eremu hau beharrezkoa da</string>
@@ -1217,10 +1217,10 @@
<string name="first_time_text1">Berreskuratu zure pribatutasuna OpenKeychain-ekin!</string>
<string name="first_time_create_key">Sortu nire giltza</string>
<string name="first_time_import_key">Inportatu giltza agiritik</string>
- <string name="first_time_yubikey">Erabili YubiKey NEO</string>
+ <string name="first_time_security_token">Erabili YubiKey NEO</string>
<string name="first_time_skip">Jauzi Ezarpena</string>
- <string name="first_time_blank_yubikey">YubiKey huts hau erabiltzea nahi duzu OpenKeychain-ekin?\n\nMesedez irten Yubikey-tik orain, berriro galdetuko zaizu beharrezkoa denean!</string>
- <string name="first_time_blank_yubikey_yes">Erabili YubiKey hau</string>
+ <string name="first_time_blank_security_token">YubiKey huts hau erabiltzea nahi duzu OpenKeychain-ekin?\n\nMesedez irten Yubikey-tik orain, berriro galdetuko zaizu beharrezkoa denean!</string>
+ <string name="first_time_blank_security_token_yes">Erabili YubiKey hau</string>
<string name="backup_text">Zure jabetzako giltzak dituzten babeskopiak inoiz ez dira besteekin elkarbanatu behar!</string>
<string name="backup_all">Giltza guztiak + zeure jabetzako giltzak</string>
<string name="backup_public_keys">Giltza guztiak</string>
@@ -1288,36 +1288,36 @@
<string name="nfc_wrong_tag">Etiketa Okerra. Mesedez saiatu berriro.</string>
<string name="enable_nfc">Mesedez gaitu NFC zure ezarpenetan</string>
<string name="no_nfc_support">Gailu honek ez du NFC sostengatzen</string>
- <string name="nfc_write_succesful">Ongi idatzi da NFC etiketan</string>
+ <string name="nfc_write_successful">Ongi idatzi da NFC etiketan</string>
<string name="unlocked">Desblokeatuta</string>
<string name="nfc_settings">Ezarpenak</string>
- <string name="snack_yubikey_view">Ikusi</string>
- <string name="snack_yubikey_import">Inportatu</string>
+ <string name="snack_security_token_view">Ikusi</string>
+ <string name="snack_security_token_import">Inportatu</string>
<string name="button_bind_key">Blindatu Giltza</string>
- <string name="yubikey_serno">Serie Zbk: %s</string>
- <string name="yubikey_create">Jarri YubiKey zure gailuaren atzealdean.</string>
+ <string name="security_token_serial_no">Serie Zbk: %s</string>
+ <string name="security_token_create">Jarri YubiKey zure gailuaren atzealdean.</string>
<string name="btn_import">Inportatu</string>
<string name="btn_reset">Berrezarri</string>
- <string name="yubikey_import_radio">Inportatu giltza</string>
- <string name="yubikey_reset_radio">Berrezrri YubiKey</string>
- <string name="snack_yubi_other">Giltza ezberdina biltegiratuta YubiKey-n!</string>
- <string name="error_nfc">NFC Akatsa: %s</string>
- <plurals name="error_pin">
+ <string name="security_token_import_radio">Inportatu giltza</string>
+ <string name="security_token_reset_radio">Berrezrri YubiKey</string>
+ <string name="snack_security_token_other">Giltza ezberdina biltegiratuta YubiKey-n!</string>
+ <string name="security_token_error">NFC Akatsa: %s</string>
+ <plurals name="security_token_error_pin">
<item quantity="one">PIN okerra!\n%d saiakera gelditzen da.</item>
<item quantity="other">PIN okerra!\n%d saiakera gelditzen dira.</item>
</plurals>
- <string name="error_nfc_terminated">YubiKey amaiera egoeran.</string>
- <string name="error_nfc_wrong_length">Sartutako PIN-a laburregia da. PIN-ak gutxienez 6 digituko luzera du.</string>
- <string name="error_nfc_conditions_not_satisfied">Ez dira erabilpen baldintzak asetu.</string>
- <string name="error_nfc_security_not_satisfied">Ez da segurtasun egoera asetu.</string>
- <string name="error_nfc_authentication_blocked">PIN-a blokeatuta saiakera gehiegiren ondoren.</string>
- <string name="error_nfc_data_not_found">Giltza edo objetua ez da aurkitu.</string>
- <string name="error_nfc_unknown">Akats Ezezaguna</string>
- <string name="error_nfc_bad_data">YubiKeyk datu baliogabeak jakinarazi ditu.</string>
- <string name="error_nfc_chaining_error">YubiKeyk itxaroten zuen azken agindua kate batean.</string>
- <string name="error_nfc_header">YubiKeyk %s byte baliogabe jakinarazi ditu.</string>
- <string name="error_nfc_iso_dep_not_supported">Etiketak ez du sostengatzen ISO-DEP (ISO 14443-4)</string>
- <string name="error_nfc_try_again">Saitu berriro</string>
+ <string name="security_token_error_terminated">YubiKey amaiera egoeran.</string>
+ <string name="security_token_error_wrong_length">Sartutako PIN-a laburregia da. PIN-ak gutxienez 6 digituko luzera du.</string>
+ <string name="security_token_error_conditions_not_satisfied">Ez dira erabilpen baldintzak asetu.</string>
+ <string name="security_token_error_security_not_satisfied">Ez da segurtasun egoera asetu.</string>
+ <string name="security_token_error_authentication_blocked">PIN-a blokeatuta saiakera gehiegiren ondoren.</string>
+ <string name="security_token_error_data_not_found">Giltza edo objetua ez da aurkitu.</string>
+ <string name="security_token_error_unknown">Akats Ezezaguna</string>
+ <string name="security_token_error_bad_data">YubiKeyk datu baliogabeak jakinarazi ditu.</string>
+ <string name="security_token_error_chaining_error">YubiKeyk itxaroten zuen azken agindua kate batean.</string>
+ <string name="security_token_error_header">YubiKeyk %s byte baliogabe jakinarazi ditu.</string>
+ <string name="security_token_error_iso_dep_not_supported">Etiketak ez du sostengatzen ISO-DEP (ISO 14443-4)</string>
+ <string name="security_token_error_try_again">Saitu berriro</string>
<string name="error_pin_wrong">PIN-a okerra da!</string>
<string name="error_temp_file">Akatsa aldibaterako agiria sortzerakoan.</string>
<string name="btn_delete_original">Ezabatu jatorrizko agiria</string>
diff --git a/OpenKeychain/src/main/res/values-fa/strings.xml b/OpenKeychain/src/main/res/values-fa/strings.xml
index 3f18ac342..1a3317ec5 100644
--- a/OpenKeychain/src/main/res/values-fa/strings.xml
+++ b/OpenKeychain/src/main/res/values-fa/strings.xml
@@ -34,7 +34,7 @@
<string name="title_manage_my_keys">مدیریت کلیدهام</string>
<!--section-->
<string name="section_user_ids">هویت‌ها</string>
- <string name="section_yubikey">کلید Yubi</string>
+ <string name="section_security_token">کلید Yubi</string>
<string name="section_should_you_trust">آیا به این کلید اعتماد دارید؟</string>
<string name="section_keys">زیرکلیدها</string>
<string name="section_gui">رابط</string>
@@ -104,7 +104,7 @@
<string name="label_file_ascii_armor">فعال‌کردن ASCII Armor</string>
<string name="label_write_version_header">به دیگران اطلاع دهید که شما از OpenKeyChain استفاده می‌کنید</string>
<string name="label_write_version_header_summary">عبارت \'OpenKeychain v2.7\' را در امضاها، متن رمزگذاری‌شده و کلیدها می‌نویسید</string>
- <string name="label_use_num_keypad_for_yubikey_pin">از صفحه‌کلیدِ شماره‌ای برای وارد کردن رمز کلیدِ Yubi استفاده کن</string>
+ <string name="label_use_num_keypad_for_security_token_pin">از صفحه‌کلیدِ شماره‌ای برای وارد کردن رمز کلیدِ Yubi استفاده کن</string>
<string name="label_asymmetric_from">امضاء با:</string>
<string name="label_to">رمزگذاری به:</string>
<string name="label_delete_after_encryption">حذف فایل‌ها پس از رمزگذاری</string>
diff --git a/OpenKeychain/src/main/res/values-fi/strings.xml b/OpenKeychain/src/main/res/values-fi/strings.xml
index ed3bf2f95..054c61bc4 100644
--- a/OpenKeychain/src/main/res/values-fi/strings.xml
+++ b/OpenKeychain/src/main/res/values-fi/strings.xml
@@ -32,7 +32,7 @@
<string name="title_manage_my_keys">Hallitse avaimiani</string>
<!--section-->
<string name="section_user_ids">Identiteetit</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_keys">Aliavaimet</string>
<string name="section_gui">Käyttöliittymä</string>
<string name="section_experimental_features">Kokeelliset ominaisuudet</string>
@@ -95,7 +95,7 @@
<string name="label_file_ascii_armor">Käytä ASCII Armoria</string>
<string name="label_write_version_header">Anna muiden tietää että käytät OpenKeychainia</string>
<string name="label_write_version_header_summary">Kirjoittaa \'OpenKeychain v2.7\' OpenPGP-allekirjoituksiin, kryptattuun tekstiin sekä vietyihin avaimiin</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Käytä numeerista näppäimistöä YuniKey PIN:iin</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Käytä numeerista näppäimistöä YuniKey PIN:iin</string>
<string name="label_to">Salaa:</string>
<string name="label_delete_after_decryption">Poista salauksen purkamisen jälkeen</string>
<string name="label_encryption_algorithm">Salausalgoritmi</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 506cf2af9..7748b66b7 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">Gérer mes clefs</string>
<!--section-->
<string name="section_user_ids">identités</string>
- <string name="section_yubikey">Yubikey</string>
+ <string name="section_security_token">Yubikey</string>
<string name="section_linked_system_contact">Contact système relié</string>
<string name="section_keybase_proofs">Preuves keybase.io</string>
<string name="section_should_you_trust">Devriez-vous faire confiance à cette clef ?</string>
@@ -130,7 +130,7 @@
<string name="label_file_ascii_armor">Activer l\'armure ASCII</string>
<string name="label_write_version_header">Faire savoir aux autres que vous utilisez OpenKeychain</string>
<string name="label_write_version_header_summary">Ajoute « OpenKeychain v2.7 » aux signatures OpenPGP, aux cryptogrammes et aux clefs exportées</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Utiliser le pavé numérique pour le NIP de la Yubikey</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Utiliser le pavé numérique pour le NIP de la Yubikey</string>
<string name="label_asymmetric_from">Signer avec :</string>
<string name="label_to">Chiffrer pour :</string>
<string name="label_delete_after_encryption">Supprimer les fichiers après chiffrement</string>
@@ -266,10 +266,10 @@
<string name="passphrase_for_backup">Saisir le code de sauvegarde</string>
<string name="passphrase_for">Saisir le mot de passe pour « %s »</string>
<string name="pin_for">Saisir le NIP pour « %s »</string>
- <string name="yubikey_pin_for">Saisir le NIP pour accéder à la Yubikey pour « %s »</string>
- <string name="nfc_text">Tenez la Yubikey contre le logo NFC au dos de votre appareil.</string>
- <string name="nfc_wait">Gardez la Yubikey contre le dos !</string>
- <string name="nfc_finished">Retirez la Yubikey maintenant.</string>
+ <string name="security_token_pin_for">Saisir le NIP pour accéder à la Yubikey pour « %s »</string>
+ <string name="security_token_nfc_text">Tenez la Yubikey contre le logo NFC au dos de votre appareil.</string>
+ <string name="security_token_nfc_wait">Gardez la Yubikey contre le dos !</string>
+ <string name="security_token_nfc_finished">Retirez la Yubikey maintenant.</string>
<string name="file_delete_confirmation_title">Supprimer les fichiers originaux ?</string>
<string name="file_delete_confirmation">Les fichiers suivants seront détruits : %s</string>
<string name="file_delete_successful">%1$d fichiers sur %2$d ont déjà été supprimés. %3$s</string>
@@ -664,9 +664,9 @@
<string name="edit_key_select_flag">Veuillez sélectionner au moins un drapeau !</string>
<string name="edit_key_error_add_identity">Ajouter au moins une identité !</string>
<string name="edit_key_error_add_subkey">Ajouter au moins une sous-clef !</string>
- <string name="edit_key_error_bad_nfc_algo">L’algorithme n\'est pas pris en charge par cette carte à puce ! </string>
- <string name="edit_key_error_bad_nfc_size">La taille de clef n\'est pas prise en charge par la carte à puce !</string>
- <string name="edit_key_error_bad_nfc_stripped">Impossible de déplacer la clef vers la carte à puce (soit dépouillée, soit « dévier-vers-la-carte ») !</string>
+ <string name="edit_key_error_bad_security_token_algo">L’algorithme n\'est pas pris en charge par cette carte à puce ! </string>
+ <string name="edit_key_error_bad_security_token_size">La taille de clef n\'est pas prise en charge par la carte à puce !</string>
+ <string name="edit_key_error_bad_security_token_stripped">Impossible de déplacer la clef vers la carte à puce (soit dépouillée, soit « dévier-vers-la-carte ») !</string>
<!--Create key-->
<string name="create_key_upload">Synchroniser avec l\'Internet</string>
<string name="create_key_empty">Ce champ est exigé</string>
@@ -1323,10 +1323,10 @@
<string name="first_time_text1">Reprenez le contrôle de votre vie privée avec OpenKeychain |</string>
<string name="first_time_create_key">Créer ma clef</string>
<string name="first_time_import_key">Importer la clef d\'un fichier</string>
- <string name="first_time_yubikey">Utiliser la Yubikey NEO</string>
+ <string name="first_time_security_token">Utiliser la Yubikey NEO</string>
<string name="first_time_skip">Ignorer le paramétrage</string>
- <string name="first_time_blank_yubikey">Voulez-vous utiliser cette Yubikey NEO vide avec OpenKeychain ?\n\nVeuillez retirer la Yubikey maintenant, vous serez informé quand elle sera requise de nouveau !</string>
- <string name="first_time_blank_yubikey_yes">Utiliser cette Yubikey</string>
+ <string name="first_time_blank_security_token">Voulez-vous utiliser cette Yubikey NEO vide avec OpenKeychain ?\n\nVeuillez retirer la Yubikey maintenant, vous serez informé quand elle sera requise de nouveau !</string>
+ <string name="first_time_blank_security_token_yes">Utiliser cette Yubikey</string>
<string name="backup_text">Les sauvegardes incluant vos propres clefs ne doivent jamais être partagées avec d\'autres personnes !</string>
<string name="backup_all">Toutes les clefs + vos propres clefs</string>
<string name="backup_public_keys">Toutes les clefs</string>
@@ -1396,44 +1396,44 @@
<string name="nfc_wrong_tag">Mauvaise balise. Veuillez ressayer.</string>
<string name="enable_nfc">Veuillez activer la NFC dans vos paramètres</string>
<string name="no_nfc_support">Cet appareil ne prends pas en charge la NFC</string>
- <string name="nfc_write_succesful">Écrit avec succès sur la balise NFC</string>
+ <string name="nfc_write_successful">Écrit avec succès sur la balise NFC</string>
<string name="unlocked">Déverrouillé</string>
<string name="nfc_settings">Paramètres</string>
- <string name="snack_yubikey_view">Visualiser</string>
- <string name="snack_yubikey_import">Importer</string>
+ <string name="snack_security_token_view">Visualiser</string>
+ <string name="snack_security_token_import">Importer</string>
<string name="button_bind_key">Relier la clef</string>
- <string name="yubikey_serno">No de série : %s</string>
- <string name="yubikey_key_holder">Détenteur de la clef :</string>
- <string name="yubikey_key_holder_not_set"><![CDATA[Détenteur de la clef : <not set>]]></string>
- <string name="yubikey_status_bound">La Yubikey correspond et est reliée à la clef</string>
- <string name="yubikey_status_unbound">La Yubikey correspond et peut être reliée à la clef</string>
- <string name="yubikey_status_partly">La Yubikey correspond et est partiellement reliée à la clef</string>
- <string name="yubikey_create">Tenez la Yubikey contre le dos de votre appareil.</string>
- <string name="yubikey_reset_or_import">Cette Yubikey contient déjà une clef. Vous pouvez importer la clef grâce au nuage, ou réinitialiser la Yubikey.</string>
+ <string name="security_token_serial_no">No de série : %s</string>
+ <string name="security_token_key_holder">Détenteur de la clef :</string>
+ <string name="security_token_key_holder_not_set"><![CDATA[Détenteur de la clef : <not set>]]></string>
+ <string name="security_token_status_bound">La Yubikey correspond et est reliée à la clef</string>
+ <string name="security_token_status_unbound">La Yubikey correspond et peut être reliée à la clef</string>
+ <string name="security_token_status_partly">La Yubikey correspond et est partiellement reliée à la clef</string>
+ <string name="security_token_create">Tenez la Yubikey contre le dos de votre appareil.</string>
+ <string name="security_token_reset_or_import">Cette Yubikey contient déjà une clef. Vous pouvez importer la clef grâce au nuage, ou réinitialiser la Yubikey.</string>
<string name="btn_import">Importer</string>
<string name="btn_reset">Réinitialiser</string>
- <string name="yubikey_import_radio">Importer la clef</string>
- <string name="yubikey_reset_radio">Réinitialiser la Yubikey</string>
- <string name="yubikey_reset_warning">La réinitialisation de la Yubikey détruit complètement les clefs qu\'elle contient. Par la suite, vous ne pourrez plus déchiffrer les messages et les fichiers chiffrés avec cette clef !</string>
- <string name="snack_yubi_other">Une clef différente est stockée sur la Yubikey !</string>
- <string name="error_nfc">Erreur NFC ; %s</string>
- <plurals name="error_pin">
+ <string name="security_token_import_radio">Importer la clef</string>
+ <string name="security_token_reset_radio">Réinitialiser la Yubikey</string>
+ <string name="security_token_reset_warning">La réinitialisation de la Yubikey détruit complètement les clefs qu\'elle contient. Par la suite, vous ne pourrez plus déchiffrer les messages et les fichiers chiffrés avec cette clef !</string>
+ <string name="snack_security_token_other">Une clef différente est stockée sur la Yubikey !</string>
+ <string name="security_token_error">Erreur NFC ; %s</string>
+ <plurals name="security_token_error_pin">
<item quantity="one">NIP erroné !\nil reste %d essai.</item>
<item quantity="other">NIP erroné !\nil reste %d essais.</item>
</plurals>
- <string name="error_nfc_terminated">La Yubikey est en état de fin d\'opération.</string>
- <string name="error_nfc_wrong_length">Le NIP saisi est trop court. Les NIP comportent au moins 6 chiffres.</string>
- <string name="error_nfc_conditions_not_satisfied">Les conditions d\'utilisation ne sont pas satisfaites.</string>
- <string name="error_nfc_security_not_satisfied">L\'état de sécurité n\'est pas satisfait.</string>
- <string name="error_nfc_authentication_blocked">NIP bloqué après trop d\'essais.</string>
- <string name="error_nfc_data_not_found">Clef ou objet introuvable.</string>
- <string name="error_nfc_unknown">Erreur inconnue</string>
- <string name="error_nfc_bad_data">La Yubikey a signalé des données invalides.</string>
- <string name="error_nfc_chaining_error">La Yubikey attendait la dernière commande d\'une chaîne.</string>
- <string name="error_nfc_header">La Yubikey a signalé %s bytes invalides.</string>
- <string name="error_nfc_tag_lost">La Yubikey a été retirée trop tôt. Gardez la Yubikey contre le dos jusqu\'à la fin de l\'opération.</string>
- <string name="error_nfc_iso_dep_not_supported">La balise ne prend pas en charge ISO-DEP (ISO 14443-4)</string>
- <string name="error_nfc_try_again">Ressayer</string>
+ <string name="security_token_error_terminated">La Yubikey est en état de fin d\'opération.</string>
+ <string name="security_token_error_wrong_length">Le NIP saisi est trop court. Les NIP comportent au moins 6 chiffres.</string>
+ <string name="security_token_error_conditions_not_satisfied">Les conditions d\'utilisation ne sont pas satisfaites.</string>
+ <string name="security_token_error_security_not_satisfied">L\'état de sécurité n\'est pas satisfait.</string>
+ <string name="security_token_error_authentication_blocked">NIP bloqué après trop d\'essais.</string>
+ <string name="security_token_error_data_not_found">Clef ou objet introuvable.</string>
+ <string name="security_token_error_unknown">Erreur inconnue</string>
+ <string name="security_token_error_bad_data">La Yubikey a signalé des données invalides.</string>
+ <string name="security_token_error_chaining_error">La Yubikey attendait la dernière commande d\'une chaîne.</string>
+ <string name="security_token_error_header">La Yubikey a signalé %s bytes invalides.</string>
+ <string name="security_token_error_tag_lost">La Yubikey a été retirée trop tôt. Gardez la Yubikey contre le dos jusqu\'à la fin de l\'opération.</string>
+ <string name="security_token_error_iso_dep_not_supported">La balise ne prend pas en charge ISO-DEP (ISO 14443-4)</string>
+ <string name="security_token_error_try_again">Ressayer</string>
<string name="error_pin_wrong">Le NIP est erroné !</string>
<string name="error_temp_file">Erreur de création du fichier temporaire.</string>
<string name="btn_delete_original">Supprimer le fichier original</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 8a9fc394f..00dbd7cee 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -35,7 +35,7 @@
<string name="title_manage_my_keys">Gestisci le mie chiavi</string>
<!--section-->
<string name="section_user_ids">Identità</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_should_you_trust">Ci si potrà fidare di questa chiave?</string>
<string name="section_proof_details">Verifica prova</string>
<string name="section_keys">Sottochiavi</string>
@@ -114,7 +114,7 @@
<string name="label_file_ascii_armor">Abilita Armatura ASCII</string>
<string name="label_write_version_header">Fai sapere agli altri che utilizzi OpenKeychain</string>
<string name="label_write_version_header_summary">Scrive \'OpenKeychain v2.7\' nelle firme OpenPGP, testi cifrati e chiavi esportate</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Utilizza la tastiera numerica per il PIN di YubiKey</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Utilizza la tastiera numerica per il PIN di YubiKey</string>
<string name="label_to">Codifica per:</string>
<string name="label_delete_after_encryption">Elimina file dopo la codifica</string>
<string name="label_delete_after_decryption">Elimina dopo la decodifica</string>
@@ -212,7 +212,7 @@
<string name="passphrase_must_not_be_empty">Si prega di inserire una password.</string>
<string name="passphrase_for">Inserisci la password per \'%s\'</string>
<string name="pin_for">Inserisci il PIN per \'%s\'</string>
- <string name="yubikey_pin_for">Inserisci il PIN per accedere a YubiKey con \'%s\'</string>
+ <string name="security_token_pin_for">Inserisci il PIN per accedere a YubiKey con \'%s\'</string>
<string name="file_delete_confirmation_title">Eliminare i file originali?</string>
<string name="file_delete_confirmation">I seguenti file verranno cancellati:%s</string>
<string name="file_delete_successful">%1$d di %2$d file sono stati cancellati.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 5b1b3e9ef..8bf73a4b2 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">自分の鍵の管理</string>
<!--section-->
<string name="section_user_ids">ユーザID</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">リンクしているシステムの連絡先</string>
<string name="section_keybase_proofs">Keybase.io 検証</string>
<string name="section_should_you_trust">この鍵を信頼しますか?</string>
@@ -130,7 +130,7 @@
<string name="label_file_ascii_armor">アスキー形式ファイルを有効</string>
<string name="label_write_version_header">OpenKeychainの利用を通知する</string>
<string name="label_write_version_header_summary">OpenPGPの 署名、暗号文、そしてエクスポートした鍵に \'OpenKeychain v2.7\' と書くようになりました</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Yubikey PINで数字キーパッドを使う</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Yubikey PINで数字キーパッドを使う</string>
<string name="label_asymmetric_from">署名:</string>
<string name="label_to">暗号化:</string>
<string name="label_delete_after_encryption">暗号化後にファイル削除</string>
@@ -260,10 +260,10 @@
<string name="passphrase_for_backup">バックアップコードの入力</string>
<string name="passphrase_for">\'%s\' にパスワードを入れてください</string>
<string name="pin_for">\'%s\' にPINを入力してください</string>
- <string name="yubikey_pin_for">\'%s\' の Yubikey にアクセスするためのPINを入力してください</string>
- <string name="nfc_text">YubiKeyをあなたのデバイスの背中にあるNFCの印に対向させて固定してください。</string>
- <string name="nfc_wait">YubiKeyを背後に維持してください!</string>
- <string name="nfc_finished">YubiKeyを取り外してください。</string>
+ <string name="security_token_pin_for">\'%s\' の Yubikey にアクセスするためのPINを入力してください</string>
+ <string name="security_token_nfc_text">YubiKeyをあなたのデバイスの背中にあるNFCの印に対向させて固定してください。</string>
+ <string name="security_token_nfc_wait">YubiKeyを背後に維持してください!</string>
+ <string name="security_token_nfc_finished">YubiKeyを取り外してください。</string>
<string name="file_delete_confirmation_title">オリジナルのファイルを削除しますか?</string>
<string name="file_delete_confirmation">以下のファイルを削除します:%s</string>
<string name="file_delete_successful">%1$d 中の %2$d のファイルの削除が完了しました。%3$s</string>
@@ -651,9 +651,9 @@
<string name="edit_key_select_flag">最低1つフラグを選択してください!</string>
<string name="edit_key_error_add_identity">最低でも1つのユーザIDを追加!</string>
<string name="edit_key_error_add_subkey">最低でも1つの副鍵を追加!</string>
- <string name="edit_key_error_bad_nfc_algo">スマートカードではアルゴリズムをサポートしません!</string>
- <string name="edit_key_error_bad_nfc_size">スマートカードでは鍵サイズをサポートしません!</string>
- <string name="edit_key_error_bad_nfc_stripped">鍵をスマートカードに移動できません(ストリップしてあるか、\'カードへ迂回\'がない)</string>
+ <string name="edit_key_error_bad_security_token_algo">スマートカードではアルゴリズムをサポートしません!</string>
+ <string name="edit_key_error_bad_security_token_size">スマートカードでは鍵サイズをサポートしません!</string>
+ <string name="edit_key_error_bad_security_token_stripped">鍵をスマートカードに移動できません(ストリップしてあるか、\'カードへ迂回\'がない)</string>
<!--Create key-->
<string name="create_key_upload">インターネットでの同期</string>
<string name="create_key_empty">このフィールドは必須です</string>
@@ -1294,10 +1294,10 @@
<string name="first_time_text1">OpenKeychainであなたのプライバシーを取り戻しましょう!</string>
<string name="first_time_create_key">自分のキーを作る</string>
<string name="first_time_import_key">ファイルから鍵をインポート</string>
- <string name="first_time_yubikey">YubiKey NEOを使用する</string>
+ <string name="first_time_security_token">YubiKey NEOを使用する</string>
<string name="first_time_skip">セットアップをスキップ</string>
- <string name="first_time_blank_yubikey">OpenKeychainで、この空白のYubiKey NEOを使用しますか?\n\nYubiKeyを取り除いてください。再度必要になったときにプロンプトが表示されます!</string>
- <string name="first_time_blank_yubikey_yes">YubiKeyを使用する</string>
+ <string name="first_time_blank_security_token">OpenKeychainで、この空白のYubiKey NEOを使用しますか?\n\nYubiKeyを取り除いてください。再度必要になったときにプロンプトが表示されます!</string>
+ <string name="first_time_blank_security_token_yes">YubiKeyを使用する</string>
<string name="backup_text">あなた自身の鍵を含んだバックアップは、決して他の人と共有しないでください!</string>
<string name="backup_all">すべての鍵とあなた所有の鍵</string>
<string name="backup_public_keys">すべての鍵</string>
@@ -1366,43 +1366,43 @@
<string name="nfc_wrong_tag">ダメなタグ。再度実施してください。</string>
<string name="enable_nfc">設定からNFCを有効にしてください</string>
<string name="no_nfc_support">この装置ではNFCをサポートしていません</string>
- <string name="nfc_write_succesful">NFCタグに書けました!</string>
+ <string name="nfc_write_successful">NFCタグに書けました!</string>
<string name="unlocked">アンロック</string>
<string name="nfc_settings">設定</string>
- <string name="snack_yubikey_view">閲覧</string>
- <string name="snack_yubikey_import">インポート</string>
+ <string name="snack_security_token_view">閲覧</string>
+ <string name="snack_security_token_import">インポート</string>
<string name="button_bind_key">鍵と紐付け</string>
- <string name="yubikey_serno">シリアルナンバー: %s</string>
- <string name="yubikey_key_holder">鍵ホルダ:</string>
- <string name="yubikey_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
- <string name="yubikey_status_bound">鍵がYubiKeyがマッチし紐付いている</string>
- <string name="yubikey_status_unbound">YubiKeyがマッチ、鍵に紐付けることができる</string>
- <string name="yubikey_status_partly">YubiKeyがマッチ、鍵に部分的に紐付いている</string>
- <string name="yubikey_create">あなたのデバイスの背面にYubiKeyを固定してください。</string>
- <string name="yubikey_reset_or_import">このYubiKeyは既に鍵を含んでいます。クラウドを使用して鍵をインポートしたり、YubiKeyをリセットすることができます。</string>
+ <string name="security_token_serial_no">シリアルナンバー: %s</string>
+ <string name="security_token_key_holder">鍵ホルダ:</string>
+ <string name="security_token_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
+ <string name="security_token_status_bound">鍵がYubiKeyがマッチし紐付いている</string>
+ <string name="security_token_status_unbound">YubiKeyがマッチ、鍵に紐付けることができる</string>
+ <string name="security_token_status_partly">YubiKeyがマッチ、鍵に部分的に紐付いている</string>
+ <string name="security_token_create">あなたのデバイスの背面にYubiKeyを固定してください。</string>
+ <string name="security_token_reset_or_import">このYubiKeyは既に鍵を含んでいます。クラウドを使用して鍵をインポートしたり、YubiKeyをリセットすることができます。</string>
<string name="btn_import">インポート</string>
<string name="btn_reset">リセット</string>
- <string name="yubikey_import_radio">鍵のインポート</string>
- <string name="yubikey_reset_radio">YubiKeyをリセット</string>
- <string name="yubikey_reset_warning">YubiKeyをリセットすると、その上のキーを完全に破壊します。その後は、この鍵で暗号化されたメッセージ/ファイルを復号化することができなくなります!</string>
- <string name="snack_yubi_other">違う鍵がYubiKeyに格納されています!</string>
- <string name="error_nfc">NFCエラー: %s</string>
- <plurals name="error_pin">
+ <string name="security_token_import_radio">鍵のインポート</string>
+ <string name="security_token_reset_radio">YubiKeyをリセット</string>
+ <string name="security_token_reset_warning">YubiKeyをリセットすると、その上のキーを完全に破壊します。その後は、この鍵で暗号化されたメッセージ/ファイルを復号化することができなくなります!</string>
+ <string name="snack_security_token_other">違う鍵がYubiKeyに格納されています!</string>
+ <string name="security_token_error">NFCエラー: %s</string>
+ <plurals name="security_token_error_pin">
<item quantity="other">PINが正しくありません! 再挑戦はあと%d回です。</item>
</plurals>
- <string name="error_nfc_terminated">YubiKeyが完了状態</string>
- <string name="error_nfc_wrong_length">入力されたPINが短すぎます。 PINの長さは少なくとも6桁にします。</string>
- <string name="error_nfc_conditions_not_satisfied">使用条件を満たしていません。</string>
- <string name="error_nfc_security_not_satisfied">セキュリティステータスを満していません。</string>
- <string name="error_nfc_authentication_blocked">試行回数が多すぎるためPINがブロックされています。</string>
- <string name="error_nfc_data_not_found">鍵もしくはオブジェクトが見当りません。</string>
- <string name="error_nfc_unknown">不明なエラー</string>
- <string name="error_nfc_bad_data">YubiKeyが不正なデータを報告した。</string>
- <string name="error_nfc_chaining_error">YubiKeyがチェーン中の最後のコマンドを待っています。</string>
- <string name="error_nfc_header">YubiKeyが不正な%sバイトを報告。</string>
- <string name="error_nfc_tag_lost">YubiKeyを取り出すのが早すぎました。操作が完了するまでYubiKeyを戻してしてください。</string>
- <string name="error_nfc_iso_dep_not_supported">タグは ISO-DEP (ISO 14443-4) をサポートしていません</string>
- <string name="error_nfc_try_again">再実行</string>
+ <string name="security_token_error_terminated">YubiKeyが完了状態</string>
+ <string name="security_token_error_wrong_length">入力されたPINが短すぎます。 PINの長さは少なくとも6桁にします。</string>
+ <string name="security_token_error_conditions_not_satisfied">使用条件を満たしていません。</string>
+ <string name="security_token_error_security_not_satisfied">セキュリティステータスを満していません。</string>
+ <string name="security_token_error_authentication_blocked">試行回数が多すぎるためPINがブロックされています。</string>
+ <string name="security_token_error_data_not_found">鍵もしくはオブジェクトが見当りません。</string>
+ <string name="security_token_error_unknown">不明なエラー</string>
+ <string name="security_token_error_bad_data">YubiKeyが不正なデータを報告した。</string>
+ <string name="security_token_error_chaining_error">YubiKeyがチェーン中の最後のコマンドを待っています。</string>
+ <string name="security_token_error_header">YubiKeyが不正な%sバイトを報告。</string>
+ <string name="security_token_error_tag_lost">YubiKeyを取り出すのが早すぎました。操作が完了するまでYubiKeyを戻してしてください。</string>
+ <string name="security_token_error_iso_dep_not_supported">タグは ISO-DEP (ISO 14443-4) をサポートしていません</string>
+ <string name="security_token_error_try_again">再実行</string>
<string name="error_pin_wrong">PINが正しくありません!</string>
<string name="error_temp_file">一時ファイルの生成でエラーしました。</string>
<string name="btn_delete_original">オリジナルのファイルを削除します</string>
diff --git a/OpenKeychain/src/main/res/values-ko/strings.xml b/OpenKeychain/src/main/res/values-ko/strings.xml
index e8d9eb5c6..fc4f2cc7d 100644
--- a/OpenKeychain/src/main/res/values-ko/strings.xml
+++ b/OpenKeychain/src/main/res/values-ko/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">내 키 관리</string>
<!--section-->
<string name="section_user_ids">신원</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">연결된 시스템 연락처</string>
<string name="section_keybase_proofs">Keybase.io 증명</string>
<string name="section_should_you_trust">이 키를 믿어야 할까요?</string>
@@ -127,7 +127,7 @@
<string name="label_file_ascii_armor">ASCII 표시 활성화</string>
<string name="label_write_version_header">다른 사람에게 OpenKeychain을 사용하고 있다는 걸 알리세요</string>
<string name="label_write_version_header_summary">\'OpenKeychain v2.7\'을 OpenPGP 서명, 암호화 텍스트, 내보낸 키에 쓰기</string>
- <string name="label_use_num_keypad_for_yubikey_pin">YubiKey PIN 입력에 숫자 키패드 사용</string>
+ <string name="label_use_num_keypad_for_security_token_pin">YubiKey PIN 입력에 숫자 키패드 사용</string>
<string name="label_asymmetric_from">다음으로 서명:</string>
<string name="label_to">다음에게 암호화:</string>
<string name="label_delete_after_encryption">암호화 후 파일들 삭제</string>
@@ -257,10 +257,10 @@
<string name="passphrase_for_backup">백업 코드 입력</string>
<string name="passphrase_for">\'%s\'을(를) 위해 암호를 입력 해 주세요</string>
<string name="pin_for">\'%s\'을(를) 위해 PIN을 입력 해 주세요</string>
- <string name="yubikey_pin_for">\'%s\'를 위해 YubiKey를 엑세스 하기 위한 PIN을 입력 해 주세요</string>
- <string name="nfc_text">YubiKey를 장치 뒤의 NFC 표시에 대어 주세요</string>
- <string name="nfc_wait">YubiKey를 뒷면에 계속 대고 있으세요!</string>
- <string name="nfc_finished">이제 YubiKey를 떼어도 됩니다.</string>
+ <string name="security_token_pin_for">\'%s\'를 위해 YubiKey를 엑세스 하기 위한 PIN을 입력 해 주세요</string>
+ <string name="security_token_nfc_text">YubiKey를 장치 뒤의 NFC 표시에 대어 주세요</string>
+ <string name="security_token_nfc_wait">YubiKey를 뒷면에 계속 대고 있으세요!</string>
+ <string name="security_token_nfc_finished">이제 YubiKey를 떼어도 됩니다.</string>
<string name="file_delete_confirmation_title">원본 파일을 삭제할까요?</string>
<string name="file_delete_confirmation">다음 파일이 삭제 될 것입니다:%s</string>
<string name="file_delete_successful">%2$d개 중 %1$d개의 파일이 삭제되었습니다.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index 932832f60..a7f0d73fc 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -32,7 +32,7 @@
<string name="title_manage_my_keys">Beheer mijn sleutels</string>
<!--section-->
<string name="section_user_ids">Identiteiten</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">Verbonden systeemcontact</string>
<string name="section_should_you_trust">Zou je deze sleutel vertrouwen?</string>
<string name="section_proof_details">Bewijs van verificatie</string>
@@ -106,7 +106,7 @@
<string name="label_file_ascii_armor">ASCII Armor aanzetten</string>
<string name="label_write_version_header">Laat anderen weten dat je OpenKeychain gebruikt</string>
<string name="label_write_version_header_summary">Voegt \'OpenKeychain v2.7\' toe aan OpenPGP ondertekeningen, cijfertekst en geëxporteerde sleutels</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Gebruik numeriek toetsenbord voor YubiKey PIN</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Gebruik numeriek toetsenbord voor YubiKey PIN</string>
<string name="label_asymmetric_from">Ondertekenen met:</string>
<string name="label_to">Versleutelen naar:</string>
<string name="label_delete_after_encryption">Verwijder bestanden na versleuteling</string>
@@ -212,10 +212,10 @@
<string name="passphrase_must_not_be_empty">Geef een wachtwoord in.</string>
<string name="passphrase_for">Voer het wachtwoord in voor \'%s\'</string>
<string name="pin_for">Voer PIN in voor \'%s\'</string>
- <string name="yubikey_pin_for">Voer PIN in om toegang te verkrijgen tot YubiKey voor \'%s\'</string>
- <string name="nfc_text">Hou de YubiKey tegen de NFC-aanduiding aan de achterkant van je toestel.</string>
- <string name="nfc_wait">Hou de YubiKey tegen de achterkant!</string>
- <string name="nfc_finished">Neem de YubiKey nu weg.</string>
+ <string name="security_token_pin_for">Voer PIN in om toegang te verkrijgen tot YubiKey voor \'%s\'</string>
+ <string name="security_token_nfc_text">Hou de YubiKey tegen de NFC-aanduiding aan de achterkant van je toestel.</string>
+ <string name="security_token_nfc_wait">Hou de YubiKey tegen de achterkant!</string>
+ <string name="security_token_nfc_finished">Neem de YubiKey nu weg.</string>
<string name="file_delete_confirmation_title">Oorspronkelijke bestanden verwijderen?</string>
<string name="file_delete_confirmation">De volgende bestanden zullen worden verwijderd:%s</string>
<string name="file_delete_successful">%1$d van %2$d bestanden zijn verwijderd.%3$s</string>
@@ -554,9 +554,9 @@
<string name="edit_key_select_flag">Gelieve minstens een vlag te selecteren!</string>
<string name="edit_key_error_add_identity">Voeg minstens een identiteit toe!</string>
<string name="edit_key_error_add_subkey">Voeg minstens een subsleutel toe!</string>
- <string name="edit_key_error_bad_nfc_algo">Algoritme wordt niet ondersteund door smartcard!</string>
- <string name="edit_key_error_bad_nfc_size">Sleutelgrootte wordt niet ondersteund door smartcard!</string>
- <string name="edit_key_error_bad_nfc_stripped">Kan sleutel niet verplaatsen naar smartcard (ofwel gestript ofwel \'doorschakelen-naar-kaart\')!</string>
+ <string name="edit_key_error_bad_security_token_algo">Algoritme wordt niet ondersteund door smartcard!</string>
+ <string name="edit_key_error_bad_security_token_size">Sleutelgrootte wordt niet ondersteund door smartcard!</string>
+ <string name="edit_key_error_bad_security_token_stripped">Kan sleutel niet verplaatsen naar smartcard (ofwel gestript ofwel \'doorschakelen-naar-kaart\')!</string>
<!--Create key-->
<string name="create_key_empty">Dit veld moet ingevuld worden</string>
<string name="create_key_passphrases_not_equal">Wachtwoorden komen niet overeen</string>
@@ -1105,10 +1105,10 @@
<string name="first_time_text1">Neem je privacy terug met OpenKeychain!</string>
<string name="first_time_create_key">Mijn sleutel aanmaken</string>
<string name="first_time_import_key">Sleutel importeren uit bestand</string>
- <string name="first_time_yubikey">Gebruik YubiKey NEO</string>
+ <string name="first_time_security_token">Gebruik YubiKey NEO</string>
<string name="first_time_skip">Setup overslaan</string>
- <string name="first_time_blank_yubikey">Wil je deze lege YubiKey NEO gebruiken met OpenKeychain?\n\nNeem de YubiKey nu weg, je zal gevraagd worden deze terug boven te halen wanneer nodig!</string>
- <string name="first_time_blank_yubikey_yes">Gebruik deze YubiKey</string>
+ <string name="first_time_blank_security_token">Wil je deze lege YubiKey NEO gebruiken met OpenKeychain?\n\nNeem de YubiKey nu weg, je zal gevraagd worden deze terug boven te halen wanneer nodig!</string>
+ <string name="first_time_blank_security_token_yes">Gebruik deze YubiKey</string>
<string name="backup_all">Alle sleutels + je eigen sleutels</string>
<string name="backup_public_keys">Alle sleutels</string>
<!--unsorted-->
@@ -1168,33 +1168,33 @@
<string name="nfc_wrong_tag">Verkeerde tag. Gelieve opnieuw te proberen.</string>
<string name="enable_nfc">Gelieve NFC in je instellingen te activeren</string>
<string name="no_nfc_support">Dit toestel biedt geen ondersteuning voor NFC</string>
- <string name="nfc_write_succesful">Succesvol geschreven op NFC-tag</string>
+ <string name="nfc_write_successful">Succesvol geschreven op NFC-tag</string>
<string name="unlocked">Ontgrendeld</string>
<string name="nfc_settings">Instellingen</string>
- <string name="snack_yubikey_view">Bekijken</string>
- <string name="snack_yubikey_import">Importeren</string>
+ <string name="snack_security_token_view">Bekijken</string>
+ <string name="snack_security_token_import">Importeren</string>
<string name="button_bind_key">Sleutel binden</string>
- <string name="yubikey_serno">Serienummer: %s</string>
- <string name="yubikey_key_holder">Sleutelhouder:</string>
- <string name="yubikey_status_bound">YubiKey komt overeen en is gebonden aan sleutel</string>
- <string name="yubikey_status_unbound">YubiKey komt overeen en kan worden gebonden aan sleutel</string>
- <string name="yubikey_status_partly">YubiKey komt overeen en is gedeeltelijk gebonden aan sleutel</string>
- <string name="yubikey_create">Hou de YubiKey tegen de achterkant van je toestel.</string>
+ <string name="security_token_serial_no">Serienummer: %s</string>
+ <string name="security_token_key_holder">Sleutelhouder:</string>
+ <string name="security_token_status_bound">YubiKey komt overeen en is gebonden aan sleutel</string>
+ <string name="security_token_status_unbound">YubiKey komt overeen en kan worden gebonden aan sleutel</string>
+ <string name="security_token_status_partly">YubiKey komt overeen en is gedeeltelijk gebonden aan sleutel</string>
+ <string name="security_token_create">Hou de YubiKey tegen de achterkant van je toestel.</string>
<string name="btn_import">Importeren</string>
- <string name="snack_yubi_other">Andere sleutel opgeslagen op YubiKey!</string>
- <string name="error_nfc">NFC-fout: %s</string>
- <plurals name="error_pin">
+ <string name="snack_security_token_other">Andere sleutel opgeslagen op YubiKey!</string>
+ <string name="security_token_error">NFC-fout: %s</string>
+ <plurals name="security_token_error_pin">
<item quantity="one">Ongeldige PIN!\n%d resterende poging.</item>
<item quantity="other">Ongeldige PIN!\n%d resterende pogingen.</item>
</plurals>
- <string name="error_nfc_terminated">YubiKey in beëindigingsstaat.</string>
- <string name="error_nfc_wrong_length">Ingevoerde PIN is te kort. PIN\'s zijn minstens 6 tekens lang.</string>
- <string name="error_nfc_conditions_not_satisfied">Gebruiksvoorwaarden niet voldaan.</string>
- <string name="error_nfc_security_not_satisfied">Veiligheidsstatus niet voldaan.</string>
- <string name="error_nfc_authentication_blocked">PIN geblokkeerd na te veel pogingen.</string>
- <string name="error_nfc_data_not_found">Sleutel of object niet gevonden.</string>
- <string name="error_nfc_unknown">Onbekende fout</string>
- <string name="error_nfc_try_again">Opnieuw proberen</string>
+ <string name="security_token_error_terminated">YubiKey in beëindigingsstaat.</string>
+ <string name="security_token_error_wrong_length">Ingevoerde PIN is te kort. PIN\'s zijn minstens 6 tekens lang.</string>
+ <string name="security_token_error_conditions_not_satisfied">Gebruiksvoorwaarden niet voldaan.</string>
+ <string name="security_token_error_security_not_satisfied">Veiligheidsstatus niet voldaan.</string>
+ <string name="security_token_error_authentication_blocked">PIN geblokkeerd na te veel pogingen.</string>
+ <string name="security_token_error_data_not_found">Sleutel of object niet gevonden.</string>
+ <string name="security_token_error_unknown">Onbekende fout</string>
+ <string name="security_token_error_try_again">Opnieuw proberen</string>
<string name="error_temp_file">Fout bij aanmaken van tijdelijk bestand.</string>
<string name="btn_delete_original">Oorspronkelijk bestand verwijderen</string>
<string name="snack_encrypt_filenames_on">Bestandsnamen <b>zijn</b> versleuteld.</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index adb3cf49f..590a98321 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -71,7 +71,7 @@
<string name="label_file_ascii_armor">Włącz ASCII Armor</string>
<string name="label_write_version_header">Niech inni wiedzą, że używasz OpenKeychain</string>
<string name="label_write_version_header_summary">Wpisuje \'\'OpenKeychain v2.7\' do podpisów, szyfrogramów i wyeksportowanych kluczy OpenPGP.</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Użyj klawiatury numerycznej dla PIN-u YubiKey</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Użyj klawiatury numerycznej dla PIN-u YubiKey</string>
<string name="label_to">Szyfruj do:</string>
<string name="label_delete_after_decryption">Usuń po odszyfrowaniu</string>
<string name="label_encryption_algorithm">Algorytm szyfrowania</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 10dd79cba..58ce26dbc 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">Управление ключами</string>
<!--section-->
<string name="section_user_ids">Идентификаторы</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">Связанные контакты</string>
<string name="section_keybase_proofs">Доказательства Keybase.io</string>
<string name="section_should_you_trust">Должны ли Вы доверять этому ключу?</string>
@@ -127,7 +127,7 @@
<string name="label_file_ascii_armor">Использовать ASCII формат</string>
<string name="label_write_version_header">Добавить комментарий об использовании OpenKeychain</string>
<string name="label_write_version_header_summary">Дописывать \'OpenKeychain v2.x\' в OpenPGP подписи, шифры, и экспортируемые ключи</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Использовать цифровую клавиатуру для YubiKey PIN</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Использовать цифровую клавиатуру для YubiKey PIN</string>
<string name="label_asymmetric_from">Подписать:</string>
<string name="label_to">Зашифровать для:</string>
<string name="label_delete_after_encryption">Удалить файлы после шифрования</string>
@@ -258,7 +258,7 @@
<string name="passphrase_for">Введите пароль для \'%s\'</string>
<string name="pin_for">Введите PIN для
\'%s\'</string>
- <string name="yubikey_pin_for">Введите PIN для доступа к YubiKey для
+ <string name="security_token_pin_for">Введите PIN для доступа к YubiKey для
\'%s\'</string>
<string name="file_delete_confirmation_title">Удалить исходные файлы?</string>
<string name="file_delete_confirmation">Следующие файлы будут удалены:%s</string>
@@ -893,7 +893,7 @@
<string name="first_time_text1">Верните вашу приватность с помощью OpenKeychain!</string>
<string name="first_time_create_key">Создать свой ключ</string>
<string name="first_time_import_key">Импорт ключа из файла</string>
- <string name="first_time_yubikey">Использовать YubiKey NEO</string>
+ <string name="first_time_security_token">Использовать YubiKey NEO</string>
<string name="first_time_skip">Пропустить настройку</string>
<!--unsorted-->
<string name="section_certifier_id">Кем подписан</string>
@@ -935,10 +935,10 @@
<!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
<string name="unlocked">Разблокирован</string>
<string name="nfc_settings">Настройки</string>
- <string name="snack_yubikey_view">Просмотр</string>
- <string name="snack_yubikey_import">Импорт</string>
- <string name="yubikey_key_holder">Владелец ключа:</string>
- <string name="error_nfc">Ошибка NFC: %s</string>
+ <string name="snack_security_token_view">Просмотр</string>
+ <string name="snack_security_token_import">Импорт</string>
+ <string name="security_token_key_holder">Владелец ключа:</string>
+ <string name="security_token_error">Ошибка NFC: %s</string>
<!--Other Linked Identity strings-->
<string name="linked_select_2">Пожалуйста, выберите тип:</string>
<string name="section_linked_identities">Связанные идентификаторы</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 697de0984..63a9e844e 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -84,7 +84,7 @@
<string name="label_file_ascii_armor">Omogoči ASCII ovoj</string>
<string name="label_write_version_header">Daj drugim vedeti, da uporabljate OpenKeychain</string>
<string name="label_write_version_header_summary">Zapiše \'OpenKeychain v2.7\' v OpenPGP podpis, šifrirano besedilo in izvožene ključe</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Uporabi numerično tipkovnico za YubiKey PIN kodo</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Uporabi numerično tipkovnico za YubiKey PIN kodo</string>
<string name="label_to">Šifriraj za:</string>
<string name="label_delete_after_encryption">Po dešifriranju izbriši datoteke</string>
<string name="label_delete_after_decryption">Izbriši po dešifriranju</string>
@@ -157,7 +157,7 @@
<!--sentences-->
<string name="no_filemanager_installed">Nimate nameščenega združljivega upravljalnika datotek.</string>
<string name="pin_for">Vnesite PIN kodo za \'%s\'</string>
- <string name="yubikey_pin_for">Vnesite PIN kodo za dostop YubiKey za \'%s\'</string>
+ <string name="security_token_pin_for">Vnesite PIN kodo za dostop YubiKey za \'%s\'</string>
<string name="file_delete_confirmation_title">Izbrišem izvirne datoteke?</string>
<string name="file_delete_confirmation">Izbrisane bodo naslednje datoteke:%s</string>
<string name="file_delete_successful">Izbrisanih je bilo %1$d od %2$d datotek.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
index 8ff26f896..75eb8b0f3 100644
--- a/OpenKeychain/src/main/res/values-sr/strings.xml
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">Управљање мојим кључевима</string>
<!--section-->
<string name="section_user_ids">Идентитети</string>
- <string name="section_yubikey">Јубикључ</string>
+ <string name="section_security_token">Јубикључ</string>
<string name="section_linked_system_contact">Повезани контакт</string>
<string name="section_keybase_proofs">Keybase.io докази</string>
<string name="section_should_you_trust">Смете ли да се поуздате у овај кључ?</string>
@@ -130,7 +130,7 @@
<string name="label_file_ascii_armor">Омогући Аски оклоп</string>
<string name="label_write_version_header">Упиши да користим Отворени кључарник</string>
<string name="label_write_version_header_summary">Уписује „OpenKeychain v3.0“ у ОпенПГП потписе, шифровани текст и извезене кључеве</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Користи бројчану тастатуру за Јубикључ ПИН</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Користи бројчану тастатуру за Јубикључ ПИН</string>
<string name="label_asymmetric_from">Потпиши помоћу:</string>
<string name="label_to">Шифруј за:</string>
<string name="label_delete_after_encryption">Обриши фајлове након шифровања</string>
@@ -266,10 +266,10 @@
<string name="passphrase_for_backup">Унесите кôд за резерву</string>
<string name="passphrase_for">Унесите лозинку за „%s“</string>
<string name="pin_for">Унесите ПИН за „%s“</string>
- <string name="yubikey_pin_for">Унесите ПИН за приступ Јубикључу за „%s“</string>
- <string name="nfc_text">Држите Јубикључ на НФЦ ознаци на полеђини вашег уређаја.</string>
- <string name="nfc_wait">Држите Јубикључ на полеђини!</string>
- <string name="nfc_finished">Склоните сада Јубикључ.</string>
+ <string name="security_token_pin_for">Унесите ПИН за приступ Јубикључу за „%s“</string>
+ <string name="security_token_nfc_text">Држите Јубикључ на НФЦ ознаци на полеђини вашег уређаја.</string>
+ <string name="security_token_nfc_wait">Држите Јубикључ на полеђини!</string>
+ <string name="security_token_nfc_finished">Склоните сада Јубикључ.</string>
<string name="file_delete_confirmation_title">Обрисати оригиналне фајлове?</string>
<string name="file_delete_confirmation">Следећи фајлови ће бити обрисани:%s</string>
<string name="file_delete_successful">%1$d од %2$d фајлова је обрисано.%3$s</string>
@@ -678,9 +678,9 @@
<string name="edit_key_select_flag">Изаберите бар једну заставицу!</string>
<string name="edit_key_error_add_identity">Додајте бар један идентитет!</string>
<string name="edit_key_error_add_subkey">Додајте бар један поткључ!</string>
- <string name="edit_key_error_bad_nfc_algo">Смарт картица не подржава овај алгоритам!</string>
- <string name="edit_key_error_bad_nfc_size">Смарт картица не подржава ову величину кључа!</string>
- <string name="edit_key_error_bad_nfc_stripped">Не могу да преместим кључ на смарт картицу (или је огољен или је „преусмери-на-картицу“)!</string>
+ <string name="edit_key_error_bad_security_token_algo">Смарт картица не подржава овај алгоритам!</string>
+ <string name="edit_key_error_bad_security_token_size">Смарт картица не подржава ову величину кључа!</string>
+ <string name="edit_key_error_bad_security_token_stripped">Не могу да преместим кључ на смарт картицу (или је огољен или је „преусмери-на-картицу“)!</string>
<!--Create key-->
<string name="create_key_upload">Синхронизуј са интернетом</string>
<string name="create_key_empty">Ово поље је обавезно</string>
@@ -1334,10 +1334,10 @@
<string name="first_time_text1">Преузмите вашу приватност помоћу Отвореног кључарника!</string>
<string name="first_time_create_key">Направи ми кључ</string>
<string name="first_time_import_key">Увези кључ из фајла</string>
- <string name="first_time_yubikey">Користи Јубикључ НЕО</string>
+ <string name="first_time_security_token">Користи Јубикључ НЕО</string>
<string name="first_time_skip">Прескочи поставу</string>
- <string name="first_time_blank_yubikey">Желите ли да користите овај празни Јубикључ НЕО са Отвореним кључарником?\n\nСклоните сада Јубикључ, бићете упитани када опет буде потребан!</string>
- <string name="first_time_blank_yubikey_yes">Користи овај Јубикључ</string>
+ <string name="first_time_blank_security_token">Желите ли да користите овај празни Јубикључ НЕО са Отвореним кључарником?\n\nСклоните сада Јубикључ, бићете упитани када опет буде потребан!</string>
+ <string name="first_time_blank_security_token_yes">Користи овај Јубикључ</string>
<string name="backup_text">Резерве које укључују ваше сопствене кључеве никад немојте делити са другима!</string>
<string name="backup_all">Свих кључева + сопствених</string>
<string name="backup_public_keys">Свих кључева</string>
@@ -1406,42 +1406,42 @@
<string name="nfc_wrong_tag">Погрешна ознака. Покушајте поново.</string>
<string name="enable_nfc">Активирајте НФЦ у поставкама</string>
<string name="no_nfc_support">Овај уређај не подржава НФЦ</string>
- <string name="nfc_write_succesful">Успешно уписах на НФЦ ознаку</string>
+ <string name="nfc_write_successful">Успешно уписах на НФЦ ознаку</string>
<string name="unlocked">Откључан</string>
<string name="nfc_settings">Поставке</string>
- <string name="snack_yubikey_view">Прикажи</string>
- <string name="snack_yubikey_import">Увоз</string>
+ <string name="snack_security_token_view">Прикажи</string>
+ <string name="snack_security_token_import">Увоз</string>
<string name="button_bind_key">Повежи кључ</string>
- <string name="yubikey_serno">Серијски број: %s</string>
- <string name="yubikey_key_holder">Власник кључа: </string>
- <string name="yubikey_key_holder_not_set"><![CDATA[Држач кључа: <није постављено>]]></string>
- <string name="yubikey_status_bound">Јубикључ одговара и повезан са кључем</string>
- <string name="yubikey_status_unbound">Јубикључ одговара, може да се повеже са кључем</string>
- <string name="yubikey_status_partly">Јубикључ одговара, делимично повезан са кључем</string>
- <string name="yubikey_create">Држите Јубикључ на полеђини вашег уређаја.</string>
+ <string name="security_token_serial_no">Серијски број: %s</string>
+ <string name="security_token_key_holder">Власник кључа: </string>
+ <string name="security_token_key_holder_not_set"><![CDATA[Држач кључа: <није постављено>]]></string>
+ <string name="security_token_status_bound">Јубикључ одговара и повезан са кључем</string>
+ <string name="security_token_status_unbound">Јубикључ одговара, може да се повеже са кључем</string>
+ <string name="security_token_status_partly">Јубикључ одговара, делимично повезан са кључем</string>
+ <string name="security_token_create">Држите Јубикључ на полеђини вашег уређаја.</string>
<string name="btn_import">Увези</string>
<string name="btn_reset">Ресетуј</string>
- <string name="yubikey_import_radio">Увези кључ</string>
- <string name="yubikey_reset_radio">Ресетуј Јубикључ</string>
- <string name="snack_yubi_other">Други кључ је смештен на Јубикључу!</string>
- <string name="error_nfc">НФЦ грешка: %s</string>
- <plurals name="error_pin">
+ <string name="security_token_import_radio">Увези кључ</string>
+ <string name="security_token_reset_radio">Ресетуј Јубикључ</string>
+ <string name="snack_security_token_other">Други кључ је смештен на Јубикључу!</string>
+ <string name="security_token_error">НФЦ грешка: %s</string>
+ <plurals name="security_token_error_pin">
<item quantity="one">Нетачан ПИН!\n%d покушај преостао.</item>
<item quantity="few">Нетачан ПИН!\n%d покушаај преостала.</item>
<item quantity="other">Нетачан ПИН!\n%d покушаја преостало.</item>
</plurals>
- <string name="error_nfc_terminated">Јубикључ у завршном стању.</string>
- <string name="error_nfc_wrong_length">Унети ПИН је прекратак. ПИНови су дуги најмање 6 бројки.</string>
- <string name="error_nfc_conditions_not_satisfied">Услови употребе нису задовољени.</string>
- <string name="error_nfc_security_not_satisfied">Безбедносно стање није задовољено.</string>
- <string name="error_nfc_authentication_blocked">ПИН блокиран након превише покушаја.</string>
- <string name="error_nfc_data_not_found">Кључ или објекат нису нађени!</string>
- <string name="error_nfc_unknown">Непозната грешка</string>
- <string name="error_nfc_bad_data">Јубикључ је пријавио неисправне податке.</string>
- <string name="error_nfc_chaining_error">Јубикључ је очекивао последњу наредбу у ланцу.</string>
- <string name="error_nfc_header">Јубикључ је пријавио неисправан %s бит.</string>
- <string name="error_nfc_tag_lost">Јубикључ је прерано склоњен. Држите Јубикључ на полеђини уређаја док се радња не заврши.</string>
- <string name="error_nfc_try_again">Покушај поново</string>
+ <string name="security_token_error_terminated">Јубикључ у завршном стању.</string>
+ <string name="security_token_error_wrong_length">Унети ПИН је прекратак. ПИНови су дуги најмање 6 бројки.</string>
+ <string name="security_token_error_conditions_not_satisfied">Услови употребе нису задовољени.</string>
+ <string name="security_token_error_security_not_satisfied">Безбедносно стање није задовољено.</string>
+ <string name="security_token_error_authentication_blocked">ПИН блокиран након превише покушаја.</string>
+ <string name="security_token_error_data_not_found">Кључ или објекат нису нађени!</string>
+ <string name="security_token_error_unknown">Непозната грешка</string>
+ <string name="security_token_error_bad_data">Јубикључ је пријавио неисправне податке.</string>
+ <string name="security_token_error_chaining_error">Јубикључ је очекивао последњу наредбу у ланцу.</string>
+ <string name="security_token_error_header">Јубикључ је пријавио неисправан %s бит.</string>
+ <string name="security_token_error_tag_lost">Јубикључ је прерано склоњен. Држите Јубикључ на полеђини уређаја док се радња не заврши.</string>
+ <string name="security_token_error_try_again">Покушај поново</string>
<string name="error_pin_wrong">ПИН је погрешан!</string>
<string name="error_temp_file">Грешка стварања привременог фајла.</string>
<string name="btn_delete_original">Обриши оригинални фајл</string>
diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml
index f3a818ecf..56b9b1a21 100644
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@@ -35,7 +35,7 @@
<string name="title_manage_my_keys">Hantera mina nycklar</string>
<!--section-->
<string name="section_user_ids">Identiteter</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">Länkade systemkontakten</string>
<string name="section_keybase_proofs">Keybase.io-bevis</string>
<string name="section_should_you_trust">Skulle du lita på denna nyckel?</string>
@@ -114,7 +114,7 @@
<string name="label_file_ascii_armor">Aktivera ASCII-format</string>
<string name="label_write_version_header">Låt andra se att du använder OpenKeychain</string>
<string name="label_write_version_header_summary">Skriver \'OpenKeychain v2.7\' till OpenPGP-signaturer, chiffertext och exporterade nycklar.</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Använd numeriska tangentbordet för YubiKey PIN</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Använd numeriska tangentbordet för YubiKey PIN</string>
<string name="label_asymmetric_from">Signera med:</string>
<string name="label_to">Kryptera till:</string>
<string name="label_delete_after_encryption">Radera filer efter kryptering</string>
@@ -210,7 +210,7 @@
<string name="passphrase_must_not_be_empty">Var god ange ett lösenord.</string>
<string name="passphrase_for">Ange lösenord för \'%s\'</string>
<string name="pin_for">Ange PIN för \'%s\'</string>
- <string name="yubikey_pin_for">Ange PIN för att få åtkomst till YubiKey för \'%s\'</string>
+ <string name="security_token_pin_for">Ange PIN för att få åtkomst till YubiKey för \'%s\'</string>
<string name="file_delete_confirmation_title">Radera orginalfiler?</string>
<string name="file_delete_confirmation">Följande filer kommer raderas:%s</string>
<string name="file_delete_successful">%1$d av %2$d filer har raderats.%3$s</string>
@@ -530,8 +530,8 @@
<string name="edit_key_select_flag">Välj åtminstone en flagga!</string>
<string name="edit_key_error_add_identity">Lägg till åtminstone en identitet!</string>
<string name="edit_key_error_add_subkey">Lägg till åtminstone en undernyckel!</string>
- <string name="edit_key_error_bad_nfc_algo">Algoritmen stöds inte av smartcard!</string>
- <string name="edit_key_error_bad_nfc_size">Nyckelstorleken stöds inte av smartcard!</string>
+ <string name="edit_key_error_bad_security_token_algo">Algoritmen stöds inte av smartcard!</string>
+ <string name="edit_key_error_bad_security_token_size">Nyckelstorleken stöds inte av smartcard!</string>
<!--Create key-->
<string name="create_key_empty">Detta fält krävs</string>
<string name="create_key_passphrases_not_equal">Lösenorden stämmer inte överens</string>
@@ -858,7 +858,7 @@
<string name="first_time_text1">Ta tillbaka din integritet med OpenKeychain!</string>
<string name="first_time_create_key">Skapa min nyckel</string>
<string name="first_time_import_key">Importera nyckel från fil</string>
- <string name="first_time_yubikey">Använd YubiKey NEO</string>
+ <string name="first_time_security_token">Använd YubiKey NEO</string>
<string name="first_time_skip">Hoppa över inställning</string>
<!--unsorted-->
<string name="section_cert">Certifikatinformation</string>
@@ -897,8 +897,8 @@
<string name="no_nfc_support">Denna enhet stöder inte NFC</string>
<string name="unlocked">Upplåst</string>
<string name="nfc_settings">Inställningar</string>
- <string name="error_nfc_unknown">Okänt fel</string>
- <string name="error_nfc_try_again">Försök igen</string>
+ <string name="security_token_error_unknown">Okänt fel</string>
+ <string name="security_token_error_try_again">Försök igen</string>
<string name="btn_delete_original">Radera ursprunglig fil</string>
<string name="view_internal">Visa i OpenKeychain</string>
<string name="error_clipboard_empty">Urklipp är tomt!</string>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index b6088a954..7bd3965b1 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -60,7 +60,7 @@
<string name="label_file_ascii_armor">ASCII formatında çıktıları etkinleştir</string>
<string name="label_write_version_header">Diğerlerinin OpenKeychain kullandığını bilmesine izin ver</string>
<string name="label_write_version_header_summary">OpenPGP imzalarına, şifrelenmiş metinlere ve dışa aktarılmış anahtarlara \'OpenKeychain v2.7\' yazar</string>
- <string name="label_use_num_keypad_for_yubikey_pin">YubiKey PIN\'i için sayısal klavyeyi kullan</string>
+ <string name="label_use_num_keypad_for_security_token_pin">YubiKey PIN\'i için sayısal klavyeyi kullan</string>
<string name="label_to">Şuna şifrele:</string>
<string name="label_delete_after_decryption">Şifre çözme sonrasında sil</string>
<string name="label_encryption_algorithm">Şifreleme algoritması</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 97f9ec391..36c34e419 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -60,7 +60,7 @@
<string name="label_file_ascii_armor">Увімкнути ASCII Armor</string>
<string name="label_write_version_header">Нехай інші дізнаються, що ви користуєтеся OpenKeychain</string>
<string name="label_write_version_header_summary">Напишіть \'OpenKeychain v2.7\' для підписів, зашифрованого тексту та експортованих ключів OpenPGP</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Вживати цифрову клавіатуру для YubiKey PIN</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Вживати цифрову клавіатуру для YubiKey PIN</string>
<string name="label_to">Зашифрувати до:</string>
<string name="label_delete_after_decryption">Вилучити після розшифрування</string>
<string name="label_encryption_algorithm">Алгоритм шифрування</string>
diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index cb4ebf002..5f99abbf7 100644
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
@@ -34,7 +34,7 @@
<string name="title_manage_my_keys">管理我的金鑰</string>
<!--section-->
<string name="section_user_ids">身份</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">已關聯帳戶</string>
<string name="section_should_you_trust">您信任這把金鑰嗎?</string>
<string name="section_keys">子金鑰</string>
@@ -105,7 +105,7 @@
<string name="label_file_ascii_armor">以ASCII輸出</string>
<string name="label_write_version_header">讓別人知道我在使用OpenKeychain</string>
<string name="label_write_version_header_summary">在簽名、密文與匯出的金鑰裡寫入\'OpenKeychain v2.7\'</string>
- <string name="label_use_num_keypad_for_yubikey_pin">輸入 YubiKey PIN 時使用數字鍵盤</string>
+ <string name="label_use_num_keypad_for_security_token_pin">輸入 YubiKey PIN 時使用數字鍵盤</string>
<string name="label_asymmetric_from">簽名:</string>
<string name="label_to">加密給:</string>
<string name="label_delete_after_encryption">加密後刪除檔案</string>
@@ -210,7 +210,7 @@
<string name="passphrase_must_not_be_empty">請輸入密碼。</string>
<string name="passphrase_for">輸入 %s 的密碼</string>
<string name="pin_for">輸入 \'%s\' 的 PIN</string>
- <string name="yubikey_pin_for">輸入 PIN 來存取 \'%s\' 的 YubiKey</string>
+ <string name="security_token_pin_for">輸入 PIN 來存取 \'%s\' 的 YubiKey</string>
<string name="file_delete_confirmation_title">刪除原始檔案?</string>
<string name="file_delete_confirmation">下列的檔案將會被刪除:%s</string>
<string name="file_delete_successful">%1$d 之 %2$d 的檔案已經被刪除。%3$s</string>
@@ -536,9 +536,9 @@
<string name="edit_key_select_flag">請至少選擇一個用途!</string>
<string name="edit_key_error_add_identity">新增至少一組身分識別!</string>
<string name="edit_key_error_add_subkey">新增至少一組子金鑰!</string>
- <string name="edit_key_error_bad_nfc_algo">智慧卡不支援該算法!</string>
- <string name="edit_key_error_bad_nfc_size">智慧卡不支援該金鑰長度!</string>
- <string name="edit_key_error_bad_nfc_stripped">無法移動金鑰至智慧卡(已移動或被卸除)!</string>
+ <string name="edit_key_error_bad_security_token_algo">智慧卡不支援該算法!</string>
+ <string name="edit_key_error_bad_security_token_size">智慧卡不支援該金鑰長度!</string>
+ <string name="edit_key_error_bad_security_token_stripped">無法移動金鑰至智慧卡(已移動或被卸除)!</string>
<!--Create key-->
<string name="create_key_empty">必填欄位</string>
<string name="create_key_passphrases_not_equal">密碼不相符</string>
@@ -692,7 +692,7 @@
<!--First Time-->
<string name="first_time_create_key">建立金鑰</string>
<string name="first_time_import_key">從檔案匯入金鑰</string>
- <string name="first_time_yubikey">使用YubiKey NEO</string>
+ <string name="first_time_security_token">使用YubiKey NEO</string>
<string name="first_time_skip">跳過設置</string>
<!--unsorted-->
<string name="empty_certs">這把金鑰未經過認證</string>
@@ -717,7 +717,7 @@
<string name="nfc_wrong_tag">錯誤的標籤。請再試一次。</string>
<string name="enable_nfc">請在您的設定中啓用 NFC</string>
<string name="no_nfc_support">該裝置不支援 NFC</string>
- <string name="nfc_write_succesful">成功寫入 NFC 標籤</string>
+ <string name="nfc_write_successful">成功寫入 NFC 標籤</string>
<string name="unlocked">解鎖</string>
<string name="nfc_settings">設定</string>
<!--Other Linked Identity strings-->
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 17e53794c..c4e2c7b55 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -36,7 +36,7 @@
<string name="title_manage_my_keys">管理我的密钥</string>
<!--section-->
<string name="section_user_ids">用户名</string>
- <string name="section_yubikey">YubiKey</string>
+ <string name="section_security_token">YubiKey</string>
<string name="section_linked_system_contact">关联系统联系人</string>
<string name="section_should_you_trust">信任此密钥?</string>
<string name="section_proof_details">验证</string>
@@ -128,7 +128,7 @@
<string name="label_file_ascii_armor">启用ASCII文本化</string>
<string name="label_write_version_header">写入文件头信息</string>
<string name="label_write_version_header_summary">在OpenPGP签名、加密文本和导出密钥中写入 \'OpenKeychain v2.7\' 标记。</string>
- <string name="label_use_num_keypad_for_yubikey_pin">为YubiKey PIN使用数字键盘</string>
+ <string name="label_use_num_keypad_for_security_token_pin">为YubiKey PIN使用数字键盘</string>
<string name="label_asymmetric_from">签名为:</string>
<string name="label_to">加密到</string>
<string name="label_delete_after_encryption">加密文件后删除</string>
@@ -254,10 +254,10 @@
<string name="passphrase_for_backup">输入备份码</string>
<string name="passphrase_for">输入密码为 \'%s\'</string>
<string name="pin_for">输入PIN码为 \'%s\'</string>
- <string name="yubikey_pin_for">输入访问YubiKey的PIN为 \'%s\'</string>
- <string name="nfc_text">保持YubiKey 的NFC标签靠近你的手机背部</string>
- <string name="nfc_wait">挺住!</string>
- <string name="nfc_finished">现在拿开YubiKey</string>
+ <string name="security_token_pin_for">输入访问YubiKey的PIN为 \'%s\'</string>
+ <string name="security_token_nfc_text">保持YubiKey 的NFC标签靠近你的手机背部</string>
+ <string name="security_token_nfc_wait">挺住!</string>
+ <string name="security_token_nfc_finished">现在拿开YubiKey</string>
<string name="file_delete_confirmation_title">删除源文件?</string>
<string name="file_delete_confirmation">这些文件将被删除:%s</string>
<string name="file_delete_successful">共%2$d个文件 %1$d 个文件已删除.%3$s</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3c77d82dd..47c53b4e2 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -43,7 +43,7 @@
<!-- section -->
<string name="section_user_ids">"Identities"</string>
- <string name="section_yubikey">"YubiKey"</string>
+ <string name="section_security_token">"Security Token"</string>
<string name="section_linked_system_contact">"Linked System Contact"</string>
<string name="section_keybase_proofs">"Keybase.io Proofs"</string>
<string name="section_should_you_trust">"Should you trust this key?"</string>
@@ -150,7 +150,7 @@
<string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
<string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string>
<string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for YubiKey PIN</string>
+ <string name="label_use_num_keypad_for_security_token_pin">Use number keypad for Security Token PIN</string>
<string name="label_asymmetric_from">"Sign with:"</string>
<string name="label_to">"Encrypt to"</string>
<string name="label_delete_after_encryption">"Delete files after encryption"</string>
@@ -307,11 +307,11 @@
<string name="passphrase_for_backup">"Enter backup code"</string>
<string name="passphrase_for">"Enter password for '%s'"</string>
<string name="pin_for">"Enter PIN for '%s'"</string>
- <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string>
- <string name="nfc_text">"Hold YubiKey against the NFC marker at the back of your device."</string>
- <string name="nfc_wait">"Keep the YubiKey at the back!"</string>
- <string name="nfc_finished">"Take away the YubiKey now."</string>
- <string name="nfc_try_again_text">"Take away the YubiKey now and touch TRY AGAIN."</string>
+ <string name="security_token_pin_for">"Enter PIN to access Security Token for '%s'"</string>
+ <string name="security_token_nfc_text">"Hold Security Token against the NFC marker at the back of your device."</string>
+ <string name="security_token_nfc_wait">"Keep the Security Token at the back!"</string>
+ <string name="security_token_nfc_finished">"Take away the Security Token now."</string>
+ <string name="security_token_nfc_try_again_text">"Take away the Security Token now and touch TRY AGAIN."</string>
<string name="file_delete_confirmation_title">"Delete original files?"</string>
<string name="file_delete_confirmation">"The following files will be deleted:%s"</string>
<string name="file_delete_successful">"%1$d out of %2$d files have been deleted.%3$s"</string>
@@ -743,15 +743,15 @@
<item>"Change Expiry"</item>
<item>"Revoke Subkey"</item>
<item>"Strip Subkey"</item>
- <item>"Move Subkey to YubiKey / Smart Card"</item>
+ <item>"Move Subkey to Security Token"</item>
</string-array>
<string name="edit_key_new_subkey">"new subkey"</string>
<string name="edit_key_select_flag">"Please select at least one flag!"</string>
<string name="edit_key_error_add_identity">"Add at least one identity!"</string>
<string name="edit_key_error_add_subkey">"Add at least one subkey!"</string>
- <string name="edit_key_error_bad_nfc_algo">"Algorithm not supported by smart card!"</string>
- <string name="edit_key_error_bad_nfc_size">"Key size not supported by smart card!"</string>
- <string name="edit_key_error_bad_nfc_stripped">"Cannot move key to smart card (either stripped or 'divert-to-card')!"</string>
+ <string name="edit_key_error_bad_security_token_algo">"Algorithm not supported by Security Token!"</string>
+ <string name="edit_key_error_bad_security_token_size">"Key size not supported by Security Token!"</string>
+ <string name="edit_key_error_bad_security_token_stripped">"Cannot move key to Security Token (either stripped or 'divert-to-card')!"</string>
<!-- Create key -->
<string name="create_key_upload">"Synchronize with the Internet"</string>
@@ -1050,7 +1050,7 @@
<!-- modifySecretKeyRing -->
<string name="msg_mr">"Modifying keyring %s"</string>
- <string name="msg_mf_divert">"Will divert to smart card for crypto operations"</string>
+ <string name="msg_mf_divert">"Will divert to Security Token for crypto operations"</string>
<string name="msg_mf_error_divert_newsub">"Creation of new subkeys is not supported for 'divert-to-card' primary keys!"</string>
<string name="msg_mf_error_divert_serial">"The serial number of a 'divert-to-card' key must be 16 bytes! This is a programming error, please file a bug report!"</string>
<string name="msg_mf_error_encode">"Encoding exception!"</string>
@@ -1069,9 +1069,9 @@
<string name="msg_mf_error_sig">"Signature exception!"</string>
<string name="msg_mf_error_sub_stripped">"Cannot modify stripped subkey %s!"</string>
<string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string>
- <string name="msg_mf_error_conflicting_nfc_commands">"Cannot move key to smart card in same operation that creates an on-card signature."</string>
+ <string name="msg_mf_error_conflicting_nfc_commands">"Cannot move key to Security Token in same operation that creates an on-card signature."</string>
<string name="msg_mf_error_duplicate_keytocard_for_slot">"Smart card supports only one slot per key type."</string>
- <string name="msg_mf_error_invalid_flags_for_keytocard">"Inappropriate key flags for smart card key."</string>
+ <string name="msg_mf_error_invalid_flags_for_keytocard">"Inappropriate key flags for Security Token key."</string>
<string name="msg_mf_master">"Modifying master certifications"</string>
<string name="msg_mf_notation_empty">"Adding empty notation packet"</string>
<string name="msg_mf_notation_pin">"Adding PIN notation packet"</string>
@@ -1085,15 +1085,15 @@
<string name="msg_mf_primary_new">"Generating new certificate for new primary user ID"</string>
<string name="msg_mf_restricted_mode">"Changing to restricted operation mode"</string>
<string name="msg_mf_subkey_change">"Modifying subkey %s"</string>
- <string name="msg_mf_require_divert">"Diverting to smart card for crypto operations"</string>
+ <string name="msg_mf_require_divert">"Diverting to Security Token for crypto operations"</string>
<string name="msg_mf_require_passphrase">"Password required for operations"</string>
<string name="msg_mf_subkey_new">"Adding new subkey of type %s"</string>
<string name="msg_mf_subkey_new_id">"New subkey ID: %s"</string>
<string name="msg_mf_error_past_expiry">"Expiry date cannot be in the past!"</string>
<string name="msg_mf_subkey_revoke">"Revoking subkey %s"</string>
<string name="msg_mf_subkey_strip">"Stripping subkey %s"</string>
- <string name="msg_mf_keytocard_start">"Moving subkey %s to smart card"</string>
- <string name="msg_mf_keytocard_finish">"Moved %1$s to smart card %2$s"</string>
+ <string name="msg_mf_keytocard_start">"Moving subkey %s to Security Token"</string>
+ <string name="msg_mf_keytocard_finish">"Moved %1$s to Security Token %2$s"</string>
<string name="msg_mf_success">"Keyring successfully modified"</string>
<string name="msg_mf_uid_add">"Adding user ID %s"</string>
<string name="msg_mf_uid_primary">"Changing primary user ID to %s"</string>
@@ -1153,7 +1153,7 @@
<string name="msg_pr_error_key_not_found">"Key not found!"</string>
<string name="msg_pr_fetching">"Fetching key to modify (%s)"</string>
<string name="msg_pr_subkey_match">"Promoting subkey: %s"</string>
- <string name="msg_pr_subkey_nomatch">"Subkey not on YubiKey: %s"</string>
+ <string name="msg_pr_subkey_nomatch">"Subkey not on Security Token: %s"</string>
<string name="msg_pr_success">"Key successfully promoted"</string>
<!-- Other messages used in OperationLogs -->
@@ -1458,10 +1458,11 @@
<string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
<string name="first_time_create_key">"Create my key"</string>
<string name="first_time_import_key">"Import key from file"</string>
- <string name="first_time_yubikey">"Use YubiKey NEO"</string>
+ <string name="first_time_security_token">"Use Security Token"</string>
+ <string name="first_time_security_token_subtitle">"(Fidesmo, YubiKey NEO, SIGILANCE, …)"</string>
<string name="first_time_skip">"Skip Setup"</string>
- <string name="first_time_blank_yubikey">"Would you like to use this blank YubiKey NEO with OpenKeychain?\n\nPlease take away the YubiKey now, you will be prompted when it is needed again!"</string>
- <string name="first_time_blank_yubikey_yes">"Use this YubiKey"</string>
+ <string name="first_time_blank_security_token">"Would you like to use this blank Security Token with OpenKeychain?\n\nPlease take away the Security Token now, you will be prompted when it is needed again!"</string>
+ <string name="first_time_blank_security_token_yes">"Use this Security Token"</string>
<string name="backup_text">"Backups that include your own keys must never be shared with other people!"</string>
<string name="backup_all">"All keys + your own keys"</string>
@@ -1485,7 +1486,7 @@
<string name="error_key_not_found">"Key not found!"</string>
<string name="error_key_processing">"Error processing key!"</string>
<string name="key_stripped">"stripped"</string>
- <string name="key_divert">"divert to smart card"</string>
+ <string name="key_divert">"divert to Security Token"</string>
<string name="key_no_passphrase">"no password"</string>
<string name="key_unavailable">"unavailable"</string>
<string name="secret_cannot_multiple">"Your own keys can only be deleted individually!"</string>
@@ -1536,46 +1537,44 @@
<string name="nfc_wrong_tag">Wrong Tag. Please try again.</string>
<string name="enable_nfc">Please activate NFC in your settings</string>
<string name="no_nfc_support">This device does not support NFC</string>
- <string name="nfc_write_succesful">Successfully written on NFC tag</string>
+ <string name="nfc_write_successful">Successfully written on NFC tag</string>
<string name="unlocked">Unlocked</string>
<string name="nfc_settings">Settings</string>
- <string name="snack_yubikey_view">"View"</string>
- <string name="snack_yubikey_import">"Import"</string>
+ <string name="snack_security_token_view">"View"</string>
+ <string name="snack_security_token_import">"Import"</string>
<string name="button_bind_key">"Bind Key"</string>
- <string name="yubikey_serno">"Serial No: %s"</string>
- <string name="yubikey_key_holder">"Key holder: "</string>
- <string name="yubikey_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
- <string name="yubikey_status_bound">"YubiKey matches and is bound to key"</string>
- <string name="yubikey_status_unbound">"YubiKey matches, can be bound to key"</string>
- <string name="yubikey_status_partly">"YubiKey matches, partly bound to key"</string>
- <string name="yubikey_create">"Hold YubiKey against the back of your device."</string>
- <string name="yubikey_reset_or_import">"This YubiKey already contains a key. You can import the key using the cloud or reset the YubiKey."</string>
+ <string name="security_token_serial_no">"Serial No: %s"</string>
+ <string name="security_token_key_holder">"Key holder: "</string>
+ <string name="security_token_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string>
+ <string name="security_token_status_bound">"Security Token matches and is bound to key"</string>
+ <string name="security_token_status_unbound">"Security Token matches, can be bound to key"</string>
+ <string name="security_token_status_partly">"Security Token matches, partly bound to key"</string>
+ <string name="security_token_create">"Hold Security Token against the back of your device."</string>
+ <string name="security_token_reset_or_import">"This Security Token already contains a key. You can import the key using the cloud or reset the Security Token."</string>
<string name="btn_import">"Import"</string>
<string name="btn_reset">"Reset"</string>
- <string name="yubikey_import_radio">"Import key"</string>
- <string name="yubikey_reset_radio">"Reset YubiKey"</string>
- <string name="yubikey_reset_warning">"Resetting the YubiKey completely destroys the keys on it. Afterwards, you will not be able to decrypt messages/files encrypted with this key!"</string>
- <string name="snack_yubi_other">Different key stored on YubiKey!</string>
- <string name="error_nfc">"NFC Error: %s"</string>
- <plurals name="error_pin">
+ <string name="security_token_import_radio">"Import key"</string>
+ <string name="security_token_reset_radio">"Reset Security Token"</string>
+ <string name="security_token_reset_warning">"Resetting the Security Token completely destroys the keys on it. Afterwards, you will not be able to decrypt messages/files encrypted with this key!"</string>
+ <string name="snack_security_token_other">Different key stored on Security Token!</string>
+ <string name="security_token_error">"Error: %s"</string>
+ <plurals name="security_token_error_pin">
<item quantity="one">"Incorrect PIN!\n%d try remaining."</item>
<item quantity="other">"Incorrect PIN!\n%d tries remaining."</item>
</plurals>
- <string name="error_nfc_terminated">"YubiKey in termination state."</string>
- <string name="error_nfc_wrong_length">"Entered PIN is too short. PINs are at least 6 digits long."</string>
- <string name="error_nfc_conditions_not_satisfied">"Conditions of use not satisfied."</string>
- <string name="error_nfc_security_not_satisfied">"Security status not satisfied."</string>
- <string name="error_nfc_authentication_blocked">"PIN blocked after too many attempts."</string>
- <string name="error_nfc_data_not_found">"Key or object not found."</string>
- <string name="error_nfc_unknown">"Unknown Error"</string>
- <string name="error_nfc_bad_data">"YubiKey reported invalid data."</string>
- <string name="error_nfc_chaining_error">"YubiKey expected last command in a chain."</string>
- <string name="error_nfc_header">"YubiKey reported invalid %s byte."</string>
- <string name="error_nfc_tag_lost">"YubiKey has been taken off too early. Keep the YubiKey at the back until the operation finishes."</string>
- <string name="error_nfc_iso_dep_not_supported">"Tag does not support ISO-DEP (ISO 14443-4)"</string>
- <string name="error_nfc_try_again">"Try again"</string>
- <string name="error_pin_wrong">PIN is wrong!</string>
- <string name="error_temp_file">Error creating temporary file.</string>
+ <string name="security_token_error_terminated">"Security Token in termination state."</string>
+ <string name="security_token_error_wrong_length">"Entered PIN is too short. PINs are at least 6 digits long."</string>
+ <string name="security_token_error_conditions_not_satisfied">"Conditions of use not satisfied."</string>
+ <string name="security_token_error_security_not_satisfied">"Security status not satisfied."</string>
+ <string name="security_token_error_authentication_blocked">"PIN blocked after too many attempts."</string>
+ <string name="security_token_error_data_not_found">"Key or object not found."</string>
+ <string name="security_token_error_unknown">"Unknown Error"</string>
+ <string name="security_token_error_bad_data">"Security Token reported invalid data."</string>
+ <string name="security_token_error_chaining_error">"Security Token expected last command in a chain."</string>
+ <string name="security_token_error_header">"Security Token reported invalid %s byte."</string>
+ <string name="security_token_error_tag_lost">"Security Token has been taken off too early. Keep the Security Token at the back until the operation finishes."</string>
+ <string name="security_token_error_iso_dep_not_supported">"Tag does not support ISO-DEP (ISO 14443-4)"</string>
+ <string name="security_token_error_try_again">"Try again"</string>
<string name="btn_delete_original">Delete original file</string>
<string name="snack_encrypt_filenames_on">"Filenames <b>are</b> encrypted."</string>
diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
index 25bdf3a3d..a06e6b8ba 100644
--- a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
@@ -11,5 +11,5 @@
android:defaultValue="false"
android:key="useNumKeypadForYubikeyPin"
android:persistent="true"
- android:title="@string/label_use_num_keypad_for_yubikey_pin" />
+ android:title="@string/label_use_num_keypad_for_security_token_pin" />
</PreferenceScreen>