Compare commits

...

235 Commits

Author SHA1 Message Date
dragonpilot 0e17475449 Merge branch 'devel-en' into devel-zhs 2020-02-14 11:24:14 +10:00
dragonpilot c8a01c5248 remove removed alerts 2020-02-08 13:42:57 +10:00
dragonpilot 83be042013 fix up translation 2020-02-08 13:37:33 +10:00
dragonpilot 8dd8d7e33e Merge branch 'devel-en' into devel-zhs 2020-02-08 13:27:01 +10:00
dragonpilot 28dc70fe29 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2020-01-31 17:29:05 +10:00
dragonpilot 272adcb960 keep chinese fonts 2020-01-31 17:20:58 +10:00
dragonpilot ac47815391 Merge branch 'devel-en' into devel-zhs 2020-01-31 17:19:46 +10:00
dragonpilot 1f9d3825bf Merge branch 'devel-en' into devel-zhs 2020-01-29 22:03:52 +10:00
dragonpilot b68f0cff4a Merge branch 'devel-en' into devel-zhs 2020-01-23 15:07:30 +10:00
dragonpilot 6be0e673b3 add translations 2020-01-19 21:30:24 +10:00
dragonpilot 4b4c04b387 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2020-01-19 21:01:09 +10:00
dragonpilot 0f31b841ec Merge branch 'devel-en' into devel-zhs 2020-01-19 21:00:49 +10:00
dragonpilot 294fd0eb8d Merge branch 'devel-en' into devel-zhs 2020-01-14 15:37:14 +10:00
dragonpilot 9501be7614 Merge branch 'devel-en' into devel-zhs 2020-01-08 15:05:46 +10:00
dragonpilot d020d2c83d Merge branch 'devel-en' into devel-zhs 2020-01-06 13:15:26 +10:00
dragonpilot 775edcf65f re-add missing apks 2019-12-31 18:12:59 +10:00
dragonpilot 444e219608 Merge branch 'devel-en' into devel-zhs 2019-12-31 18:11:58 +10:00
Rick Lan 147a7593e7 fix unable to launch app issue 2019-12-29 23:23:55 +10:00
Rick Lan 2376b8b2e0 Merge branch 'devel-en' into devel-zhs 2019-12-29 22:15:45 +10:00
dragonpilot 0ed5c393dc Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2019-12-18 16:18:49 +10:00
dragonpilot 692129f012 appless version 2019-12-18 16:18:31 +10:00
dragonpilot a866998462 Merge branch 'devel-en' into devel-zhs 2019-12-18 14:42:24 +10:00
dragonpilot c500e51f29 Merge branch 'devel-en' into devel-zhs 2019-12-18 11:57:22 +10:00
dragonpilot ddda7c7953 update translation 2019-12-17 12:54:25 +10:00
dragonpilot 8d10aeb437 Merge branch 'devel-en' into devel-zhs 2019-12-17 11:03:03 +10:00
dragonpilot e6647e61db Merge branch 'devel-en' into devel-zhs 2019-12-17 11:01:56 +10:00
dragonpilot 73d8a0ca40 auto lane change send alerts 2019-12-17 11:01:48 +10:00
dragonpilot 264e56f228 update translation 2019-12-17 10:31:10 +10:00
dragonpilot c16791d735 Merge branch 'devel-en' into devel-zhs 2019-12-17 10:08:25 +10:00
dragonpilot 5d900611ff Merge branch 'devel-en' into devel-zhs 2019-12-10 11:41:32 +10:00
dragonpilot 29128cb006 Merge branch 'devel-en' into devel-zhs 2019-11-21 09:23:02 +10:00
dragonpilot 5d0fccc8e4 Merge branch 'devel-en' into devel-zhs 2019-11-19 16:04:30 +10:00
dragonpilot 38f446dfd0 Merge branch 'devel-en' into devel-zhs 2019-11-19 10:12:04 +10:00
dragonpilot db753906ad Merge branch 'devel-en' into devel-zhs 2019-11-18 08:02:21 +10:00
dragonpilot b9981168f1 bug fix 2019-11-15 18:29:30 +10:00
dragonpilot a50dbb22d0 Merge branch 'devel-en' into devel-zhs 2019-11-15 09:26:22 +10:00
dragonpilot f3eb105e7a Merge branch 'devel-en' into devel-zhs 2019-11-15 09:11:40 +10:00
dragonpilot 5dbcd65a7d Merge branch 'devel-en' into devel-zhs 2019-11-13 13:19:07 +10:00
dragonpilot dddc29fdb7 Merge branch 'devel-en' into devel-zhs 2019-11-12 12:40:18 +10:00
dragonpilot 9bfdbab1da Merge branch 'devel-en' into devel-zhs 2019-11-11 10:48:47 +10:00
dragonpilot a9570e7eab Merge branch 'devel-en' into devel-zhs 2019-11-08 13:11:20 +10:00
dragonpilot 0612f6162b Merge branch 'devel-en' into devel-zhs 2019-11-07 11:55:41 +10:00
dragonpilot bdc5497603 Merge branch 'devel-en' into devel-zhs 2019-11-07 11:42:52 +10:00
dragonpilot 461b0adcb2 Merge branch 'devel-en' into devel-zhs 2019-11-06 16:45:04 +10:00
dragonpilot 04d7684b7c Merge branch 'devel-en' into devel-zhs 2019-11-06 16:34:31 +10:00
dragonpilot 30737d6f18 Merge branch 'devel-en' into devel-zhs 2019-11-06 15:22:00 +10:00
dragonpilot 2d9cc41871 Merge branch 'devel-en' into devel-zhs 2019-11-06 14:58:03 +10:00
dragonpilot 6a353954e8 Merge branch 'devel-en' into devel-zhs 2019-11-06 14:51:29 +10:00
dragonpilot 4507453c1d Merge branch 'devel-en' into devel-zhs 2019-11-05 14:41:47 +10:00
dragonpilot 7ea0f9636f Merge branch 'devel-en' into devel-zhs 2019-11-04 16:44:08 +10:00
dragonpilot 682bb349df Merge branch 'devel-en' into devel-zhs 2019-11-01 13:39:18 +10:00
dragonpilot 14fd00051f Merge branch 'devel-en' into devel-zhs 2019-11-01 13:35:46 +10:00
dragonpilot d8160015b7 Merge branch 'devel-en' into devel-zhs 2019-11-01 11:11:39 +10:00
dragonpilot 53422a42e4 Merge branch 'devel-en' into devel-zhs 2019-10-31 11:25:29 +10:00
dragonpilot b7ae456df0 Merge branch 'devel-en' into devel-zhs 2019-10-30 11:56:24 +10:00
dragonpilot 6cbfa9ef2b Merge branch 'devel-en' into devel-zhs 2019-10-30 10:37:42 +10:00
dragonpilot debfe847ff Merge branch 'devel-en' into devel-zhs 2019-10-30 09:32:04 +10:00
dragonpilot ae0dbf52d9 update APK 2019-10-29 10:17:41 +10:00
dragonpilot ab305f4d4f Merge branch 'devel-en' into devel-zhs 2019-10-29 10:04:16 +10:00
dragonpilot 3ba8e21aa8 Merge branch 'devel-en' into devel-zhs 2019-10-28 12:34:23 +10:00
dragonpilot e7580fd47f Merge branch 'devel-en' into devel-zhs 2019-10-27 09:56:45 +10:00
dragonpilot 5281c6e047 Merge branch 'devel-en' into devel-zhs 2019-10-25 09:18:19 +10:00
dragonpilot 2100ebb4db Merge branch 'devel-en' into devel-zhs 2019-10-24 13:44:15 +10:00
dragonpilot 97c10c6a76 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2019-10-22 16:54:10 +10:00
dragonpilot eb4c746f9e Merge branch 'devel-en' into devel-zhs 2019-10-22 16:53:48 +10:00
dragonpilot 06d301042a Merge branch 'devel-en' into devel-zhs 2019-10-21 19:04:50 +10:00
dragonpilot c5a1244bfe update APK 2019-10-21 11:23:59 +10:00
dragonpilot 2a5625e43d Merge branch 'devel-en' into devel-zhs 2019-10-21 11:20:49 +10:00
dragonpilot f5a4fee857 Merge branch 'devel-en' into devel-zhs 2019-10-18 09:52:42 +10:00
dragonpilot a6527a4af1 Merge branch 'devel-en' into devel-zhs 2019-10-18 09:42:02 +10:00
dragonpilot 69c15b6c24 update APK 2019-10-17 14:29:54 +10:00
dragonpilot 74d5114bb3 Merge branch 'devel-en' into devel-zhs 2019-10-17 14:29:44 +10:00
dragonpilot 51e3102563 Merge branch 'devel-en' into devel-zhs 2019-10-17 13:35:17 +10:00
dragonpilot 01e859daee update APK 2019-10-17 10:39:03 +10:00
dragonpilot b255a2b3a8 Merge branch 'devel-en' into devel-zhs 2019-10-17 10:37:34 +10:00
dragonpilot 26f73d91bc Merge branch 'devel-en' into devel-zhs 2019-10-16 17:22:31 +10:00
dragonpilot 9080ac3b59 Merge branch 'devel-en' into devel-zhs 2019-10-16 16:11:23 +10:00
dragonpilot 1d99e4bed7 Merge branch 'devel-en' into devel-zhs 2019-10-16 11:58:03 +10:00
dragonpilot 409de73850 Merge branch 'devel-en' into devel-zhs 2019-10-16 10:36:45 +10:00
dragonpilot 7d24dfc389 Merge branch 'devel-en' into devel-zhs 2019-10-15 12:02:50 +10:00
dragonpilot ad6a84d1da Update APK 2019-10-14 17:20:03 +10:00
dragonpilot f875a55221 Merge branch 'devel-en' into devel-zhs 2019-10-14 17:19:03 +10:00
dragonpilot a7f87c55cb Merge branch 'devel-en' into devel-zhs 2019-10-14 16:56:25 +10:00
dragonpilot 0fbd36f6a5 Merge branch 'devel-en' into devel-zhs 2019-10-14 16:04:14 +10:00
dragonpilot ba85e0125a Merge branch 'devel-en' into devel-zhs 2019-10-14 13:59:49 +10:00
dragonpilot c9ce994f5e update APK 2019-10-14 13:51:23 +10:00
dragonpilot b21b4c4d5c Merge branch 'devel-en' into devel-zhs 2019-10-14 13:51:15 +10:00
dragonpilot 231a84bbda update APK 2019-10-14 12:37:36 +10:00
dragonpilot 6798f3ea7f Merge branch 'devel-en' into devel-zhs 2019-10-14 11:04:37 +10:00
dragonpilot 06cbc7c363 Merge branch 'devel-en' into devel-zhs 2019-10-13 10:37:31 +10:00
dragonpilot 46c180dc2c Merge branch 'devel-en' into devel-zhs 2019-10-11 13:44:32 +10:00
dragonpilot 08cd6e0c10 Update APK 2019-10-11 13:14:38 +10:00
dragonpilot b0e1df656b Merge branch 'devel-en' into devel-zhs 2019-10-11 13:14:08 +10:00
dragonpilot 30a17d23cc Merge branch 'devel-en' into devel-zhs 2019-10-10 23:24:14 +10:00
dragonpilot a647d01502 Merge branch 'devel-en' into devel-zhs 2019-10-09 14:46:35 +10:00
dragonpilot a2ca21b502 Merge branch 'devel-en' into devel-zhs 2019-10-08 14:43:33 +10:00
dragonpilot d04fd932e4 Update APK 2019-10-08 11:21:22 +10:00
dragonpilot 9ed6830263 Merge branch 'devel-en' into devel-zhs 2019-10-08 10:50:08 +10:00
dragonpilot d14540b46a Merge branch 'devel-en' into devel-zhs 2019-10-08 10:25:54 +10:00
dragonpilot f05c53ad8c Merge branch 'devel-en' into devel-zhs 2019-10-07 21:11:53 +10:00
dragonpilot 2ee5cb61ee Merge branch 'devel-en' into devel-zhs 2019-10-06 20:20:20 +10:00
dragonpilot 82721d8bc8 Merge branch 'devel-en' into devel-zhs 2019-10-01 12:18:30 +10:00
dragonpilot 6f91fc9051 Merge branch 'devel-en' into devel-zhs 2019-09-30 12:47:58 +10:00
dragonpilot c9ef907a3f Merge branch 'devel-en' into devel-zhs 2019-09-30 11:44:49 +10:00
dragonpilot fff423ea5e Merge branch 'devel-en' into devel-zhs 2019-09-28 16:39:06 +10:00
dragonpilot 1aefaf9bcf Merge branch 'devel-en' into devel-zhs 2019-09-27 15:11:51 +10:00
dragonpilot ee5945fcb9 Merge branch 'devel-en' into devel-zhs 2019-09-26 16:59:27 +10:00
dragonpilot b852ef96e4 Merge branch 'devel-en' into devel-zhs 2019-09-26 16:51:01 +10:00
dragonpilot 50e0ee1e98 Update APK 2019-09-25 11:06:03 +10:00
dragonpilot 794331b9b3 Merge branch 'devel-en' into devel-zhs 2019-09-25 10:59:53 +10:00
dragonpilot 1b13875c24 Merge branch 'devel-en' into devel-zhs 2019-09-23 14:44:33 +10:00
dragonpilot e308d9df21 Update APK 2019-09-23 14:29:17 +10:00
dragonpilot c47d92d53e Merge branch 'devel-en' into devel-zhs 2019-09-23 14:28:54 +10:00
dragonpilot ffba949e80 update APK 2019-09-23 13:46:45 +10:00
dragonpilot 62aff30042 Merge branch 'devel-en' into devel-zhs 2019-09-23 13:44:48 +10:00
dragonpilot a39185d4ff Merge branch 'devel-en' into devel-zhs 2019-09-23 12:38:14 +10:00
dragonpilot 8c0a81dd51 update APK 2019-09-20 16:00:21 +10:00
dragonpilot 00b52381e7 Merge branch 'devel-en' into devel-zhs 2019-09-20 16:00:10 +10:00
dragonpilot 8f89061cc8 Merge branch 'devel-en' into devel-zhs 2019-09-20 15:24:48 +10:00
dragonpilot f447d535ce Merge branch 'devel-en' into devel-zhs 2019-09-19 16:40:03 +10:00
dragonpilot 2212764112 Merge branch 'devel-en' into devel-zhs 2019-09-17 12:41:58 +10:00
dragonpilot 0539ed33de Merge branch 'devel-en' into devel-zhs 2019-09-14 18:20:34 +10:00
dragonpilot 4f75739f81 Update APK 2019-09-13 23:11:38 +10:00
dragonpilot 7f895f57e4 Merge branch 'devel-en' into devel-zhs 2019-09-13 23:11:12 +10:00
dragonpilot ff616558cc Merge branch 'devel-en' into devel-zhs 2019-09-09 14:25:23 +10:00
dragonpilot 9750c8eae1 Merge branch 'devel-en' into devel-zhs 2019-09-09 14:18:08 +10:00
dragonpilot ce85c85a40 更新APK 2019-09-09 13:03:50 +10:00
dragonpilot cdcf110c97 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.frame.apk
#	apk/ai.comma.plus.offroad.apk
2019-09-09 12:57:52 +10:00
dragonpilot 08071b48af Merge branch 'devel-en' into devel-zhs 2019-09-05 15:33:34 +10:00
dragonpilot c050b6c383 Merge branch 'devel-en' into devel-zhs 2019-09-05 11:16:27 +10:00
dragonpilot e5783bf3fd Merge branch 'devel-en' into devel-zhs 2019-09-04 15:37:53 +10:00
dragonpilot 8cd913dade Merge branch 'devel-en' into devel-zhs 2019-09-04 14:40:32 +10:00
dragonpilot 50fbc5cf71 Merge branch 'devel-zhs' of https://dragonpilot@github.com/dragonpilot-community/dragonpilot.git; branch 'devel-en' into devel-zhs 2019-09-04 12:23:40 +10:00
dragonpilot 921c91993a Merge branch 'devel-en' into devel-zhs 2019-09-02 15:35:18 +10:00
dragonpilot 0ebb6441e9 Merge branch 'devel-en' into devel-zhs 2019-09-02 14:46:03 +10:00
dragonpilot f46f416556 Merge branch 'devel-en' into devel-zhs 2019-09-02 13:24:29 +10:00
dragonpilot a926ee5ef7 更新APK 2019-09-02 11:58:08 +10:00
dragonpilot ce7f054671 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2019-09-02 11:51:10 +10:00
dragonpilot 0f987c799c Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.frame.apk
2019-09-02 11:50:24 +10:00
dragonpilot 39a3480d26 Merge branch 'devel-en' into devel-zhs 2019-08-30 20:51:05 +10:00
dragonpilot c4afd612cf 更新APK 2019-08-30 15:24:42 +10:00
dragonpilot df7d57c657 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-30 15:19:45 +10:00
dragonpilot db709ce0ce Merge branch 'devel-en' into devel-zhs 2019-08-30 14:14:08 +10:00
dragonpilot d3084128e4 Merge branch 'devel-en' into devel-zhs 2019-08-30 13:56:55 +10:00
dragonpilot 4f7b7aac14 更新APK 2019-08-30 13:41:03 +10:00
dragonpilot 3957d92c14 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-30 13:36:52 +10:00
dragonpilot 19d91897aa 更新APK 2019-08-30 12:04:49 +10:00
dragonpilot 41b57f4568 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-30 12:03:25 +10:00
dragonpilot d99dce1aa5 更新APK 2019-08-28 16:22:25 +10:00
dragonpilot fdde1eba3d Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-28 16:22:11 +10:00
dragonpilot 8f981df2bb Merge branch 'devel-en' into devel-zhs 2019-08-28 16:08:50 +10:00
dragonpilot 10e0ed5461 Merge branch 'devel-en' into devel-zhs 2019-08-28 16:06:50 +10:00
dragonpilot f569f9a2f3 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-28 11:23:51 +10:00
dragonpilot 880ba97b8d 更新APK 2019-08-27 13:59:20 +10:00
dragonpilot 9c4e6e4f1a Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-27 13:59:11 +10:00
dragonpilot b70736ab33 Merge branch 'devel-en' into devel-zhs 2019-08-23 01:26:06 +10:00
dragonpilot a35b875282 Merge branch 'devel-en' into devel-zhs 2019-08-23 01:15:50 +10:00
dragonpilot 19ae57ad46 更新APK 2019-08-23 00:43:50 +10:00
dragonpilot 7a60cdd3aa Merge branch 'devel-en' into devel-zhs 2019-08-23 00:43:18 +10:00
dragonpilot fd194c14a3 Merge branch 'devel-en' into devel-zhs 2019-08-22 18:05:37 +10:00
dragonpilot 017c2e8473 更新APK 2019-08-22 16:28:43 +10:00
dragonpilot d47895f42e Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-22 16:27:24 +10:00
dragonpilot 68a2fc2424 更新APK 2019-08-22 16:00:31 +10:00
dragonpilot e9340892f6 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-22 16:00:00 +10:00
dragonpilot e71738a666 Merge branch 'devel-en' into devel-zhs 2019-08-22 00:11:59 +10:00
dragonpilot c9171abe1c Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-21 17:46:28 +10:00
dragonpilot 1014772fd5 更新APK 2019-08-20 16:51:28 +10:00
dragonpilot 809ed323e9 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-20 16:49:20 +10:00
dragonpilot 1128037183 Merge branch 'devel-en' into devel-zhs 2019-08-19 16:50:11 +10:00
dragonpilot 46994e713f Merge branch 'devel-en' into devel-zhs 2019-08-19 15:26:41 +10:00
dragonpilot 6c0ef49134 Merge branch 'devel-en' into devel-zhs 2019-08-19 14:26:35 +10:00
dragonpilot 4e3cfb5eeb Merge branch 'devel-en' into devel-zhs 2019-08-19 12:49:09 +10:00
dragonpilot 21e04e4859 Merge branch 'devel-en' into devel-zhs 2019-08-19 12:26:02 +10:00
dragonpilot ba6b5a754d Merge branch 'devel-en' into devel-zhs 2019-08-19 12:12:03 +10:00
dragonpilot 495cfc9f9d Merge branch 'devel-en' into devel-zhs 2019-08-19 12:10:06 +10:00
dragonpilot b44d0d9a41 更新APK 2019-08-19 11:53:36 +10:00
dragonpilot 94bace2180 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.frame.apk
#	apk/ai.comma.plus.offroad.apk
2019-08-19 11:52:23 +10:00
dragonpilot 5992dfad64 Merge branch 'devel-en' into devel-zhs 2019-08-19 10:30:42 +10:00
dragonpilot 24587c52ad Merge branch 'devel-en' into devel-zhs 2019-08-15 17:16:29 +10:00
dragonpilot 84829791ec Merge branch 'devel-en' into devel-zhs 2019-08-15 15:37:58 +10:00
dragonpilot 3e8377ec69 更新預設語系 2019-08-15 15:16:05 +10:00
dragonpilot 91c106c50d Merge branch 'devel-en' into devel-zhs 2019-08-15 15:15:37 +10:00
dragonpilot f1c249c315 Merge branch 'devel-en' into devel-zhs 2019-08-14 13:59:50 +10:00
dragonpilot 33db3a46a6 更新APK 2019-08-14 12:14:42 +10:00
dragonpilot b6a7a76f94 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-14 12:12:59 +10:00
dragonpilot 201147b641 更新APK 2019-08-14 11:01:06 +10:00
dragonpilot 31f25d67b9 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-14 10:47:01 +10:00
dragonpilot e0c027647f 更新APK 2019-08-12 23:15:53 +10:00
dragonpilot 3811b73472 conflict 2019-08-12 23:15:33 +10:00
dragonpilot e4e0f9ae0e 加入高德地圖 2019-08-11 08:08:24 +10:00
dragonpilot 2dec513506 Merge branch 'devel-en' into devel-zhs 2019-08-11 02:06:53 +10:00
dragonpilot 1b10f26612 Merge branch 'devel-en' into devel-zhs 2019-08-06 15:43:33 +10:00
Dragonpilot db8f6f2030 Merge branch 'devel-en' into devel-zhs 2019-08-02 09:18:26 +10:00
Dragonpilot f3d4fc2fb0 Merge branch 'devel-en' into devel-zhs 2019-08-02 08:53:51 +10:00
Dragonpilot a9dfc2c6b7 更新 APK 2019-08-01 11:44:16 +10:00
Dragonpilot 4acf552ee2 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-01 11:31:23 +10:00
dragonpilot 1a6246dc26 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-31 23:22:10 +10:00
Dragonpilot 402bbc38dc 更新 APK 2019-07-31 11:31:16 +10:00
Dragonpilot 2a28a5d45c Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-31 11:28:48 +10:00
Dragonpilot 91c322f32b 更新 APK 2019-07-31 09:38:03 +10:00
dragonpilot cecd626758 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-31 08:37:43 +10:00
Dragonpilot c8d0db8245 Merge branch 'devel-en' into devel-zhs 2019-07-29 10:39:42 +10:00
dragonpilot 7f0d7ad126 Merge branch 'devel-en' into devel-zhs 2019-07-28 10:22:48 +10:00
Dragonpilot c39515d089 更新 APK 2019-07-26 15:31:41 +10:00
Dragonpilot b3a5ca8665 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-26 15:29:03 +10:00
Dragonpilot 0b34cf80ce Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-26 12:03:24 +10:00
dragonpilot 448e332a6c 更新 APK 2019-07-25 22:18:12 +10:00
dragonpilot d7ac244156 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-25 22:01:27 +10:00
dragonpilot 0d40204bab Merge branch 'devel-en' into devel-zhs 2019-07-24 00:29:25 +10:00
dragonpilot 5c1834fd74 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot-dev into devel-zhs 2019-07-24 00:29:20 +10:00
Dragonpilot 4c19b948a2 Merge branch 'devel-en' into devel-zhs 2019-07-23 15:52:07 +10:00
Dragonpilot 677070934a Merge branch 'devel-en' into devel-zhs 2019-07-23 15:40:53 +10:00
Dragonpilot 42ef74155a 更新 APK 2019-07-23 12:29:02 +10:00
Dragonpilot 7153b10dc9 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-23 12:28:46 +10:00
Dragonpilot 66c382734a 更新 APK 2019-07-23 11:01:13 +10:00
Dragonpilot d3fadbb53c Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-23 10:59:49 +10:00
Dragonpilot 1db92a0295 Merge branch 'devel-en' into devel-zhs 2019-07-16 15:25:12 +10:00
Dragonpilot 9b58d66b0c Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-16 11:34:44 +10:00
Dragonpilot 1249d3ceeb 更新 APK 2019-07-15 11:44:15 +10:00
Dragonpilot d71241393b 更新 APK 2019-07-15 11:33:44 +10:00
dragonpilot 4a7b35aa5f Merge branch 'devel-en' into devel-zhs 2019-07-13 22:47:19 +10:00
dragonpilot b9668d3992 Merge branch 'devel-en' into devel-zhs 2019-07-13 22:38:08 +10:00
dragonpilot 21689dc822 更新 APK 2019-07-12 21:05:38 +10:00
dragonpilot e77a179265 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-12 21:00:09 +10:00
dragonpilot 1cea4442f0 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-12 20:23:46 +10:00
Dragonpilot b175441c76 更新 APK 2019-07-12 13:27:53 +10:00
Dragonpilot c137dd39bd Merge branch 'dragonpilot-dev-en' of https://github.com/dragonpilot/dragonpilot-dev into dragonpilot-dev-zhs 2019-07-12 12:58:37 +10:00
Dragonpilot fe55d580f8 更新 APK 2019-07-11 10:55:33 +10:00
Dragonpilot 5d6cc9667f Merge branch 'dragonpilot-dev' into dragonpilot-dev-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-11 10:54:52 +10:00
dragonpilot 5e3bb1dcb9 Add zhs apks 2019-07-04 23:11:11 +10:00
Rick Lan d23aee32c1 Merge branch 'dragonpilot-dev-zhs' of https://github.com/dragonpilot-community/dragonpilot-dev into dragonpilot-dev-zhs 2019-07-04 21:32:24 +10:00
dragonpilot 9a62d62e7c Merge pull request #3 from dingliangxue/devel
add support Simplified Chinese Language
2019-07-04 21:31:51 +10:00
dragonpilot acf9e76c49 Merge branch 'dragonpilot-dev-zhs' into devel 2019-07-04 21:31:31 +10:00
Rick Lan e799115747 Merge branch 'devel' of https://github.com/dingliangxue/dragonpilot-dev into dragonpilot-dev-zhs
# Conflicts:
#	selfdrive/controls/lib/alerts.py
2019-07-04 21:24:53 +10:00
dinglx 3dcd643ac6 add support Simplified Chinese Language 2019-07-04 15:19:07 +08:00
4 changed files with 212 additions and 212 deletions
+1 -1
View File
@@ -31,7 +31,7 @@
# Android system locale, zh-TW = Traditional Chinese, zh-CN = Simplified Chinese
lang=en
lang=zh-CN
update_font=0
remove_old_font=0
+197 -197
View File
@@ -77,8 +77,8 @@ ALERTS = [
Alert(
"fcw",
"BRAKE!",
"Risk of Collision",
"刹车!",
"有碰撞的风险",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.fcw, AudibleAlert.chimeWarningRepeat, 1., 2., 2.),
@@ -91,85 +91,85 @@ ALERTS = [
Alert(
"steerSaturated",
"TAKE CONTROL",
"Turn Exceeds Steering Limit",
"接管控制",
"弯道超过方向盘转向限制",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimePrompt, 1., 2., 3.),
Alert(
"steerTempUnavailable",
"TAKE CONTROL",
"Steering Temporarily Unavailable",
"接管控制",
"转向控制暂时失效",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning1, .4, 2., 3.),
Alert(
"steerTempUnavailableMute",
"TAKE CONTROL",
"Steering Temporarily Unavailable",
"接管控制",
"转向控制暂时失效",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .2, .2, .2),
Alert(
"preDriverDistracted",
"KEEP EYES ON ROAD: Driver Appears Distracted",
"注意路况:驾驶出现分心",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1, alert_rate=0.75),
Alert(
"promptDriverDistracted",
"KEEP EYES ON ROAD",
"Driver Appears Distracted",
"注意路况",
"驾驶出现分心",
AlertStatus.userPrompt, AlertSize.mid,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
Alert(
"driverDistracted",
"DISENGAGE IMMEDIATELY",
"Driver Was Distracted",
"立即解除",
"驾驶出现分心",
AlertStatus.critical, AlertSize.full,
Priority.HIGH, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, .1, .1),
Alert(
"preDriverUnresponsive",
"TOUCH STEERING WHEEL: No Face Detected",
"触碰方向盘:无驾驶监控",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1, alert_rate=0.75),
Alert(
"promptDriverUnresponsive",
"TOUCH STEERING WHEEL",
"Driver Is Unresponsive",
"触碰方向盘",
"驾驶没有反应",
AlertStatus.userPrompt, AlertSize.mid,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
Alert(
"driverUnresponsive",
"DISENGAGE IMMEDIATELY",
"Driver Was Unresponsive",
"立即解除",
"驾驶没有反应",
AlertStatus.critical, AlertSize.full,
Priority.HIGH, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, .1, .1),
Alert(
"driverMonitorLowAcc",
"CHECK DRIVER FACE VISIBILITY",
"Driver Monitor Model Output Uncertain",
"检查驾驶面部能见度",
"驾驶监控模型输出不明确",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .4, 0., 1.),
Priority.LOW, VisualAlert.none, AudibleAlert.none, .4, 0., 4.),
Alert(
"geofence",
"DISENGAGEMENT REQUIRED",
"Not in Geofenced Area",
"请求解除",
"不在地理围栏区域之内",
AlertStatus.userPrompt, AlertSize.mid,
Priority.HIGH, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, .1, .1),
Alert(
"startup",
"Be ready to take over at any time",
"Always keep hands on wheel and eyes on road",
"随时准备好接管",
"请您将手放在方向盘上并持续注意路况",
AlertStatus.normal, AlertSize.mid,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., 15.),
@@ -182,233 +182,233 @@ ALERTS = [
Alert(
"startupNoControl",
"Dashcam mode",
"Always keep hands on wheel and eyes on road",
"硬扯记录模式",
"请您将手放在方向盘上并持续注意路况",
AlertStatus.normal, AlertSize.mid,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., 15.),
Alert(
"startupNoCar",
"Dashcam mode with unsupported car",
"Always keep hands on wheel and eyes on road",
"行车记录模式(为支持的车型)",
"请您将手放在方向盘上并持续注意路况",
AlertStatus.normal, AlertSize.mid,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., 15.),
Alert(
"ethicalDilemma",
"TAKE CONTROL IMMEDIATELY",
"Ethical Dilemma Detected",
"即可接管控制",
"检测到困难",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 1., 3., 3.),
Alert(
"steerTempUnavailableNoEntry",
"openpilot Unavailable",
"Steering Temporarily Unavailable",
"无法使用 dragonpilot",
"转向控制暂时失效",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 0., 3.),
Alert(
"manualRestart",
"TAKE CONTROL",
"Resume Driving Manually",
"接管控制",
"请自行恢复驾驶",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"resumeRequired",
"STOPPED",
"Press Resume to Move",
"已停止",
"请按RES继续",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"belowSteerSpeed",
"TAKE CONTROL",
"Steer Unavailable Below ",
"接管控制",
"转向控制暂时失效,车速低于",
AlertStatus.userPrompt, AlertSize.mid,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.none, 0., 0.4, .3),
Alert(
"debugAlert",
"DEBUG ALERT",
"DEBUG提示",
"",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .1, .1, .1),
Alert(
"preLaneChangeLeft",
"Steer Left to Start Lane Change",
"Monitor Other Vehicles",
"往左打方向盘开始切换车道",
"请注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1, alert_rate=0.75),
Alert(
"preLaneChangeRight",
"Steer Right to Start Lane Change",
"Monitor Other Vehicles",
"往右打方向盘开始切换车道",
"请注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1, alert_rate=0.75),
Alert(
"laneChange",
"Changing Lane",
"Monitor Other Vehicles",
"切换车道中",
"请注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1),
Alert(
"posenetInvalid",
"TAKE CONTROL",
"Vision Model Output Uncertain",
"接管控制",
"视觉模型输出不明确",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning1, .4, 2., 3.),
# Non-entry only alerts
Alert(
"wrongCarModeNoEntry",
"openpilot Unavailable",
"Main Switch Off",
"无法使用 dragonpilot",
"主开关关闭",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 0., 3.),
Alert(
"dataNeededNoEntry",
"openpilot Unavailable",
"Data Needed for Calibration. Upload Drive, Try Again",
"无法使用 dragonpilot",
"需要更多的数据来协助校准,请将行车记录上传后再试",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 0., 3.),
Alert(
"outOfSpaceNoEntry",
"openpilot Unavailable",
"Out of Storage Space",
"无法使用 dragonpilot",
"储存空间不足",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 0., 3.),
Alert(
"pedalPressedNoEntry",
"openpilot Unavailable",
"Pedal Pressed During Attempt",
"无法使用 dragonpilot",
"试踩踏板",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, "brakePressed", AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"speedTooLowNoEntry",
"openpilot Unavailable",
"Speed Too Low",
"无法使用 dragonpilot",
"车速过慢",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"brakeHoldNoEntry",
"openpilot Unavailable",
"Brake Hold Active",
"无法使用 dragonpilot",
"驻车刹车已启用",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"parkBrakeNoEntry",
"openpilot Unavailable",
"Park Brake Engaged",
"无法使用 dragonpilot",
"电车驻车已启动",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"lowSpeedLockoutNoEntry",
"openpilot Unavailable",
"Cruise Fault: Restart the Car",
"无法使用 dragonpilot",
"巡航系统错误,请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"lowBatteryNoEntry",
"openpilot Unavailable",
"Low Battery",
"无法使用 dragonpilot",
"电池电量过低",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"sensorDataInvalidNoEntry",
"openpilot Unavailable",
"No Data from Device Sensors",
"无法使用 dragonpilot",
"没有收到任何来自传感器的数据",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"soundsUnavailableNoEntry",
"openpilot Unavailable",
"Speaker not found",
"无法使用 dragonpilot",
"找不到音效装置",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"tooDistractedNoEntry",
"openpilot Unavailable",
"Distraction Level Too High",
"无法使用 dragonpilot",
"注意力高度不集中",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
# Cancellation alerts causing soft disabling
Alert(
"overheat",
"TAKE CONTROL IMMEDIATELY",
"System Overheated",
"即刻接管控制",
"系统过热",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"wrongGear",
"TAKE CONTROL IMMEDIATELY",
"Gear not D",
"即刻接管控制",
"档位不在D档",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"calibrationInvalid",
"TAKE CONTROL IMMEDIATELY",
"Calibration Invalid: Reposition Device and Recalibrate",
"即刻接管控制",
"校准无效:请将传感器放于新的位置并重新校准",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"calibrationIncomplete",
"TAKE CONTROL IMMEDIATELY",
"Calibration in Progress",
"即刻接管控制",
"正在校准相机中",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"doorOpen",
"TAKE CONTROL IMMEDIATELY",
"Door Open",
"即刻接管控制",
"车门开启",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"seatbeltNotLatched",
"TAKE CONTROL IMMEDIATELY",
"Seatbelt Unlatched",
"即刻接管控制",
"未系安全带",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"espDisabled",
"TAKE CONTROL IMMEDIATELY",
"ESP Off",
"即刻接管控制",
"ESP关闭",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"lowBattery",
"TAKE CONTROL IMMEDIATELY",
"Low Battery",
"即刻接管控制",
"电池电量过低",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"commIssue",
"TAKE CONTROL IMMEDIATELY",
"Communication Issue between Processes",
"即刻接管控制",
"雷达讯号错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
@@ -420,343 +420,343 @@ ALERTS = [
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"radarCanError",
"TAKE CONTROL IMMEDIATELY",
"Radar Error: Restart the Car",
"radarFault",
"即刻接管控制",
"雷达讯号错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"radarFault",
"TAKE CONTROL IMMEDIATELY",
"Radar Error: Restart the Car",
"即刻接管控制",
"雷达讯号错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"lowMemory",
"TAKE CONTROL IMMEDIATELY",
"Low Memory: Reboot Your Device",
"即刻接管控制",
"内存过低: 请重启装置",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
# Cancellation alerts causing immediate disabling
Alert(
"controlsFailed",
"TAKE CONTROL IMMEDIATELY",
"Controls Failed",
"即刻接管控制",
"控制错误",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"controlsMismatch",
"TAKE CONTROL IMMEDIATELY",
"Controls Mismatch",
"即刻接管控制",
"控制不匹配",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"canError",
"TAKE CONTROL IMMEDIATELY",
"CAN Error: Check Connections",
"即刻接管控制",
"CAN错误:请检查连接",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"steerUnavailable",
"TAKE CONTROL IMMEDIATELY",
"LKAS Fault: Restart the Car",
"即刻接管控制",
"LKAS错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"brakeUnavailable",
"TAKE CONTROL IMMEDIATELY",
"Cruise Fault: Restart the Car",
"即刻接管控制",
"巡航系统错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"gasUnavailable",
"TAKE CONTROL IMMEDIATELY",
"Gas Fault: Restart the Car",
"即刻接管控制",
"油门错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"reverseGear",
"TAKE CONTROL IMMEDIATELY",
"Reverse Gear",
"即刻接管控制",
"切换至倒车档",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"cruiseDisabled",
"TAKE CONTROL IMMEDIATELY",
"Cruise Is Off",
"即刻接管控制",
"巡航系统关闭",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"plannerError",
"TAKE CONTROL IMMEDIATELY",
"Planner Solution Error",
"即刻接管控制",
"Planner Solution 错误",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
# not loud cancellations (user is in control)
Alert(
"noTarget",
"openpilot Canceled",
"No close lead car",
"dragonpilot 已取消",
"没有侦测到前车",
AlertStatus.normal, AlertSize.mid,
Priority.HIGH, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
Alert(
"speedTooLow",
"openpilot Canceled",
"Speed too low",
"dragonpilot 已取消",
"车速过慢",
AlertStatus.normal, AlertSize.mid,
Priority.HIGH, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
# Cancellation alerts causing non-entry
Alert(
"overheatNoEntry",
"openpilot Unavailable",
"System overheated",
"无法使用 dragonpilot",
"系统过热",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"wrongGearNoEntry",
"openpilot Unavailable",
"Gear not D",
"无法使用 dragonpilot",
"车辆不在D档",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"calibrationInvalidNoEntry",
"openpilot Unavailable",
"Calibration Invalid: Reposition Device and Recalibrate",
"无法使用 dragonpilot",
"校准无效:请将传感器放于新的位置并重新校准",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"calibrationIncompleteNoEntry",
"openpilot Unavailable",
"Calibration in Progress",
"无法使用 dragonpilot",
"正在校准相机中",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"doorOpenNoEntry",
"openpilot Unavailable",
"Door open",
"无法使用 dragonpilot",
"车门开启",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"seatbeltNotLatchedNoEntry",
"openpilot Unavailable",
"Seatbelt unlatched",
"无法使用 dragonpilot",
"未系安全带",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"espDisabledNoEntry",
"openpilot Unavailable",
"ESP Off",
"无法使用 dragonpilot",
"ESP关闭",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"geofenceNoEntry",
"openpilot Unavailable",
"Not in Geofenced Area",
"无法使用 dragonpilot",
"不在地理围栏区域之内",
AlertStatus.normal, AlertSize.mid,
Priority.MID, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"radarCanErrorNoEntry",
"openpilot Unavailable",
"Radar Error: Restart the Car",
"无法使用 dragonpilot",
"雷达信号错误:请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"radarFaultNoEntry",
"openpilot Unavailable",
"Radar Error: Restart the Car",
"无法使用 dragonpilot",
"雷达信号错误:请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"posenetInvalidNoEntry",
"openpilot Unavailable",
"Vision Model Output Uncertain",
"无法使用 dragonpilot",
"视觉模型输出不明确",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"controlsFailedNoEntry",
"openpilot Unavailable",
"Controls Failed",
"无法使用 dragonpilot",
"控制发生错误",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"canErrorNoEntry",
"openpilot Unavailable",
"CAN Error: Check Connections",
"无法使用 dragonpilot",
"CAN错误:请检查连接",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"steerUnavailableNoEntry",
"openpilot Unavailable",
"LKAS Fault: Restart the Car",
"无法使用 dragonpilot",
"LKAS错误: 请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"brakeUnavailableNoEntry",
"openpilot Unavailable",
"Cruise Fault: Restart the Car",
"无法使用 dragonpilot",
"巡航系统错误:请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"gasUnavailableNoEntry",
"openpilot Unavailable",
"Gas Error: Restart the Car",
"无法使用 dragonpilot",
"油门错误:请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"reverseGearNoEntry",
"openpilot Unavailable",
"Reverse Gear",
"无法使用 dragonpilot",
"切换至倒车档",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"cruiseDisabledNoEntry",
"openpilot Unavailable",
"Cruise is Off",
"无法使用 dragonpilot",
"巡航系统关闭",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"noTargetNoEntry",
"openpilot Unavailable",
"No Close Lead Car",
"无法使用 dragonpilot",
"没有侦测到前车",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"plannerErrorNoEntry",
"openpilot Unavailable",
"Planner Solution Error",
"无法使用 dragonpilot",
"Planner Solution 错误",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"commIssueNoEntry",
"openpilot Unavailable",
"Communication Issue between Processes",
"无法使用 dragonpilot",
"进程通讯异常",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
Alert(
"radarCommIssueNoEntry",
"openpilot Unavailable",
"Radar Communication Issue",
"无法使用 dragonpilot",
"雷达通讯异常",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
Alert(
"internetConnectivityNeededNoEntry",
"openpilot Unavailable",
"Please Connect to Internet",
"无法使用 dragonpilot",
"需要连接到网络",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
Alert(
"lowMemoryNoEntry",
"openpilot Unavailable",
"Low Memory: Reboot Your Device",
"无法使用 dragonpilot",
"内存过低: 请重启装置",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
# permanent alerts
Alert(
"steerUnavailablePermanent",
"LKAS Fault: Restart the car to engage",
"LKAS错误: 请重新发动车辆",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"brakeUnavailablePermanent",
"Cruise Fault: Restart the car to engage",
"巡航系统错误:请重新发动车辆",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"lowSpeedLockoutPermanent",
"Cruise Fault: Restart the car to engage",
"巡航系统错误:请重新发动车辆",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"calibrationIncompletePermanent",
"Calibration in Progress: ",
"Drive Above ",
"正在校准相机中 ",
"车速请高于",
AlertStatus.normal, AlertSize.mid,
Priority.LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"invalidGiraffeToyotaPermanent",
"Unsupported Giraffe Configuration",
"Visit comma.ai/tg",
"不支持的 Giraffe 配置",
"请查看 comma.ai/tg",
AlertStatus.normal, AlertSize.mid,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"internetConnectivityNeededPermanent",
"Please connect to Internet",
"An Update Check Is Required to Engage",
"需要连接到网络",
"检查更新后才能启用",
AlertStatus.normal, AlertSize.mid,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"communityFeatureDisallowedPermanent",
"Community Feature Detected",
"Enable Community Features in Developer Settings",
"检测到社区功能",
"请在开发者设置中启用社区功能",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, 0., 0., .2), # LOW priority to overcome Cruise Error
Alert(
"sensorDataInvalidPermanent",
"No Data from Device Sensors",
"Reboot your Device",
"没有收到任何来自传感器的数据",
"请重启您的装置",
AlertStatus.normal, AlertSize.mid,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"soundsUnavailablePermanent",
"Speaker not found",
"Reboot your Device",
"找不到音效装置",
"请重启您的装置",
AlertStatus.normal, AlertSize.mid,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"lowMemoryPermanent",
"RAM Critically Low",
"Reboot your Device",
"内存严重不足",
"请重启您的装置",
AlertStatus.normal, AlertSize.mid,
Priority.LOW_LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
@@ -769,7 +769,7 @@ ALERTS = [
Alert(
"vehicleModelInvalid",
"Vehicle Parameter Identification Failed",
"车辆参数识别失败",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOWEST, VisualAlert.steerRequired, AudibleAlert.none, .0, .0, .1),
@@ -777,54 +777,54 @@ ALERTS = [
# offroad alerts
Alert(
"ldwPermanent",
"TAKE CONTROL",
"Lane Departure Detected",
"接管控制",
"检测到车道偏离",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimePrompt, 1., 2., 3.),
# dragonpilot
Alert(
"manualSteeringRequired",
"STEERING REQUIRED: Lane Keeping OFF",
"接管控制: 车道保持关闭",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .0, .1, .1, alert_rate=0.25),
Alert(
"manualSteeringRequiredBlinkersOn",
"STEERING REQUIRED: Blinkers ON",
"接管控制: 转向灯开启",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .0, .1, .1, alert_rate=0.25),
Alert(
"leadCarMoving",
"Lead Car Is Moving",
"前车移动中,请开始加速",
"",
AlertStatus.userPrompt, AlertSize.small,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
Alert(
"leadCarDetected",
"Lead Car Detected",
"侦测到前车,等待中",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .0, .1, .1, alert_rate=0.25),
Alert(
"preAutoLaneChangeLeft",
"Left Auto Lane Change will engage in 3 seconds",
"Monitor Other Vehicles",
"将在三秒后自动切入左道",
"请注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1, alert_rate=0.75),
Alert(
"preAutoLaneChangeRight",
"Right Auto Lane Change will engage in 3 seconds",
"Monitor Other Vehicles",
"将在三秒后自动切入入右道",
"请注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1, alert_rate=0.75),
Alert(
"autoLaneChange",
"Changing Lane",
"Monitor Other Vehicles",
"切换车道中",
"请注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
+7 -7
View File
@@ -1,31 +1,31 @@
{
"Offroad_ChargeDisabled": {
"text": "EON charging disabled after car being off for more than 30 hours. Turn ignition on to start charging again.",
"text": "车辆熄火 30 小时后将停止为 EON 充电,再次启动车辆后,EON 恢复充电。",
"severity": 0
},
"Offroad_TemperatureTooHigh": {
"text": "Device temperature too high. System won't start.",
"text": "装置温度过高,系统暂不可用。",
"severity": 1
},
"Offroad_ConnectivityNeededPrompt": {
"text": "Immediately connect to the internet to check for updates. If you do not connect to the internet, openpilot won't engage in ",
"text": "请立即连网检查更新,否则 dragonpilot 将不可用。",
"severity": 0,
"_comment": "Append the number of days at the end of the text"
},
"Offroad_ConnectivityNeeded": {
"text": "Connect to internet to check for updates. openpilot won't engage until it connects to internet to check for updates.",
"text": "请连网并检查更新,连网更新后 dragonpilot 才能正常使用。",
"severity": 1
},
"Offroad_PandaFirmwareMismatch": {
"text": "Unexpected panda firmware version. System won't start. Reboot your device to reflash panda.",
"text": "Panda 固件版本异常,系统无法启用,请重启装置并更新 Panda 固件。",
"severity": 1
},
"Offroad_InvalidTime": {
"text": "Invalid date and time settings, system won't start. Connect to internet to set time.",
"text": "系统时间设置错误,系统无法启用。请连网更新时间设置。",
"severity": 1
},
"Offroad_IsTakingSnapshot": {
"text": "Taking camera snapshots. System won't start until finished.",
"text": "相机拍摄中,完成前系统无法启动。",
"severity": 0
}
}
+7 -7
View File
@@ -930,7 +930,7 @@ static void bb_ui_draw_measures_left(UIState *s, int bb_x, int bb_y, int bb_w )
snprintf(val_str, sizeof(val_str), "-");
}
snprintf(uom_str, sizeof(uom_str), "m ");
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "REL DIST",
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "相对距离",
bb_rx, bb_ry, bb_uom_dx,
val_color, lab_color, uom_color,
value_fontSize, label_fontSize, uom_fontSize );
@@ -965,7 +965,7 @@ static void bb_ui_draw_measures_left(UIState *s, int bb_x, int bb_y, int bb_w )
} else {
snprintf(uom_str, sizeof(uom_str), "mph");
}
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "REL SPEED",
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "相对速度",
bb_rx, bb_ry, bb_uom_dx,
val_color, lab_color, uom_color,
value_fontSize, label_fontSize, uom_fontSize );
@@ -1010,7 +1010,7 @@ static void bb_ui_draw_measures_right(UIState *s, int bb_x, int bb_y, int bb_w )
snprintf(val_str, sizeof(val_str), "%.1f°",(scene->angleSteers));
snprintf(uom_str, sizeof(uom_str), "");
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "REAL STEER",
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "实际转角",
bb_rx, bb_ry, bb_uom_dx,
val_color, lab_color, uom_color,
value_fontSize, label_fontSize, uom_fontSize );
@@ -1034,7 +1034,7 @@ static void bb_ui_draw_measures_right(UIState *s, int bb_x, int bb_y, int bb_w )
snprintf(val_str, sizeof(val_str), "%.1f°",(scene->angleSteersDes));
snprintf(uom_str, sizeof(uom_str), "");
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "DESIR STEER",
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "所需转角",
bb_rx, bb_ry, bb_uom_dx,
val_color, lab_color, uom_color,
value_fontSize, label_fontSize, uom_fontSize );
@@ -1290,11 +1290,11 @@ void ui_nvg_init(UIState *s) {
s->font_courbd = nvgCreateFont(s->vg, "courbd", "../assets/fonts/courbd.ttf");
assert(s->font_courbd >= 0);
s->font_sans_regular = nvgCreateFont(s->vg, "sans-regular", "../assets/fonts/opensans_regular.ttf");
s->font_sans_regular = nvgCreateFont(s->vg, "sans-regular", "../../dragonpilot/chinese-fonts/NotoSansCJKtc-Regular.otf");
assert(s->font_sans_regular >= 0);
s->font_sans_semibold = nvgCreateFont(s->vg, "sans-semibold", "../assets/fonts/opensans_semibold.ttf");
s->font_sans_semibold = nvgCreateFont(s->vg, "sans-semibold", "../../dragonpilot/chinese-fonts/NotoSansCJKtc-Medium.otf");
assert(s->font_sans_semibold >= 0);
s->font_sans_bold = nvgCreateFont(s->vg, "sans-bold", "../assets/fonts/opensans_bold.ttf");
s->font_sans_bold = nvgCreateFont(s->vg, "sans-bold", "../../dragonpilot/chinese-fonts/NotoSansCJKtc-Bold.otf");
assert(s->font_sans_bold >= 0);
assert(s->img_wheel >= 0);