diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
23 files changed, 45 insertions, 46 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml index d4ece38ac..c1f692a88 100644 --- a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml @@ -62,6 +62,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/btn_back" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" @@ -79,6 +80,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/btn_next" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" 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 9a6c33f82..118f0661a 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -155,6 +155,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/btn_back" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" @@ -172,6 +173,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/btn_create_key" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" diff --git a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml index 7b8ba3fc1..4e37dd713 100644 --- a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml @@ -56,6 +56,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/btn_back" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" @@ -73,6 +74,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/btn_next" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" diff --git a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml index 9d10bbe70..9368aa1ef 100644 --- a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml @@ -74,6 +74,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_weight="1" android:text="@string/btn_back" android:textAllCaps="true" @@ -91,6 +92,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_weight="1" android:text="@string/btn_next" android:textAllCaps="true" 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 20c434c02..622cdf5a0 100644 --- a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml @@ -74,6 +74,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_weight="1" android:text="@string/first_time_import_key" android:textAllCaps="true" @@ -91,6 +92,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_weight="1" android:text="@string/btn_do_not_save" android:textAllCaps="true" 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 ca203d0b5..7e2bf2246 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 @@ -45,6 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/btn_back" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" @@ -52,8 +53,7 @@ android:drawablePadding="8dp" android:gravity="left|center_vertical" android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:layout_gravity="center_vertical" /> + style="?android:attr/borderlessButtonStyle" /> <TextView android:id="@+id/create_key_next_button" @@ -63,6 +63,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/first_time_blank_yubikey_yes" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" @@ -70,7 +71,6 @@ android:drawablePadding="8dp" android:gravity="center_vertical|right" android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:layout_gravity="center_vertical" /> + style="?android:attr/borderlessButtonStyle" /> </LinearLayout> </RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml index 838ee37b4..3a54f264f 100644 --- a/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml @@ -94,6 +94,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_weight="1" android:text="@string/btn_back" android:textAllCaps="true" @@ -111,6 +112,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_weight="1" android:text="@string/btn_import" android:textAllCaps="true" diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml index 393ec76d4..34871affe 100644 --- a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml @@ -80,6 +80,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/btn_back" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" @@ -97,6 +98,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:text="@string/btn_next" android:textAllCaps="true" android:minHeight="?android:attr/listPreferredItemHeight" diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml index d233398ca..af9080f55 100644 --- a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml @@ -79,6 +79,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:clickable="true" android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" android:drawablePadding="8dp" @@ -96,6 +97,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_gravity="center_vertical" android:clickable="true" android:drawablePadding="8dp" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml index a000dc82e..7f26995a7 100644 --- a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml @@ -56,27 +56,11 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" android:drawablePadding="8dp" + android:layout_gravity="center_vertical" 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/yubi_icon_24dp" - android:drawablePadding="16dp" - android:gravity="right|center_vertical" - android:clickable="false" - style="?android:attr/borderlessButtonStyle" /> - </LinearLayout> </RelativeLayout> diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index 0e4a43c6f..7de834eea 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -922,7 +922,7 @@ <string name="msg_cr_error_no_user_id">Schlüsselbünde müssen mindestens eine User-ID enthalten!</string> <string name="msg_cr_error_no_certify">Hauptschlüssel benötigt das Attribut beglaubigen!</string> <string name="msg_cr_error_null_expiry">Ablaufdatum kann bei Schlüsselerstellung nicht \'gleiche wie vorher\' sein. Dies ist ein Programmierfehler, bitte reiche einen Fehlerbericht ein!</string> - <string name="msg_cr_error_keysize_512">Schlüssellänge muss größer/gleich 512 sein!</string> + <string name="msg_cr_error_keysize_2048">Schlüssellänge muss größer/gleich 512 sein!</string> <string name="msg_cr_error_no_curve">Keine Schlüssellänge spezifiziert! Dies ist ein Progammierfehler, bitte reiche einen Fehlerbericht ein!</string> <string name="msg_cr_error_no_keysize">Keine Elliptische Kurve spezifiziert! Dies ist ein Progammierfehler, bitte reiche einen Fehlerbericht ein!</string> <string name="msg_cr_error_internal_pgp">Interner OpenPGP Fehler!</string> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index a6849c542..fa0a53b88 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -921,7 +921,7 @@ <string name="msg_cr_error_no_user_id">¡Los juegos de claves tienen que crearse con al menos una identificación de usuario!</string> <string name="msg_cr_error_no_certify">¡La clave maestra debe tener el indicador de certificado!</string> <string name="msg_cr_error_null_expiry">El periodo hasta la expiración no puede ser \'el mismo que antes\' al crear clave. Esto es un error de programación, ¡por favor consigne un informe de error!</string> - <string name="msg_cr_error_keysize_512">¡El tamaño de la clave debe ser mayor o igual de 512!</string> + <string name="msg_cr_error_keysize_2048">¡El tamaño de la clave debe ser mayor o igual de 512!</string> <string name="msg_cr_error_no_curve">¡No se especificó tamaño de clave! ¡Esto es un error de programación, por favor consigne un informe de fallo!</string> <string name="msg_cr_error_no_keysize">¡No se especificó curva elíptica! ¡Esto es un error de programación, por favor consigne un informe de fallo!</string> <string name="msg_cr_error_internal_pgp">¡Error OpenPGP interno!</string> diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index f57297498..81daa67ef 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -850,7 +850,7 @@ <string name="msg_cr_error_no_user_id">Giltza-uztaiak gutxienez erabiltzaile ID batekin sortu behar dira!</string> <string name="msg_cr_error_no_certify">Maisu giltzak egiaztagiri ikurra izan behar du!</string> <string name="msg_cr_error_null_expiry">Epemuga ezin daiteke giltza sortzea baino \'lehenago\' izan. Hau programazio akats bat da, mesedez agiritu akats jakinarazpen bat!</string> - <string name="msg_cr_error_keysize_512">Giltza neurria 512 edo handiagoa izan behar da!</string> + <string name="msg_cr_error_keysize_2048">Giltza neurria 512 edo handiagoa izan behar da!</string> <string name="msg_cr_error_no_curve">Ez da giltzaren neurria adierazi! Hau programazio akats bat da, mesedez agiritu akats jakinarazpen bat!</string> <string name="msg_cr_error_internal_pgp">Barneko OpenPGP akatsa!</string> <string name="msg_cr_error_unknown_algo">Algoritmo ezezaguna hautatu da! Hau programazio akats bat da, mesedez agiritu akats jakinarazpen bat!</string> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index b5e5f3d53..d67a9560f 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -921,7 +921,7 @@ <string name="msg_cr_error_no_user_id">Les trousseaux doivent être créés avec au moins un ID utilisateur !</string> <string name="msg_cr_error_no_certify">La clef maîtresse doit avoir le drapeau « certifié » !</string> <string name="msg_cr_error_null_expiry">L\'expiration ne peut pas être « pareille qu\'avant » à la création de la clef. C\'est une erreur du programme, veuillez remplir un rapport de bogue !</string> - <string name="msg_cr_error_keysize_512">La taille de la clef doit être supérieure ou égale à 512 !</string> + <string name="msg_cr_error_keysize_2048">La taille de la clef doit être supérieure ou égale à 512 !</string> <string name="msg_cr_error_no_curve">Aucune taille de clef n\'a été spécifiée ! C\'est une erreur de programmation, veuillez remplir un rapport de bogue !</string> <string name="msg_cr_error_no_keysize">Aucune courbe elliptique n\'a été spécifiée ! C\'est une erreur de programmation, veuillez remplir un rapport de bogue !</string> <string name="msg_cr_error_internal_pgp">Erreur interne OpenPGP !</string> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index 5b87c6ced..c158e341c 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -658,7 +658,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars <string name="msg_cr_error_no_master">Nessuna opzione della chiave principale specificata!</string> <string name="msg_cr_error_no_certify">La chiave principale deve avere la caratteristica di certificazione!</string> <string name="msg_cr_error_null_expiry">La data di scadenza non può essere \'come prima\' sulla creazione di chiavi. Questo è un errore di programmazione, si prega di inviare una segnalazione di bug!</string> - <string name="msg_cr_error_keysize_512">La grandezza della chiave deve essere di 512bit o maggiore</string> + <string name="msg_cr_error_keysize_2048">La grandezza della chiave deve essere di 512bit o maggiore</string> <string name="msg_cr_error_no_keysize">Nessuna curva ellittica specificata! Questo è un errore di programmazione, per favore invia una segnalazione!</string> <!--modifySecretKeyRing--> <string name="msg_mr">Modifica del portachiavi %s</string> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 789a35e75..3abf085c6 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -898,7 +898,7 @@ <string name="msg_cr_error_no_user_id">鍵輪は最低でも1つのユーザIDの生成が必要です!</string> <string name="msg_cr_error_no_certify">主鍵は検証フラグが必須です!</string> <string name="msg_cr_error_null_expiry">鍵の生成時に期限を\'過去\'とすることはできません。これはプログラムエラーで、バグレポートでファイルを送ってください!</string> - <string name="msg_cr_error_keysize_512">鍵サイズは512かそれ以上が必須です!</string> + <string name="msg_cr_error_keysize_2048">鍵サイズは512かそれ以上が必須です!</string> <string name="msg_cr_error_no_curve">鍵サイズが不明です! これはプログラムエラーで、バグレポートでファイルの提出をお願いします!</string> <string name="msg_cr_error_no_keysize">楕円暗号が不明です! これはプログラムエラーで、バグレポートでファイルの提出をお願いします!</string> <string name="msg_cr_error_internal_pgp">PGP内部エラー!</string> diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index 812376026..29d0cd57d 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -877,7 +877,7 @@ <string name="msg_cr_error_no_user_id">Sleutelbossen moeten met minstens een gebruikers-ID aangemaakt worden!</string> <string name="msg_cr_error_no_certify">Hoofdsleutel moet certificeer-vlag hebben!</string> <string name="msg_cr_error_null_expiry">Verloopdatum kan niet hetzelfde als voordien zijn bij aanmaken van een sleutel. Dit is een bug, gelieve een verslag in te dienen!</string> - <string name="msg_cr_error_keysize_512">Sleutelgrootte moet groter dan of gelijk zijn aan 512!</string> + <string name="msg_cr_error_keysize_2048">Sleutelgrootte moet groter dan of gelijk zijn aan 512!</string> <string name="msg_cr_error_no_curve">Geen sleutelgrootte opgegeven! Dit is een bug, gelieve een verslag in te dienen!</string> <string name="msg_cr_error_no_keysize">Geen elliptische curve opgegeven! Dit is een bug, gelieve een verslag in te dienen!</string> <string name="msg_cr_error_internal_pgp">Interne OpenPGP-fout!</string> diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index 6b73d367c..e3f9ccaea 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -768,7 +768,7 @@ <string name="msg_cr_error_no_user_id">Связки должны создаваться с хотя бы одним ID пользователя!</string> <string name="msg_cr_error_no_certify">Основной ключ должен иметь флаг сертификата!</string> <string name="msg_cr_error_null_expiry">Срок годности не может быть \'такой же как раньше\' при создании ключа. Это программная ошибка, пожалуйста, сообщите об этом!</string> - <string name="msg_cr_error_keysize_512">Размер ключа должен быть больше или равен 512!</string> + <string name="msg_cr_error_keysize_2048">Размер ключа должен быть больше или равен 512!</string> <string name="msg_cr_error_no_curve">Не задан размер ключа! Это программная ошибка, пожалуйста, сообщите об этом!</string> <string name="msg_cr_error_no_keysize">Не задана эллиптическая кривая! Это программная ошибка, пожалуйста, сообщите об этом!</string> <string name="msg_cr_error_internal_pgp">Внутренняя ошибка OpenPGP!</string> diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index ed7bce5f7..db31cd414 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -944,7 +944,7 @@ <string name="msg_cr_error_no_user_id">Привесци морају садржати бар један кориснички ИД!</string> <string name="msg_cr_error_no_certify">Главни кључ мора имати заставицу овере!</string> <string name="msg_cr_error_null_expiry">Датум истицања не може бити „исти као пре“ на стварању кључа. Ово је грешка у програмирању, поднесите извештај о грешци!</string> - <string name="msg_cr_error_keysize_512">Величина кључа мора бити већа или једнака 512!</string> + <string name="msg_cr_error_keysize_2048">Величина кључа мора бити већа или једнака 512!</string> <string name="msg_cr_error_no_curve">Није наведена величина кључа! Ово је грешка у програмирању, поднесите извештај о грешци!</string> <string name="msg_cr_error_no_keysize">Није наведена елиптичка крива! Ово је грешка у програмирању, поднесите извештај о грешци!</string> <string name="msg_cr_error_internal_pgp">Унутрашња ОпенПГП грешка!</string> diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index 4a0a9d083..2f4986df9 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -727,7 +727,7 @@ <string name="msg_cr">Genererar ny huvudnyckel</string> <string name="msg_cr_error_no_user_id">Nyckelringar måste skapas med minst ett användar-ID!</string> <string name="msg_cr_error_no_certify">Huvudnyckel måste ha en certifieringsflagga!</string> - <string name="msg_cr_error_keysize_512">Nyckelstorlek måste vara större eller lika med 512!</string> + <string name="msg_cr_error_keysize_2048">Nyckelstorlek måste vara större eller lika med 512!</string> <string name="msg_cr_error_internal_pgp">Internt OpenPGP-fel!</string> <string name="msg_cr_error_unknown_algo">Okänd algoritm vald. Detta är ett programmeringsfel, skicka en buggrapport!</string> <string name="msg_cr_error_flags_dsa">Dåliga nyckelflaggor valda, DSA kan inte användas för kryptering!</string> diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml index 6c0420c0b..3dc19b573 100644 --- a/OpenKeychain/src/main/res/values-uk/strings.xml +++ b/OpenKeychain/src/main/res/values-uk/strings.xml @@ -454,7 +454,7 @@ <string name="msg_cr">Генерується новий основний ключ</string> <string name="msg_cr_error_no_master">Не вказано параметрів основного ключа!</string> <string name="msg_cr_error_no_certify">Основний ключ повинен мати прапорець certify!</string> - <string name="msg_cr_error_keysize_512">Розмір ключа має бути більшим або рівним 512!</string> + <string name="msg_cr_error_keysize_2048">Розмір ключа має бути більшим або рівним 512!</string> <!--modifySecretKeyRing--> <string name="msg_mr">Змінюється в\'язка %s</string> <string name="msg_mf_error_encode">Виняток шифрування!</string> diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml index 28b6fcd78..393a1e091 100644 --- a/OpenKeychain/src/main/res/values/arrays.xml +++ b/OpenKeychain/src/main/res/values/arrays.xml @@ -48,17 +48,15 @@ <item>@string/key_size_custom</item> </string-array> <string-array name="elgamal_key_size_spinner_values" translatable="false"> - <item>@string/key_size_1536</item> <item>@string/key_size_2048</item> <item>@string/key_size_3072</item> <item>@string/key_size_4096</item> <item>@string/key_size_8192</item> </string-array> <string-array name="dsa_key_size_spinner_values" translatable="false"> - <item>@string/key_size_512</item> - <item>@string/key_size_768</item> - <item>@string/key_size_1024</item> - <item>@string/key_size_custom</item> + <item>@string/key_size_2048</item> + <item>@string/key_size_3072</item> + <item>@string/key_size_4096</item> </string-array> <string-array name="theme_entries" translatable="false"> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index bad91d9f9..8f86d5976 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -437,7 +437,6 @@ <string name="progress_decrypting">"decrypting data…"</string> <string name="progress_preparing_signature">"preparing signature…"</string> <string name="progress_generating_signature">"generating signature…"</string> - <string name="progress_processing_signature">"processing signature…"</string> <string name="progress_verifying_signature">"verifying signature…"</string> <string name="progress_signing">"signing…"</string> <string name="progress_certifying">"certifying…"</string> @@ -459,10 +458,6 @@ <string name="hint_cloud_search_hint">"Search via Name, Email…"</string> <!-- key bit length selections --> - <string name="key_size_512">"512"</string> - <string name="key_size_768">"768"</string> - <string name="key_size_1024">"1024"</string> - <string name="key_size_1536">"1536"</string> <string name="key_size_2048">"2048"</string> <string name="key_size_3072">"3072"</string> <string name="key_size_4096">"4096"</string> @@ -1030,7 +1025,7 @@ <string name="msg_cr_error_no_user_id">"Keyrings must be created with at least one user ID!"</string> <string name="msg_cr_error_no_certify">"Master key must have certify flag!"</string> <string name="msg_cr_error_null_expiry">"Expiry time cannot be 'same as before' on key creation. This is a programming error, please file a bug report!"</string> - <string name="msg_cr_error_keysize_512">"Key size must be greater or equal 512!"</string> + <string name="msg_cr_error_keysize_2048">"Key size must be greater or equal 2048!"</string> <string name="msg_cr_error_no_curve">"No key size specified! This is a programming error, please file a bug report!"</string> <string name="msg_cr_error_no_keysize">"No elliptic curve specified! This is a programming error, please file a bug report!"</string> <string name="msg_cr_error_internal_pgp">"Internal OpenPGP error!"</string> @@ -1179,6 +1174,7 @@ <string name="msg_dc_error_input">"Error opening input data stream!"</string> <string name="msg_dc_error_no_data">"No encrypted data found in stream!"</string> <string name="msg_dc_error_no_key">"No encrypted data with known secret key found in stream!"</string> + <string name="msg_dc_error_no_signature">"Missing signature data!"</string> <string name="msg_dc_error_pgp_exception">"Encountered OpenPGP Exception during operation!"</string> <string name="msg_dc_integrity_check_ok">"Integrity check OK!"</string> <string name="msg_dc_ok_meta_only">"Only metadata was requested, skipping decryption"</string> @@ -1202,8 +1198,9 @@ <!-- Messages for VerifySignedLiteralData operation --> <string name="msg_vl">"Starting signature check"</string> - <string name="msg_vl_error_no_siglist">"No signature list in signed literal data"</string> - <string name="msg_vl_error_wrong_key">"Message not signed with right key"</string> + <string name="msg_vl_error_no_siglist">"No signature list in signed literal data!"</string> + <string name="msg_vl_error_wrong_key">"Message not signed with expected key!"</string> + <string name="msg_vl_error_no_signature">"Missing signature data!"</string> <string name="msg_vl_error_missing_literal">"No payload in signed literal data"</string> <string name="msg_vl_clear_meta_file">"Filename: %s"</string> <string name="msg_vl_clear_meta_mime">"MIME type: %s"</string> @@ -1225,7 +1222,6 @@ <!-- Messages for PgpSignEncrypt operation --> <string name="msg_pse_asymmetric">"Preparing public keys for encryption"</string> - <string name="msg_pse_clearsign_only">"Signing of cleartext input not supported!"</string> <string name="msg_pse_compressing">"Preparing compression"</string> <string name="msg_pse_encrypting">"Encrypting data"</string> <string name="msg_pse_error_bad_passphrase">"Bad password!"</string> @@ -1660,4 +1656,9 @@ <string name="snack_backup_saved_dir">"Saved to OpenKeychain directory"</string> <string name="btn_backup_back">Go back to check</string> + <string name="share_log_dialog_title">"Share log?"</string> + <string name="share_log_dialog_message">"While logs can be super helpful for developers to find bugs in OpenKeychain, they can contain potential sensitive information such as data about the updated keys. Please make sure you are okay with sharing this information."</string> + <string name="share_log_dialog_share_button">"Share"</string> + <string name="share_log_dialog_cancel_button">"Cancel"</string> + </resources> |