Skip to content

Commit

Permalink
feat: update scan QR code signing notice and description
Browse files Browse the repository at this point in the history
  • Loading branch information
Charon-Fan committed Jul 3, 2024
1 parent 54c1d98 commit 456726e
Show file tree
Hide file tree
Showing 7 changed files with 1,051 additions and 989 deletions.
1,173 changes: 594 additions & 579 deletions src/ui/gui_assets/font/cn/cnIllustrate.c

Large diffs are not rendered by default.

16 changes: 4 additions & 12 deletions src/ui/gui_assets/font/es/esIllustrate.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 20 px
* Bpp: 2
* Opts: --bpp 2 --size 20 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~¡£¥·¿ÁÉÑáéíñóúü€ --format lvgl -o ../gui_assets/font/es/esIllustrate.c
* Opts: --bpp 2 --size 20 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~¡£¥·¿ÁÉÑáéíñóú€ --format lvgl -o ../gui_assets/font/es/esIllustrate.c
******************************************************************************/

#ifdef LV_LVGL_H_INCLUDE_SIMPLE
Expand Down Expand Up @@ -730,13 +730,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xe, 0x74, 0x0, 0xe7, 0x40, 0x1e, 0x78, 0x2,
0xe3, 0xe5, 0xbe, 0xb, 0xf8, 0xe0,

/* U+00FC "ü" */
0x7, 0xb, 0x0, 0x70, 0xb0, 0x0, 0x0, 0x7,
0x40, 0xe, 0x74, 0x0, 0xe7, 0x40, 0xe, 0x74,
0x0, 0xe7, 0x40, 0xe, 0x74, 0x0, 0xe7, 0x40,
0xe, 0x74, 0x1, 0xe7, 0x80, 0x2e, 0x3e, 0x5b,
0xe0, 0xbf, 0x8e,

/* U+20AC "€" */
0x0, 0x2f, 0xf4, 0x1, 0xfa, 0xbc, 0x3, 0xc0,
0x0, 0xb, 0x40, 0x0, 0xf, 0x0, 0x0, 0xbf,
Expand Down Expand Up @@ -862,8 +855,7 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 3430, .adv_w = 198, .box_w = 10, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3468, .adv_w = 194, .box_w = 11, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3510, .adv_w = 198, .box_w = 10, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3548, .adv_w = 198, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3583, .adv_w = 183, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0}
{.bitmap_index = 3548, .adv_w = 183, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0}
};

/*---------------------
Expand All @@ -872,7 +864,7 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {

static const uint16_t unicode_list_1[] = {
0x0, 0x2, 0x4, 0x16, 0x1e, 0x20, 0x28, 0x30,
0x40, 0x48, 0x4c, 0x50, 0x52, 0x59, 0x5b, 0x200b
0x40, 0x48, 0x4c, 0x50, 0x52, 0x59, 0x200b
};

/*Collect the unicode lists and glyph_id offsets*/
Expand All @@ -884,7 +876,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
},
{
.range_start = 161, .range_length = 8204, .glyph_id_start = 96,
.unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 16, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
.unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 15, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};

Expand Down
803 changes: 421 additions & 382 deletions src/ui/gui_assets/font/ko/koIllustrate.c

Large diffs are not rendered by default.

18 changes: 13 additions & 5 deletions src/ui/gui_assets/font/ru/ruIllustrate.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 20 px
* Bpp: 2
* Opts: --bpp 2 --size 20 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥«·»АБВГДЕЗИЙКЛМНОПРСТУФХЧШЬЭЯабвгдежзийклмнопрстуфхцчшщыьэюя–€ --format lvgl -o ../gui_assets/font/ru/ruIllustrate.c
* Opts: --bpp 2 --size 20 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥«·»АБВГДЕЗИЙКЛМНОПРСТУФХЧШЬЭЯабвгдежзийклмнопрстуфхцчшщыьэюяё–€ --format lvgl -o ../gui_assets/font/ru/ruIllustrate.c
******************************************************************************/

#ifdef LV_LVGL_H_INCLUDE_SIMPLE
Expand Down Expand Up @@ -1077,6 +1077,13 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xff, 0xf0, 0x2e, 0x5f, 0x7, 0x80, 0xf0, 0xf0,
0xf, 0x3c, 0x0, 0xf0,

/* U+0451 "ё" */
0x3, 0x83, 0x40, 0xf, 0xd, 0x0, 0x0, 0x0,
0x0, 0x7f, 0x80, 0xb, 0x9b, 0xc0, 0x74, 0x3,
0xc3, 0xc0, 0xf, 0xf, 0xff, 0xfc, 0x3d, 0x55,
0x50, 0xf0, 0x0, 0x3, 0xc0, 0x0, 0x7, 0xc0,
0x0, 0xb, 0xea, 0xe0, 0x7, 0xfe, 0x40,

/* U+2013 "–" */
0x2a, 0xaa, 0x83, 0xff, 0xfc,

Expand Down Expand Up @@ -1253,8 +1260,9 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 5310, .adv_w = 158, .box_w = 9, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5335, .adv_w = 256, .box_w = 15, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 5377, .adv_w = 185, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5405, .adv_w = 160, .box_w = 10, .box_h = 2, .ofs_x = 0, .ofs_y = 5},
{.bitmap_index = 5410, .adv_w = 183, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0}
{.bitmap_index = 5405, .adv_w = 176, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5444, .adv_w = 160, .box_w = 10, .box_h = 2, .ofs_x = 0, .ofs_y = 5},
{.bitmap_index = 5449, .adv_w = 183, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0}
};

/*---------------------
Expand All @@ -1273,7 +1281,7 @@ static const uint8_t glyph_id_ofs_list_2[] = {
};

static const uint16_t unicode_list_4[] = {
0x0, 0x1, 0x2, 0x3, 0x4, 0x1bc8, 0x1c61
0x0, 0x1, 0x2, 0x3, 0x4, 0x6, 0x1bc8, 0x1c61
};

/*Collect the unicode lists and glyph_id offsets*/
Expand All @@ -1297,7 +1305,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
},
{
.range_start = 1099, .range_length = 7266, .glyph_id_start = 153,
.unicode_list = unicode_list_4, .glyph_id_ofs_list = NULL, .list_length = 7, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
.unicode_list = unicode_list_4, .glyph_id_ofs_list = NULL, .list_length = 8, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};

Expand Down
8 changes: 4 additions & 4 deletions src/ui/gui_chain/others/gui_stellar.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ void GuiStellarTxNotice(lv_obj_t *parent, void *totalData)
{
CreateStellarNoticeCOntainer(
parent,
"Notice",
"XDR (External Data Representation) standardizes data encoding for consistent serialization. You can compare this with the software wallet.",
_("scan_qr_code_signing_notice"),
_("scan_qr_code_signing_xdr_signing_desc"),
360,
120
145
);
}

Expand All @@ -131,7 +131,7 @@ void GuiStellarHashNotice(lv_obj_t *parent, void *totalData)
_("scan_qr_code_signing_notice"),
_("scan_qr_code_signing_hash_signing_desc"),
360,
120
180
);
}

Expand Down
3 changes: 2 additions & 1 deletion src/ui/lv_i18n/data.csv
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,8 @@ Scan,20,scan_qr_code_error_invalid_file_desc,The date of file not recognized. Pl
,36,change_passcode_mid_btn,Enter Passcode,Введите код-пароль,비밀번호 입력,输入密码,Ingresa el código de acceso,Zugangscode eingeben,パスコード入力,
,20,scan_qr_code_signing_desc,Signing,Подписание,서명,签名中,Firma,Unterzeichnung,署名,
,20,scan_qr_code_signing_notice,Notice,Уведомление,알림,提示,Aviso,Benachrichtigung,お知らせ,
,20,scan_qr_code_signing_hash_signing_desc,Hash signing uses a private key to sign a transaction's hash for integrity and authenticity. You can compare this with the software wallet.,Хешированная подпись использует закрытый ключ для подписания хеша транзакции для обеспечения целостности и подлинности. Вы можете сравнить это с программным кошельком.,해시 서명은 거래의 해시에 대한 무결성과 진위를 인증하기 위해 개인 키를 사용합니다. 이를 소프트웨어 지갑과 비교할 수 있습니다.,哈希签名使用私钥对交易的哈希值进行签名,以确保数据的完整性和真实性。您可以将此与软件钱包进行比较。,La firma de hash utiliza una clave privada para firmar el hash de una transacción para asegurar su integridad y autenticidad. Puedes comparar esto con la cartera de software. Das Hash-Signieren verwendet einen privaten Schlüssel, um den Hash einer Transaktion für Integrität und Authentizität zu signieren. Dies können Sie mit der Software-Wallet vergleichen.,ハッシュ署名は、トランザクションのハッシュを署名して整合性と真正性を保証するために秘密鍵を使用します。これをソフトウェアウォレットと比較することができます。,
,20,scan_qr_code_signing_hash_signing_desc,Hash signing uses a private key to sign a transaction's hash for integrity and authenticity. You can compare this with the software wallet.,"Хеш-подписание использует приватный ключ для подписи хеша транзакции, обеспечивая её целостность и подлинность. Сравните с программным кошельком.","해시 서명은 거래의 해시를 개인키로 서명하여 무결성과 진위를 보증합니다. 소프트웨어 지갑과 비교하세요.","哈希签名利用私钥为交易哈希签名,确保其完整性和真实性。可与软件钱包比较。","La firma de hash utiliza una clave privada para firmar el hash de la transacción, garantizando integridad y autenticidad. Comparar con la cartera software.","Hash-Signieren verwendet einen privaten Schlüssel, um den Transaktionshash zu signieren, was Integrität und Echtheit gewährleistet. Vergleichbar mit der Software-Wallet.","ハッシュ署名は取引のハッシュを秘密鍵で署名し、完全性と真実性を保証します。ソフトウェアウォレットと比較してください。",
,20,scan_qr_code_signing_xdr_signing_desc,"XDR (External Data Representation) standardizes data encoding for consistent serialization. You can compare this with the software wallet.","XDR (Внешнее представление данных) стандартизирует кодирование данных для последовательной сериализации. Сравните это с программным кошельком.","XDR(외부 데이터 표현)은 일관된 직렬화를 위해 데이터 인코딩을 표준화합니다. 소프트웨어 지갑과 비교하세요.","XDR(外部数据表示)标准化数据编码以实现一致的序列化。可以与软件钱包进行比较。","XDR (Representación de Datos Externos) estandariza la codificación de datos para una serialización consistente. Compárelo con la cartera de software.","XDR (Externe Datenrepräsentation) standardisiert die Datenkodierung für konsistente Serialisierung. Vergleichbar mit der Software-Wallet.","XDR(外部データ表現)はデータのエンコーディングを標準化し、一貫したシリアル化を実現します。ソフトウェアウォレットと比較してください。"
,20,scan_qr_code_sign_unsigned_content_fingerprint_failed_desc,Verification failed. Please try again!,Проверка не удалась. Повторите еще раз!,확인에 실패했습니다. 다시 시도하십시오!,验证失败.请重新尝试!,"¡La verificación falló. Por favor, inténtalo de nuevo!",Überprüfung fehlgeschlagen. Bitte versuchen Sie es erneut!,検証に失敗しました.もう一度お試しください!,
,20,scan_qr_code_sign_unsigned_content_fingerprint_failed_desc2,"If the verification fails again, the fingerprint signing for transactions will automatically be disabled.","Если проверка снова завершится неудачно, подписание транзакции через отпечаток пальцев будет отключен.",검증에 다시 실패하면 거래에 대한 지문 서명이 자동으로 비활성화됩니다.,"如果验证再次失败,则指纹签名的功能将自动失效.","Si la verificación falla nuevamente, la firma de huella dactilar para las transacciones se desactivará automáticamente.","Wenn die Verifizierung erneut fehlschlägt, wird die Fingerabdruck-Unterzeichnung für Transaktionen automatisch deaktiviert.",もし再び認証に失敗した場合、取引のための指紋認証は自動的に無効にされます.,
USB,28,usb_transport_connection_request,Connection Request,Запрос подключения,연결 요청,连接请求,Solicitud de conexión,Verbindungsanfrage,接続リクエスト,
Expand Down
Loading

0 comments on commit 456726e

Please sign in to comment.