diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
34 files changed, 219 insertions, 115 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_left_grey_24dp.png Binary files differnew file mode 100644 index 000000000..12e39d39d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_left_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_right_grey_24dp.png Binary files differnew file mode 100644 index 000000000..7eef500d4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_right_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_48dp.png Binary files differnew file mode 100644 index 000000000..de2a86e89 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_48dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_left_grey_24dp.png Binary files differnew file mode 100644 index 000000000..56ab24da9 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_left_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_right_grey_24dp.png Binary files differnew file mode 100644 index 000000000..d6581fe23 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_right_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_48dp.png Binary files differnew file mode 100644 index 000000000..738e3490d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_48dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_left_grey_24dp.png Binary files differnew file mode 100644 index 000000000..df0518a68 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_left_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_right_grey_24dp.png Binary files differnew file mode 100644 index 000000000..7b82b8a57 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_right_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_48dp.png Binary files differnew file mode 100644 index 000000000..e664e94ac --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_48dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_left_grey_24dp.png Binary files differnew file mode 100644 index 000000000..10643ae3f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_left_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_right_grey_24dp.png Binary files differnew file mode 100644 index 000000000..360d3c5ec --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_right_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_48dp.png Binary files differnew file mode 100644 index 000000000..5f00cf8a2 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_48dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_left_grey_24dp.png Binary files differnew file mode 100644 index 000000000..a5fb05c28 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_left_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_right_grey_24dp.png Binary files differnew file mode 100644 index 000000000..a71c5b3fc --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_right_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_48dp.png Binary files differnew file mode 100644 index 000000000..001fe6607 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_48dp.png diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml new file mode 100644 index 000000000..a24d1a2ee --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" + android:layout_above="@+id/create_key_buttons"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/create_key_email_text" /> + + <org.sufficientlysecure.keychain.ui.widget.EmailEditText + android:id="@+id/create_key_email" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="8dp" + android:imeOptions="actionNext" + android:hint="@string/label_email" + android:ems="10" /> + + </LinearLayout> + </ScrollView> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:background="@color/holo_gray_bright" + android:id="@+id/create_key_buttons"> + + <TextView + android:id="@+id/create_key_back_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_back" + android:textAllCaps="true" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" /> + + <TextView + android:id="@+id/create_key_next_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_next" + 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:clickable="true" + style="?android:attr/borderlessButtonStyle" /> + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 84625d1fd..830f039f7 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -6,7 +6,7 @@ <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@+id/create_key_buttons_divider"> + android:layout_above="@+id/create_key_buttons"> <LinearLayout android:layout_width="match_parent" @@ -144,58 +144,42 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" + android:background="@color/holo_gray_bright" android:id="@+id/create_key_buttons"> <TextView android:id="@+id/create_key_back_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/btn_back" + android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" - android:gravity="center_vertical" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:layout_gravity="center_vertical" /> - - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:background="?android:attr/listDivider" /> + style="?android:attr/borderlessButtonStyle" /> <TextView - android:id="@+id/create_key_create_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:id="@+id/create_key_next_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/btn_create_key" + android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" android:drawableRight="@drawable/ic_key_plus_grey600_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" + android:gravity="right|center_vertical" android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:layout_gravity="center_vertical" /> + style="?android:attr/borderlessButtonStyle" /> </LinearLayout> - <View - android:id="@+id/create_key_buttons_divider" - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:layout_alignTop="@+id/create_key_buttons" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml new file mode 100644 index 000000000..ea064b00c --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" + android:layout_above="@+id/create_key_buttons"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/create_key_name_text" /> + + <org.sufficientlysecure.keychain.ui.widget.NameEditText + android:id="@+id/create_key_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="8dp" + android:imeOptions="actionNext" + android:inputType="textAutoCorrect|textPersonName|textCapWords" + android:hint="@string/create_key_hint_full_name" + android:ems="10" /> + + </LinearLayout> + </ScrollView> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:background="@color/holo_gray_bright" + android:id="@+id/create_key_buttons"> + + <TextView + android:id="@+id/create_key_back_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textAllCaps="true" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" + android:clickable="false" + style="?android:attr/borderlessButtonStyle" /> + + <TextView + android:id="@+id/create_key_next_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_next" + 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:clickable="true" + style="?android:attr/borderlessButtonStyle" /> + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml index 2178fcb1f..4b09c6cac 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -8,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:layout_above="@+id/create_key_button_divider"> + android:layout_above="@+id/create_key_buttons"> <LinearLayout android:layout_width="match_parent" @@ -23,40 +22,7 @@ android:layout_marginTop="16dp" android:layout_marginLeft="8dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/create_key_text" /> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/label_user_id" /> - - <org.sufficientlysecure.keychain.ui.widget.NameEditText - android:id="@+id/create_key_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:imeOptions="actionNext" - android:inputType="textAutoCorrect|textPersonName|textCapWords" - android:hint="@string/create_key_hint_full_name" - android:ems="10" /> - - <org.sufficientlysecure.keychain.ui.widget.EmailEditText - android:id="@+id/create_key_email" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:imeOptions="actionNext" - android:hint="@string/label_email" - android:ems="10" /> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/label_passphrase" /> + android:text="@string/create_key_passphrase_text" /> <org.sufficientlysecure.keychain.ui.widget.PassphraseEditText android:id="@+id/create_key_passphrase" @@ -83,17 +49,6 @@ </LinearLayout> </ScrollView> - <View - android:id="@+id/create_key_button_divider" - android:layout_width="match_parent" - android:layout_height="1dip" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:background="?android:attr/listDivider" - android:layout_alignTop="@+id/create_key_buttons" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -101,45 +56,41 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" + android:background="@color/holo_gray_bright" android:id="@+id/create_key_buttons"> <TextView android:id="@+id/create_key_back_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="" + android:text="@string/btn_back" + android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" - android:gravity="center_vertical" - android:layout_gravity="center_vertical" /> - - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:background="?android:attr/listDivider" /> + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" /> <TextView - android:id="@+id/create_key_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:id="@+id/create_key_next_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/btn_next" + android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" - android:drawableRight="@drawable/ic_play_arrow_grey_24dp" + android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" + android:gravity="right|center_vertical" android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:layout_gravity="center_vertical" /> + style="?android:attr/borderlessButtonStyle" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml index 903cc50f3..ce4f1cdcf 100644 --- a/OpenKeychain/src/main/res/values-cs/strings.xml +++ b/OpenKeychain/src/main/res/values-cs/strings.xml @@ -464,7 +464,7 @@ <string name="create_key_final_robot_text">Vytvoření klíče může chvíli trvat, mezitím si dejte třeba šálek dobré kávy...</string> <string name="create_key_rsa">(3 podklíče, RSA, 4096 bit)</string> <string name="create_key_custom">(uživatelská konfigurace klíče)</string> - <string name="create_key_text">Zadejte své celé jméno, emailovou adresu a zvolte heslo.</string> + <string name="create_key_identity_text">Zadejte své celé jméno, emailovou adresu a zvolte heslo.</string> <string name="create_key_hint_full_name">Celé jméno, např. Jan Novák</string> <string name="create_key_edit">Změnit konfiguraci klíče</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index 63b0c4c09..245de82ec 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -528,7 +528,7 @@ <string name="create_key_final_robot_text">Einen Schlüssel zu erzeugen braucht eine Weile, trink in der Zeit einen Kaffee...</string> <string name="create_key_rsa">(3 Unterschlüssel, RSA, 4096 Bit)</string> <string name="create_key_custom">(Benutzerdefinierte Schlüsseleinstellung)</string> - <string name="create_key_text">Vollen Namen und Emailadresse angeben und Passwort wählen.</string> + <string name="create_key_identity_text">Vollen Namen und Emailadresse angeben und Passwort wählen.</string> <string name="create_key_hint_full_name">Vollständiger Name, z.B. Max Mustermann</string> <string name="create_key_edit">Schlüsselkonfiguration ändern</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 0d7444c47..d5d8440af 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -575,7 +575,7 @@ <string name="create_key_final_robot_text">Crear una clave puede llevar un tiempo, tómese una taza de café entre tanto...</string> <string name="create_key_rsa">(3 subclaves, RSA, 4096 bits)</string> <string name="create_key_custom">(configuración de clave personalizada)</string> - <string name="create_key_text">Introduzca su nombre completo, dirección de correo electrónico, y elija una frase contraseña.</string> + <string name="create_key_identity_text">Introduzca su nombre completo, dirección de correo electrónico, y elija una frase contraseña.</string> <string name="create_key_hint_full_name">Nombre completo, ej. Max Mustermann</string> <string name="create_key_edit">Cambiar configuración de clave</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index 50bd53921..8cc1cc735 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -573,7 +573,7 @@ <string name="create_key_final_robot_text">Créer une clef peut prendre du temps, prenez donc un café en attendant...</string> <string name="create_key_rsa">(3 sous-clefs, RSA, 4096 bits)</string> <string name="create_key_custom">(configuration personnalisée de la clef)</string> - <string name="create_key_text">Saisissez votre nom complet, votre adresse courriel et choisissez votre phrase de passe.</string> + <string name="create_key_identity_text">Saisissez votre nom complet, votre adresse courriel et choisissez votre phrase de passe.</string> <string name="create_key_hint_full_name">Nom complet, p. ex. Marc-Olivier Lagacé</string> <string name="create_key_edit">Changer la configuration de la clef</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index d741f7111..f55d16dfc 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -482,7 +482,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars <string name="create_key_final_robot_text">La creazione di una chiave richiede un po\' di tempo, prendi un caffè nel frattempo...</string> <string name="create_key_rsa">(3 sottochiavi, RSA, 4096 bit)</string> <string name="create_key_custom">(personalizza la configurazione della chiave)</string> - <string name="create_key_text">Inserisci Nome Completo, Email e scegli una Frase di Accesso.</string> + <string name="create_key_identity_text">Inserisci Nome Completo, Email e scegli una Frase di Accesso.</string> <string name="create_key_hint_full_name">Nome completo, es: Mario Rossi</string> <string name="create_key_edit">Cambia configurazione della chiave</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index c5318db36..ef817f398 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -532,7 +532,7 @@ <string name="create_key_final_robot_text">しばらくの間鍵を生成しています、その間はコーヒーでもどうぞ....</string> <string name="create_key_rsa">(3副鍵、RSA, 4096 bit)</string> <string name="create_key_custom">(個別の鍵設定)</string> - <string name="create_key_text">フルネーム、Eメールアドレスを入力そしてパスフレーズを選択してください。</string> + <string name="create_key_identity_text">フルネーム、Eメールアドレスを入力そしてパスフレーズを選択してください。</string> <string name="create_key_hint_full_name">フルネーム、例えば Max Mustermann</string> <string name="create_key_edit">鍵の設定変更</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index 34b8f1627..f8ee75750 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -575,7 +575,7 @@ <string name="create_key_final_robot_text">Een sleutel aanmaken kan even duren, maak intussen een tasje thee klaar…</string> <string name="create_key_rsa">(3 subsleutels, RSA, 4096 bit)</string> <string name="create_key_custom">(aangepaste sleutelconfiguratie)</string> - <string name="create_key_text">Voer je volledige naam en e-mailadres in, en kies een wachtwoord.</string> + <string name="create_key_identity_text">Voer je volledige naam en e-mailadres in, en kies een wachtwoord.</string> <string name="create_key_hint_full_name">Volledige naam, bv. Max Mustermann</string> <string name="create_key_edit">Sleutelconfiguratie wijzigen</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml index 3dc6a2a35..46dd8c313 100644 --- a/OpenKeychain/src/main/res/values-pl/strings.xml +++ b/OpenKeychain/src/main/res/values-pl/strings.xml @@ -540,7 +540,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw <string name="create_key_final_robot_text">Tworzenie klucza może zająć trochę czasu... w międzyczasie idź się napij kawy.</string> <string name="create_key_rsa">(3 pod-klucze, RSA, 4096 bit)</string> <string name="create_key_custom">(niestandardowa konfiguracja kluczy)</string> - <string name="create_key_text">Wpisz swoje imię, adres email oraz wybierz hasło.</string> + <string name="create_key_identity_text">Wpisz swoje imię, adres email oraz wybierz hasło.</string> <string name="create_key_hint_full_name">Imię i nazwisko, na przykład, Jan Kowalski</string> <string name="create_key_edit">Zmień klucz konfiguracji</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index dc1c81bb4..211433d26 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -490,7 +490,7 @@ <string name="create_key_final_robot_text">Создание ключа займет некоторое время, можете пока выпить чашечку кофе...</string> <string name="create_key_rsa">(3 доп. ключа, RSA, 4096 bit)</string> <string name="create_key_custom">(произвольная конфигурация ключа)</string> - <string name="create_key_text">Укажите полное имя, адрес почты и придумайте надежный пароль.</string> + <string name="create_key_identity_text">Укажите полное имя, адрес почты и придумайте надежный пароль.</string> <string name="create_key_hint_full_name">Полное имя, напр. Иван Хлестаков</string> <string name="create_key_edit">Изменить конфигурацию ключа</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index 11639e2eb..73094c5a4 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -558,7 +558,7 @@ <string name="create_key_final_robot_text">Прављење кључа може да потраје, попијте кафу у међувремену…</string> <string name="create_key_rsa">(3 поткључа, РСА, 4096 бита)</string> <string name="create_key_custom">(прилагођена конфигурација кључа)</string> - <string name="create_key_text">Унесите пуно име, адресу е-поште и укуцајте лозинку.</string> + <string name="create_key_identity_text">Унесите пуно име, адресу е-поште и укуцајте лозинку.</string> <string name="create_key_hint_full_name">Пуно име, нпр. Петар Петровић</string> <string name="create_key_edit">Промени конфигурацију кључа</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index a24fe7ee7..d22eea22a 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -521,7 +521,7 @@ <string name="create_key_final_robot_text">Att skapa en nyckel kan ta ett tag, drick en kopp kaffe under tiden…</string> <string name="create_key_rsa">(3 undernycklar, RSA, 4096 bit)</string> <string name="create_key_custom">(anpassad nyckelkonfiguration)</string> - <string name="create_key_text">Ange ditt fullständiga namn, e-postadress och välj en lösenordsfras.</string> + <string name="create_key_identity_text">Ange ditt fullständiga namn, e-postadress och välj en lösenordsfras.</string> <string name="create_key_hint_full_name">Fullständigt namn, t.ex. Kalle Svensson</string> <string name="create_key_edit">Ändra nyckelkonfiguration</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml index 7b6a976f5..ee5306cc7 100644 --- a/OpenKeychain/src/main/res/values-tr/strings.xml +++ b/OpenKeychain/src/main/res/values-tr/strings.xml @@ -449,7 +449,7 @@ <string name="create_key_final_robot_text">Anahtar oluşturma biraz zaman alabilir, bu sırada bir çay için...</string> <string name="create_key_rsa">(3 alt anahtar, RSA, 4096 bit)</string> <string name="create_key_custom">(özel anahtar yapılandırması)</string> - <string name="create_key_text">Tam isminizi, e-posta adresinizi girin ve bir parola seçin.</string> + <string name="create_key_identity_text">Tam isminizi, e-posta adresinizi girin ve bir parola seçin.</string> <string name="create_key_hint_full_name">Tam Ad, örneğin: Max Mustermann</string> <string name="create_key_edit">Anahtar yapılandırmasını değiştir.</string> <!--View key--> diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml index cf586b2d5..365821f4a 100644 --- a/OpenKeychain/src/main/res/values-uk/strings.xml +++ b/OpenKeychain/src/main/res/values-uk/strings.xml @@ -449,7 +449,7 @@ <string name="create_key_empty">Це поле - обов\'язкове</string> <string name="create_key_passphrases_not_equal">Паролі фрази не збігаються</string> <string name="create_key_final_text">Ви ввели наступну сутність:</string> - <string name="create_key_text">Введіть ваше повне ім\'я, електронну адреса та оберіть парольну фразу.</string> + <string name="create_key_identity_text">Введіть ваше повне ім\'я, електронну адреса та оберіть парольну фразу.</string> <string name="create_key_hint_full_name">Повне ім\'я, наприклад Степан Бандера</string> <!--View key--> <!--Navigation Drawer--> diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index b6ab2c8a4..b5b57d91f 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -377,7 +377,7 @@ <string name="create_key_empty">必填欄位</string> <string name="create_key_passphrases_not_equal">口令不相符</string> <string name="create_key_final_robot_text">建立金鑰可能需要一點時間,來杯咖啡吧…</string> - <string name="create_key_text">輸入你的全名、電子郵件,並選擇一組口令。</string> + <string name="create_key_identity_text">輸入你的全名、電子郵件,並選擇一組口令。</string> <!--View key--> <!--Navigation Drawer--> <string name="nav_keys">金鑰</string> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2c83ac070..b45fb1c27 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -626,8 +626,10 @@ <string name="create_key_final_robot_text">"Creating a key may take a while, have a cup of coffee in the meantime…"</string> <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string> <string name="create_key_custom">"(custom key configuration)"</string> - <string name="create_key_text">"Enter your full name, email address, and choose a passhrase."</string> - <string name="create_key_hint_full_name">"Full Name, e.g. Max Mustermann"</string> + <string name="create_key_name_text">"Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'."</string> + <string name="create_key_email_text">"Choose the email address used for encrypted communication."</string> + <string name="create_key_passphrase_text">"Choose a strong passphrase. It protects your key when your device gets stolen."</string> + <string name="create_key_hint_full_name">"Full Name or Nickname"</string> <string name="create_key_edit">"Change key configuration"</string> <!-- View key --> |