diff options
49 files changed, 128 insertions, 99 deletions
diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang index 7af8a15da9..4e0819018e 100644 --- a/apps/lang/arabic.lang +++ b/apps/lang/arabic.lang | |||
@@ -3728,7 +3728,7 @@ | |||
3728 | </voice> | 3728 | </voice> |
3729 | </phrase> | 3729 | </phrase> |
3730 | <phrase> | 3730 | <phrase> |
3731 | id: LANG_BATTERY_TYPE_ALKALINE | 3731 | id: LANG_BATTERY_TYPE_1 |
3732 | desc: in battery settings | 3732 | desc: in battery settings |
3733 | user: core | 3733 | user: core |
3734 | <source> | 3734 | <source> |
diff --git a/apps/lang/basque.lang b/apps/lang/basque.lang index 04617a0a6c..8fa185081c 100644 --- a/apps/lang/basque.lang +++ b/apps/lang/basque.lang | |||
@@ -3771,7 +3771,7 @@ | |||
3771 | </voice> | 3771 | </voice> |
3772 | </phrase> | 3772 | </phrase> |
3773 | <phrase> | 3773 | <phrase> |
3774 | id: LANG_BATTERY_TYPE_ALKALINE | 3774 | id: LANG_BATTERY_TYPE_1 |
3775 | desc: in battery settings | 3775 | desc: in battery settings |
3776 | user: core | 3776 | user: core |
3777 | <source> | 3777 | <source> |
@@ -3788,7 +3788,7 @@ | |||
3788 | </voice> | 3788 | </voice> |
3789 | </phrase> | 3789 | </phrase> |
3790 | <phrase> | 3790 | <phrase> |
3791 | id: LANG_BATTERY_TYPE_NIMH | 3791 | id: LANG_BATTERY_TYPE_2 |
3792 | desc: in battery settings | 3792 | desc: in battery settings |
3793 | user: core | 3793 | user: core |
3794 | <source> | 3794 | <source> |
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang index de4d399042..7116e06927 100644 --- a/apps/lang/bulgarian.lang +++ b/apps/lang/bulgarian.lang | |||
@@ -3777,7 +3777,7 @@ | |||
3777 | </voice> | 3777 | </voice> |
3778 | </phrase> | 3778 | </phrase> |
3779 | <phrase> | 3779 | <phrase> |
3780 | id: LANG_BATTERY_TYPE_ALKALINE | 3780 | id: LANG_BATTERY_TYPE_1 |
3781 | desc: in battery settings | 3781 | desc: in battery settings |
3782 | user: core | 3782 | user: core |
3783 | <source> | 3783 | <source> |
@@ -3794,7 +3794,7 @@ | |||
3794 | </voice> | 3794 | </voice> |
3795 | </phrase> | 3795 | </phrase> |
3796 | <phrase> | 3796 | <phrase> |
3797 | id: LANG_BATTERY_TYPE_NIMH | 3797 | id: LANG_BATTERY_TYPE_2 |
3798 | desc: in battery settings | 3798 | desc: in battery settings |
3799 | user: core | 3799 | user: core |
3800 | <source> | 3800 | <source> |
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang index 7f074082fc..d357d257e4 100644 --- a/apps/lang/catala.lang +++ b/apps/lang/catala.lang | |||
@@ -3768,7 +3768,7 @@ | |||
3768 | </voice> | 3768 | </voice> |
3769 | </phrase> | 3769 | </phrase> |
3770 | <phrase> | 3770 | <phrase> |
3771 | id: LANG_BATTERY_TYPE_ALKALINE | 3771 | id: LANG_BATTERY_TYPE_1 |
3772 | desc: in battery settings | 3772 | desc: in battery settings |
3773 | user: core | 3773 | user: core |
3774 | <source> | 3774 | <source> |
@@ -3785,7 +3785,7 @@ | |||
3785 | </voice> | 3785 | </voice> |
3786 | </phrase> | 3786 | </phrase> |
3787 | <phrase> | 3787 | <phrase> |
3788 | id: LANG_BATTERY_TYPE_NIMH | 3788 | id: LANG_BATTERY_TYPE_2 |
3789 | desc: in battery settings | 3789 | desc: in battery settings |
3790 | user: core | 3790 | user: core |
3791 | <source> | 3791 | <source> |
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang index 29715a1914..3bc0f93043 100644 --- a/apps/lang/chinese-simp.lang +++ b/apps/lang/chinese-simp.lang | |||
@@ -3569,7 +3569,7 @@ | |||
3569 | </voice> | 3569 | </voice> |
3570 | </phrase> | 3570 | </phrase> |
3571 | <phrase> | 3571 | <phrase> |
3572 | id: LANG_BATTERY_TYPE_ALKALINE | 3572 | id: LANG_BATTERY_TYPE_1 |
3573 | desc: in battery settings | 3573 | desc: in battery settings |
3574 | user: core | 3574 | user: core |
3575 | <source> | 3575 | <source> |
@@ -3586,7 +3586,7 @@ | |||
3586 | </voice> | 3586 | </voice> |
3587 | </phrase> | 3587 | </phrase> |
3588 | <phrase> | 3588 | <phrase> |
3589 | id: LANG_BATTERY_TYPE_NIMH | 3589 | id: LANG_BATTERY_TYPE_2 |
3590 | desc: in battery settings | 3590 | desc: in battery settings |
3591 | user: core | 3591 | user: core |
3592 | <source> | 3592 | <source> |
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang index 21a4379362..fa3434a85e 100644 --- a/apps/lang/chinese-trad.lang +++ b/apps/lang/chinese-trad.lang | |||
@@ -3568,7 +3568,7 @@ | |||
3568 | </voice> | 3568 | </voice> |
3569 | </phrase> | 3569 | </phrase> |
3570 | <phrase> | 3570 | <phrase> |
3571 | id: LANG_BATTERY_TYPE_ALKALINE | 3571 | id: LANG_BATTERY_TYPE_1 |
3572 | desc: in battery settings | 3572 | desc: in battery settings |
3573 | user: core | 3573 | user: core |
3574 | <source> | 3574 | <source> |
@@ -3585,7 +3585,7 @@ | |||
3585 | </voice> | 3585 | </voice> |
3586 | </phrase> | 3586 | </phrase> |
3587 | <phrase> | 3587 | <phrase> |
3588 | id: LANG_BATTERY_TYPE_NIMH | 3588 | id: LANG_BATTERY_TYPE_2 |
3589 | desc: in battery settings | 3589 | desc: in battery settings |
3590 | user: core | 3590 | user: core |
3591 | <source> | 3591 | <source> |
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang index 34f6a9f566..b94cdc2629 100644 --- a/apps/lang/czech.lang +++ b/apps/lang/czech.lang | |||
@@ -3780,7 +3780,7 @@ | |||
3780 | </voice> | 3780 | </voice> |
3781 | </phrase> | 3781 | </phrase> |
3782 | <phrase> | 3782 | <phrase> |
3783 | id: LANG_BATTERY_TYPE_ALKALINE | 3783 | id: LANG_BATTERY_TYPE_1 |
3784 | desc: in battery settings | 3784 | desc: in battery settings |
3785 | user: core | 3785 | user: core |
3786 | <source> | 3786 | <source> |
@@ -3797,7 +3797,7 @@ | |||
3797 | </voice> | 3797 | </voice> |
3798 | </phrase> | 3798 | </phrase> |
3799 | <phrase> | 3799 | <phrase> |
3800 | id: LANG_BATTERY_TYPE_NIMH | 3800 | id: LANG_BATTERY_TYPE_2 |
3801 | desc: in battery settings | 3801 | desc: in battery settings |
3802 | user: core | 3802 | user: core |
3803 | <source> | 3803 | <source> |
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang index 40b3d9b9d1..11efc7e9f6 100644 --- a/apps/lang/dansk.lang +++ b/apps/lang/dansk.lang | |||
@@ -2993,7 +2993,7 @@ | |||
2993 | </voice> | 2993 | </voice> |
2994 | </phrase> | 2994 | </phrase> |
2995 | <phrase> | 2995 | <phrase> |
2996 | id: LANG_BATTERY_TYPE_ALKALINE | 2996 | id: LANG_BATTERY_TYPE_1 |
2997 | desc: in battery settings | 2997 | desc: in battery settings |
2998 | user: core | 2998 | user: core |
2999 | <source> | 2999 | <source> |
@@ -3010,7 +3010,7 @@ | |||
3010 | </voice> | 3010 | </voice> |
3011 | </phrase> | 3011 | </phrase> |
3012 | <phrase> | 3012 | <phrase> |
3013 | id: LANG_BATTERY_TYPE_NIMH | 3013 | id: LANG_BATTERY_TYPE_2 |
3014 | desc: in battery settings | 3014 | desc: in battery settings |
3015 | user: core | 3015 | user: core |
3016 | <source> | 3016 | <source> |
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index d421bc5405..3cbe6e9168 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang | |||
@@ -3780,7 +3780,7 @@ | |||
3780 | </voice> | 3780 | </voice> |
3781 | </phrase> | 3781 | </phrase> |
3782 | <phrase> | 3782 | <phrase> |
3783 | id: LANG_BATTERY_TYPE_ALKALINE | 3783 | id: LANG_BATTERY_TYPE_1 |
3784 | desc: in battery settings | 3784 | desc: in battery settings |
3785 | user: core | 3785 | user: core |
3786 | <source> | 3786 | <source> |
@@ -3797,7 +3797,7 @@ | |||
3797 | </voice> | 3797 | </voice> |
3798 | </phrase> | 3798 | </phrase> |
3799 | <phrase> | 3799 | <phrase> |
3800 | id: LANG_BATTERY_TYPE_NIMH | 3800 | id: LANG_BATTERY_TYPE_2 |
3801 | desc: in battery settings | 3801 | desc: in battery settings |
3802 | user: core | 3802 | user: core |
3803 | <source> | 3803 | <source> |
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang index e914329564..566b15c004 100644 --- a/apps/lang/eesti.lang +++ b/apps/lang/eesti.lang | |||
@@ -3257,7 +3257,7 @@ | |||
3257 | </voice> | 3257 | </voice> |
3258 | </phrase> | 3258 | </phrase> |
3259 | <phrase> | 3259 | <phrase> |
3260 | id: LANG_BATTERY_TYPE_ALKALINE | 3260 | id: LANG_BATTERY_TYPE_1 |
3261 | desc: in battery settings | 3261 | desc: in battery settings |
3262 | user: core | 3262 | user: core |
3263 | <source> | 3263 | <source> |
@@ -3271,7 +3271,7 @@ | |||
3271 | </voice> | 3271 | </voice> |
3272 | </phrase> | 3272 | </phrase> |
3273 | <phrase> | 3273 | <phrase> |
3274 | id: LANG_BATTERY_TYPE_NIMH | 3274 | id: LANG_BATTERY_TYPE_2 |
3275 | desc: in battery settings | 3275 | desc: in battery settings |
3276 | user: core | 3276 | user: core |
3277 | <source> | 3277 | <source> |
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang index d76fb7f8a3..dbc09e021b 100644 --- a/apps/lang/english-us.lang +++ b/apps/lang/english-us.lang | |||
@@ -3561,37 +3561,43 @@ | |||
3561 | </voice> | 3561 | </voice> |
3562 | </phrase> | 3562 | </phrase> |
3563 | <phrase> | 3563 | <phrase> |
3564 | id: LANG_BATTERY_TYPE_ALKALINE | 3564 | id: LANG_BATTERY_TYPE_1 |
3565 | desc: in battery settings | 3565 | desc: in battery settings |
3566 | user: core | 3566 | user: core |
3567 | <source> | 3567 | <source> |
3568 | *: none | 3568 | *: none |
3569 | battery_types: "Alkaline" | 3569 | battery_types: "Alkaline" |
3570 | xduoox3: "Newer (2000 mAh)" | ||
3570 | </source> | 3571 | </source> |
3571 | <dest> | 3572 | <dest> |
3572 | *: none | 3573 | *: none |
3573 | battery_types: "Alkaline" | 3574 | battery_types: "Alkaline" |
3575 | xduoox3: "Newer (2000 mAh)" | ||
3574 | </dest> | 3576 | </dest> |
3575 | <voice> | 3577 | <voice> |
3576 | *: none | 3578 | *: none |
3577 | battery_types: "Alkaline" | 3579 | battery_types: "Alkaline" |
3580 | xduoox3: "Newer 2000 milliamp hour" | ||
3578 | </voice> | 3581 | </voice> |
3579 | </phrase> | 3582 | </phrase> |
3580 | <phrase> | 3583 | <phrase> |
3581 | id: LANG_BATTERY_TYPE_NIMH | 3584 | id: LANG_BATTERY_TYPE_2 |
3582 | desc: in battery settings | 3585 | desc: in battery settings |
3583 | user: core | 3586 | user: core |
3584 | <source> | 3587 | <source> |
3585 | *: none | 3588 | *: none |
3586 | battery_types: "NiMH" | 3589 | battery_types: "NiMH" |
3590 | xduoox3: "Older (1500 mAh)" | ||
3587 | </source> | 3591 | </source> |
3588 | <dest> | 3592 | <dest> |
3589 | *: none | 3593 | *: none |
3590 | battery_types: "NiMH" | 3594 | battery_types: "NiMH" |
3595 | xduoox3: "Older (1500 mAh)" | ||
3591 | </dest> | 3596 | </dest> |
3592 | <voice> | 3597 | <voice> |
3593 | *: none | 3598 | *: none |
3594 | battery_types: "Nickel metal hydride" | 3599 | battery_types: "Nickel metal hydride" |
3600 | xduoox3: "Older 1500 milliamp hour" | ||
3595 | </voice> | 3601 | </voice> |
3596 | </phrase> | 3602 | </phrase> |
3597 | <phrase> | 3603 | <phrase> |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index fc5a37c569..3f3bd26e30 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3640,37 +3640,43 @@ | |||
3640 | </voice> | 3640 | </voice> |
3641 | </phrase> | 3641 | </phrase> |
3642 | <phrase> | 3642 | <phrase> |
3643 | id: LANG_BATTERY_TYPE_ALKALINE | 3643 | id: LANG_BATTERY_TYPE_1 |
3644 | desc: in battery settings | 3644 | desc: in battery settings |
3645 | user: core | 3645 | user: core |
3646 | <source> | 3646 | <source> |
3647 | *: none | 3647 | *: none |
3648 | battery_types: "Alkaline" | 3648 | battery_types: "Alkaline" |
3649 | xduoox3: "Newer (2000 mAh)" | ||
3649 | </source> | 3650 | </source> |
3650 | <dest> | 3651 | <dest> |
3651 | *: none | 3652 | *: none |
3652 | battery_types: "Alkaline" | 3653 | battery_types: "Alkaline" |
3654 | xduoox3: "Newer (2000 mAh)" | ||
3653 | </dest> | 3655 | </dest> |
3654 | <voice> | 3656 | <voice> |
3655 | *: none | 3657 | *: none |
3656 | battery_types: "Alkaline" | 3658 | battery_types: "Alkaline" |
3659 | xduoox3: "Newer 2000 milliamp hour" | ||
3657 | </voice> | 3660 | </voice> |
3658 | </phrase> | 3661 | </phrase> |
3659 | <phrase> | 3662 | <phrase> |
3660 | id: LANG_BATTERY_TYPE_NIMH | 3663 | id: LANG_BATTERY_TYPE_2 |
3661 | desc: in battery settings | 3664 | desc: in battery settings |
3662 | user: core | 3665 | user: core |
3663 | <source> | 3666 | <source> |
3664 | *: none | 3667 | *: none |
3665 | battery_types: "NiMH" | 3668 | battery_types: "NiMH" |
3669 | xduoox3: "Older (1500 mAh)" | ||
3666 | </source> | 3670 | </source> |
3667 | <dest> | 3671 | <dest> |
3668 | *: none | 3672 | *: none |
3669 | battery_types: "NiMH" | 3673 | battery_types: "NiMH" |
3674 | xduoox3: "Older (1500 mAh)" | ||
3670 | </dest> | 3675 | </dest> |
3671 | <voice> | 3676 | <voice> |
3672 | *: none | 3677 | *: none |
3673 | battery_types: "Nickel metal hydride" | 3678 | battery_types: "Nickel metal hydride" |
3679 | xduoox3: "Older 1500 milliamp hour" | ||
3674 | </voice> | 3680 | </voice> |
3675 | </phrase> | 3681 | </phrase> |
3676 | <phrase> | 3682 | <phrase> |
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang index a55fbc20b3..e1568207e3 100644 --- a/apps/lang/espanol.lang +++ b/apps/lang/espanol.lang | |||
@@ -2237,7 +2237,7 @@ | |||
2237 | </voice> | 2237 | </voice> |
2238 | </phrase> | 2238 | </phrase> |
2239 | <phrase> | 2239 | <phrase> |
2240 | id: LANG_BATTERY_TYPE_ALKALINE | 2240 | id: LANG_BATTERY_TYPE_1 |
2241 | desc: in battery settings | 2241 | desc: in battery settings |
2242 | user: core | 2242 | user: core |
2243 | <source> | 2243 | <source> |
@@ -2254,7 +2254,7 @@ | |||
2254 | </voice> | 2254 | </voice> |
2255 | </phrase> | 2255 | </phrase> |
2256 | <phrase> | 2256 | <phrase> |
2257 | id: LANG_BATTERY_TYPE_NIMH | 2257 | id: LANG_BATTERY_TYPE_2 |
2258 | desc: in battery settings | 2258 | desc: in battery settings |
2259 | user: core | 2259 | user: core |
2260 | <source> | 2260 | <source> |
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang index 5760b08abf..8e497d5743 100644 --- a/apps/lang/esperanto.lang +++ b/apps/lang/esperanto.lang | |||
@@ -3499,7 +3499,7 @@ | |||
3499 | </voice> | 3499 | </voice> |
3500 | </phrase> | 3500 | </phrase> |
3501 | <phrase> | 3501 | <phrase> |
3502 | id: LANG_BATTERY_TYPE_ALKALINE | 3502 | id: LANG_BATTERY_TYPE_1 |
3503 | desc: in battery settings | 3503 | desc: in battery settings |
3504 | user: core | 3504 | user: core |
3505 | <source> | 3505 | <source> |
@@ -3513,7 +3513,7 @@ | |||
3513 | </voice> | 3513 | </voice> |
3514 | </phrase> | 3514 | </phrase> |
3515 | <phrase> | 3515 | <phrase> |
3516 | id: LANG_BATTERY_TYPE_NIMH | 3516 | id: LANG_BATTERY_TYPE_2 |
3517 | desc: in battery settings | 3517 | desc: in battery settings |
3518 | user: core | 3518 | user: core |
3519 | <source> | 3519 | <source> |
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang index 0081a3c113..5b1c631875 100644 --- a/apps/lang/finnish.lang +++ b/apps/lang/finnish.lang | |||
@@ -3568,7 +3568,7 @@ | |||
3568 | </voice> | 3568 | </voice> |
3569 | </phrase> | 3569 | </phrase> |
3570 | <phrase> | 3570 | <phrase> |
3571 | id: LANG_BATTERY_TYPE_ALKALINE | 3571 | id: LANG_BATTERY_TYPE_1 |
3572 | desc: in battery settings | 3572 | desc: in battery settings |
3573 | user: core | 3573 | user: core |
3574 | <source> | 3574 | <source> |
@@ -3585,7 +3585,7 @@ | |||
3585 | </voice> | 3585 | </voice> |
3586 | </phrase> | 3586 | </phrase> |
3587 | <phrase> | 3587 | <phrase> |
3588 | id: LANG_BATTERY_TYPE_NIMH | 3588 | id: LANG_BATTERY_TYPE_2 |
3589 | desc: in battery settings | 3589 | desc: in battery settings |
3590 | user: core | 3590 | user: core |
3591 | <source> | 3591 | <source> |
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang index 280f8ce6b3..c4ea3c43b1 100644 --- a/apps/lang/francais.lang +++ b/apps/lang/francais.lang | |||
@@ -3622,7 +3622,7 @@ | |||
3622 | </voice> | 3622 | </voice> |
3623 | </phrase> | 3623 | </phrase> |
3624 | <phrase> | 3624 | <phrase> |
3625 | id: LANG_BATTERY_TYPE_ALKALINE | 3625 | id: LANG_BATTERY_TYPE_1 |
3626 | desc: in battery settings | 3626 | desc: in battery settings |
3627 | user: core | 3627 | user: core |
3628 | <source> | 3628 | <source> |
@@ -3639,7 +3639,7 @@ | |||
3639 | </voice> | 3639 | </voice> |
3640 | </phrase> | 3640 | </phrase> |
3641 | <phrase> | 3641 | <phrase> |
3642 | id: LANG_BATTERY_TYPE_NIMH | 3642 | id: LANG_BATTERY_TYPE_2 |
3643 | desc: in battery settings | 3643 | desc: in battery settings |
3644 | user: core | 3644 | user: core |
3645 | <source> | 3645 | <source> |
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang index 3b03dfb2ec..24581ebbb3 100644 --- a/apps/lang/galego.lang +++ b/apps/lang/galego.lang | |||
@@ -2214,7 +2214,7 @@ | |||
2214 | </voice> | 2214 | </voice> |
2215 | </phrase> | 2215 | </phrase> |
2216 | <phrase> | 2216 | <phrase> |
2217 | id: LANG_BATTERY_TYPE_ALKALINE | 2217 | id: LANG_BATTERY_TYPE_1 |
2218 | desc: in battery settings | 2218 | desc: in battery settings |
2219 | user: core | 2219 | user: core |
2220 | <source> | 2220 | <source> |
@@ -2231,7 +2231,7 @@ | |||
2231 | </voice> | 2231 | </voice> |
2232 | </phrase> | 2232 | </phrase> |
2233 | <phrase> | 2233 | <phrase> |
2234 | id: LANG_BATTERY_TYPE_NIMH | 2234 | id: LANG_BATTERY_TYPE_2 |
2235 | desc: in battery settings | 2235 | desc: in battery settings |
2236 | user: core | 2236 | user: core |
2237 | <source> | 2237 | <source> |
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang index 397c63d883..54381273d2 100644 --- a/apps/lang/greek.lang +++ b/apps/lang/greek.lang | |||
@@ -3763,7 +3763,7 @@ | |||
3763 | </voice> | 3763 | </voice> |
3764 | </phrase> | 3764 | </phrase> |
3765 | <phrase> | 3765 | <phrase> |
3766 | id: LANG_BATTERY_TYPE_ALKALINE | 3766 | id: LANG_BATTERY_TYPE_1 |
3767 | desc: in battery settings | 3767 | desc: in battery settings |
3768 | user: core | 3768 | user: core |
3769 | <source> | 3769 | <source> |
@@ -3780,7 +3780,7 @@ | |||
3780 | </voice> | 3780 | </voice> |
3781 | </phrase> | 3781 | </phrase> |
3782 | <phrase> | 3782 | <phrase> |
3783 | id: LANG_BATTERY_TYPE_NIMH | 3783 | id: LANG_BATTERY_TYPE_2 |
3784 | desc: in battery settings | 3784 | desc: in battery settings |
3785 | user: core | 3785 | user: core |
3786 | <source> | 3786 | <source> |
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang index fedb439486..ef7fcb7074 100644 --- a/apps/lang/hebrew.lang +++ b/apps/lang/hebrew.lang | |||
@@ -3779,7 +3779,7 @@ | |||
3779 | </voice> | 3779 | </voice> |
3780 | </phrase> | 3780 | </phrase> |
3781 | <phrase> | 3781 | <phrase> |
3782 | id: LANG_BATTERY_TYPE_ALKALINE | 3782 | id: LANG_BATTERY_TYPE_1 |
3783 | desc: in battery settings | 3783 | desc: in battery settings |
3784 | user: core | 3784 | user: core |
3785 | <source> | 3785 | <source> |
@@ -3796,7 +3796,7 @@ | |||
3796 | </voice> | 3796 | </voice> |
3797 | </phrase> | 3797 | </phrase> |
3798 | <phrase> | 3798 | <phrase> |
3799 | id: LANG_BATTERY_TYPE_NIMH | 3799 | id: LANG_BATTERY_TYPE_2 |
3800 | desc: in battery settings | 3800 | desc: in battery settings |
3801 | user: core | 3801 | user: core |
3802 | <source> | 3802 | <source> |
diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang index 0d5de2ec5d..0995c3d95d 100644 --- a/apps/lang/hrvatski.lang +++ b/apps/lang/hrvatski.lang | |||
@@ -3770,7 +3770,7 @@ | |||
3770 | </voice> | 3770 | </voice> |
3771 | </phrase> | 3771 | </phrase> |
3772 | <phrase> | 3772 | <phrase> |
3773 | id: LANG_BATTERY_TYPE_ALKALINE | 3773 | id: LANG_BATTERY_TYPE_1 |
3774 | desc: in battery settings | 3774 | desc: in battery settings |
3775 | user: core | 3775 | user: core |
3776 | <source> | 3776 | <source> |
@@ -3787,7 +3787,7 @@ | |||
3787 | </voice> | 3787 | </voice> |
3788 | </phrase> | 3788 | </phrase> |
3789 | <phrase> | 3789 | <phrase> |
3790 | id: LANG_BATTERY_TYPE_NIMH | 3790 | id: LANG_BATTERY_TYPE_2 |
3791 | desc: in battery settings | 3791 | desc: in battery settings |
3792 | user: core | 3792 | user: core |
3793 | <source> | 3793 | <source> |
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang index d85652c1f5..79a3cc46b1 100644 --- a/apps/lang/islenska.lang +++ b/apps/lang/islenska.lang | |||
@@ -2548,7 +2548,7 @@ | |||
2548 | </voice> | 2548 | </voice> |
2549 | </phrase> | 2549 | </phrase> |
2550 | <phrase> | 2550 | <phrase> |
2551 | id: LANG_BATTERY_TYPE_ALKALINE | 2551 | id: LANG_BATTERY_TYPE_1 |
2552 | desc: in battery settings | 2552 | desc: in battery settings |
2553 | user: core | 2553 | user: core |
2554 | <source> | 2554 | <source> |
@@ -2565,7 +2565,7 @@ | |||
2565 | </voice> | 2565 | </voice> |
2566 | </phrase> | 2566 | </phrase> |
2567 | <phrase> | 2567 | <phrase> |
2568 | id: LANG_BATTERY_TYPE_NIMH | 2568 | id: LANG_BATTERY_TYPE_2 |
2569 | desc: in battery settings | 2569 | desc: in battery settings |
2570 | user: core | 2570 | user: core |
2571 | <source> | 2571 | <source> |
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang index 927a26efc8..6e79566dd2 100644 --- a/apps/lang/italiano.lang +++ b/apps/lang/italiano.lang | |||
@@ -3563,7 +3563,7 @@ desc: deprecated | |||
3563 | </voice> | 3563 | </voice> |
3564 | </phrase> | 3564 | </phrase> |
3565 | <phrase> | 3565 | <phrase> |
3566 | id: LANG_BATTERY_TYPE_ALKALINE | 3566 | id: LANG_BATTERY_TYPE_1 |
3567 | desc: in battery settings | 3567 | desc: in battery settings |
3568 | user: core | 3568 | user: core |
3569 | <source> | 3569 | <source> |
@@ -3580,7 +3580,7 @@ desc: deprecated | |||
3580 | </voice> | 3580 | </voice> |
3581 | </phrase> | 3581 | </phrase> |
3582 | <phrase> | 3582 | <phrase> |
3583 | id: LANG_BATTERY_TYPE_NIMH | 3583 | id: LANG_BATTERY_TYPE_2 |
3584 | desc: in battery settings | 3584 | desc: in battery settings |
3585 | user: core | 3585 | user: core |
3586 | <source> | 3586 | <source> |
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang index acb3281197..7c93be340c 100644 --- a/apps/lang/japanese.lang +++ b/apps/lang/japanese.lang | |||
@@ -3779,7 +3779,7 @@ | |||
3779 | </voice> | 3779 | </voice> |
3780 | </phrase> | 3780 | </phrase> |
3781 | <phrase> | 3781 | <phrase> |
3782 | id: LANG_BATTERY_TYPE_ALKALINE | 3782 | id: LANG_BATTERY_TYPE_1 |
3783 | desc: in battery settings | 3783 | desc: in battery settings |
3784 | user: core | 3784 | user: core |
3785 | <source> | 3785 | <source> |
@@ -3796,7 +3796,7 @@ | |||
3796 | </voice> | 3796 | </voice> |
3797 | </phrase> | 3797 | </phrase> |
3798 | <phrase> | 3798 | <phrase> |
3799 | id: LANG_BATTERY_TYPE_NIMH | 3799 | id: LANG_BATTERY_TYPE_2 |
3800 | desc: in battery settings | 3800 | desc: in battery settings |
3801 | user: core | 3801 | user: core |
3802 | <source> | 3802 | <source> |
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang index 203fef6037..a8e978ac6e 100644 --- a/apps/lang/korean.lang +++ b/apps/lang/korean.lang | |||
@@ -3579,7 +3579,7 @@ | |||
3579 | </voice> | 3579 | </voice> |
3580 | </phrase> | 3580 | </phrase> |
3581 | <phrase> | 3581 | <phrase> |
3582 | id: LANG_BATTERY_TYPE_ALKALINE | 3582 | id: LANG_BATTERY_TYPE_1 |
3583 | desc: in battery settings | 3583 | desc: in battery settings |
3584 | user: core | 3584 | user: core |
3585 | <source> | 3585 | <source> |
@@ -3596,7 +3596,7 @@ | |||
3596 | </voice> | 3596 | </voice> |
3597 | </phrase> | 3597 | </phrase> |
3598 | <phrase> | 3598 | <phrase> |
3599 | id: LANG_BATTERY_TYPE_NIMH | 3599 | id: LANG_BATTERY_TYPE_2 |
3600 | desc: in battery settings | 3600 | desc: in battery settings |
3601 | user: core | 3601 | user: core |
3602 | <source> | 3602 | <source> |
diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang index 57538dd449..fedaa74d92 100644 --- a/apps/lang/latviesu.lang +++ b/apps/lang/latviesu.lang | |||
@@ -3773,7 +3773,7 @@ | |||
3773 | </voice> | 3773 | </voice> |
3774 | </phrase> | 3774 | </phrase> |
3775 | <phrase> | 3775 | <phrase> |
3776 | id: LANG_BATTERY_TYPE_ALKALINE | 3776 | id: LANG_BATTERY_TYPE_1 |
3777 | desc: in battery settings | 3777 | desc: in battery settings |
3778 | user: core | 3778 | user: core |
3779 | <source> | 3779 | <source> |
@@ -3790,7 +3790,7 @@ | |||
3790 | </voice> | 3790 | </voice> |
3791 | </phrase> | 3791 | </phrase> |
3792 | <phrase> | 3792 | <phrase> |
3793 | id: LANG_BATTERY_TYPE_NIMH | 3793 | id: LANG_BATTERY_TYPE_2 |
3794 | desc: in battery settings | 3794 | desc: in battery settings |
3795 | user: core | 3795 | user: core |
3796 | <source> | 3796 | <source> |
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang index dba6d36037..80e64e12f5 100644 --- a/apps/lang/lietuviu.lang +++ b/apps/lang/lietuviu.lang | |||
@@ -3837,7 +3837,7 @@ | |||
3837 | </voice> | 3837 | </voice> |
3838 | </phrase> | 3838 | </phrase> |
3839 | <phrase> | 3839 | <phrase> |
3840 | id: LANG_BATTERY_TYPE_ALKALINE | 3840 | id: LANG_BATTERY_TYPE_1 |
3841 | desc: in battery settings | 3841 | desc: in battery settings |
3842 | user: core | 3842 | user: core |
3843 | <source> | 3843 | <source> |
@@ -3854,7 +3854,7 @@ | |||
3854 | </voice> | 3854 | </voice> |
3855 | </phrase> | 3855 | </phrase> |
3856 | <phrase> | 3856 | <phrase> |
3857 | id: LANG_BATTERY_TYPE_NIMH | 3857 | id: LANG_BATTERY_TYPE_2 |
3858 | desc: in battery settings | 3858 | desc: in battery settings |
3859 | user: core | 3859 | user: core |
3860 | <source> | 3860 | <source> |
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang index ca21d952fb..7493b9dfe5 100644 --- a/apps/lang/magyar.lang +++ b/apps/lang/magyar.lang | |||
@@ -3749,7 +3749,7 @@ | |||
3749 | </voice> | 3749 | </voice> |
3750 | </phrase> | 3750 | </phrase> |
3751 | <phrase> | 3751 | <phrase> |
3752 | id: LANG_BATTERY_TYPE_ALKALINE | 3752 | id: LANG_BATTERY_TYPE_1 |
3753 | desc: in battery settings | 3753 | desc: in battery settings |
3754 | user: core | 3754 | user: core |
3755 | <source> | 3755 | <source> |
@@ -3766,7 +3766,7 @@ | |||
3766 | </voice> | 3766 | </voice> |
3767 | </phrase> | 3767 | </phrase> |
3768 | <phrase> | 3768 | <phrase> |
3769 | id: LANG_BATTERY_TYPE_NIMH | 3769 | id: LANG_BATTERY_TYPE_2 |
3770 | desc: in battery settings | 3770 | desc: in battery settings |
3771 | user: core | 3771 | user: core |
3772 | <source> | 3772 | <source> |
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang index ac0119334a..bb56d4c889 100644 --- a/apps/lang/nederlands.lang +++ b/apps/lang/nederlands.lang | |||
@@ -3580,7 +3580,7 @@ | |||
3580 | </voice> | 3580 | </voice> |
3581 | </phrase> | 3581 | </phrase> |
3582 | <phrase> | 3582 | <phrase> |
3583 | id: LANG_BATTERY_TYPE_ALKALINE | 3583 | id: LANG_BATTERY_TYPE_1 |
3584 | desc: in battery settings | 3584 | desc: in battery settings |
3585 | user: core | 3585 | user: core |
3586 | <source> | 3586 | <source> |
@@ -3597,7 +3597,7 @@ | |||
3597 | </voice> | 3597 | </voice> |
3598 | </phrase> | 3598 | </phrase> |
3599 | <phrase> | 3599 | <phrase> |
3600 | id: LANG_BATTERY_TYPE_NIMH | 3600 | id: LANG_BATTERY_TYPE_2 |
3601 | desc: in battery settings | 3601 | desc: in battery settings |
3602 | user: core | 3602 | user: core |
3603 | <source> | 3603 | <source> |
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang index e3b66b87c5..5b92e33e47 100644 --- a/apps/lang/norsk-nynorsk.lang +++ b/apps/lang/norsk-nynorsk.lang | |||
@@ -3515,7 +3515,7 @@ | |||
3515 | </voice> | 3515 | </voice> |
3516 | </phrase> | 3516 | </phrase> |
3517 | <phrase> | 3517 | <phrase> |
3518 | id: LANG_BATTERY_TYPE_ALKALINE | 3518 | id: LANG_BATTERY_TYPE_1 |
3519 | desc: in battery settings | 3519 | desc: in battery settings |
3520 | user: core | 3520 | user: core |
3521 | <source> | 3521 | <source> |
@@ -3532,7 +3532,7 @@ | |||
3532 | </voice> | 3532 | </voice> |
3533 | </phrase> | 3533 | </phrase> |
3534 | <phrase> | 3534 | <phrase> |
3535 | id: LANG_BATTERY_TYPE_NIMH | 3535 | id: LANG_BATTERY_TYPE_2 |
3536 | desc: in battery settings | 3536 | desc: in battery settings |
3537 | user: core | 3537 | user: core |
3538 | <source> | 3538 | <source> |
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang index 99e4de7faf..f6945d41c1 100644 --- a/apps/lang/norsk.lang +++ b/apps/lang/norsk.lang | |||
@@ -2998,7 +2998,7 @@ | |||
2998 | </voice> | 2998 | </voice> |
2999 | </phrase> | 2999 | </phrase> |
3000 | <phrase> | 3000 | <phrase> |
3001 | id: LANG_BATTERY_TYPE_ALKALINE | 3001 | id: LANG_BATTERY_TYPE_1 |
3002 | desc: in battery settings | 3002 | desc: in battery settings |
3003 | user: core | 3003 | user: core |
3004 | <source> | 3004 | <source> |
@@ -3015,7 +3015,7 @@ | |||
3015 | </voice> | 3015 | </voice> |
3016 | </phrase> | 3016 | </phrase> |
3017 | <phrase> | 3017 | <phrase> |
3018 | id: LANG_BATTERY_TYPE_NIMH | 3018 | id: LANG_BATTERY_TYPE_2 |
3019 | desc: in battery settings | 3019 | desc: in battery settings |
3020 | user: core | 3020 | user: core |
3021 | <source> | 3021 | <source> |
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang index 65a976b535..87f5466b9f 100644 --- a/apps/lang/polski.lang +++ b/apps/lang/polski.lang | |||
@@ -3570,7 +3570,7 @@ | |||
3570 | </voice> | 3570 | </voice> |
3571 | </phrase> | 3571 | </phrase> |
3572 | <phrase> | 3572 | <phrase> |
3573 | id: LANG_BATTERY_TYPE_ALKALINE | 3573 | id: LANG_BATTERY_TYPE_1 |
3574 | desc: in battery settings | 3574 | desc: in battery settings |
3575 | user: core | 3575 | user: core |
3576 | <source> | 3576 | <source> |
@@ -3587,7 +3587,7 @@ | |||
3587 | </voice> | 3587 | </voice> |
3588 | </phrase> | 3588 | </phrase> |
3589 | <phrase> | 3589 | <phrase> |
3590 | id: LANG_BATTERY_TYPE_NIMH | 3590 | id: LANG_BATTERY_TYPE_2 |
3591 | desc: in battery settings | 3591 | desc: in battery settings |
3592 | user: core | 3592 | user: core |
3593 | <source> | 3593 | <source> |
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang index 500ecb8454..fa0ba795a5 100644 --- a/apps/lang/portugues-brasileiro.lang +++ b/apps/lang/portugues-brasileiro.lang | |||
@@ -3772,7 +3772,7 @@ | |||
3772 | </voice> | 3772 | </voice> |
3773 | </phrase> | 3773 | </phrase> |
3774 | <phrase> | 3774 | <phrase> |
3775 | id: LANG_BATTERY_TYPE_ALKALINE | 3775 | id: LANG_BATTERY_TYPE_1 |
3776 | desc: in battery settings | 3776 | desc: in battery settings |
3777 | user: core | 3777 | user: core |
3778 | <source> | 3778 | <source> |
@@ -3789,7 +3789,7 @@ | |||
3789 | </voice> | 3789 | </voice> |
3790 | </phrase> | 3790 | </phrase> |
3791 | <phrase> | 3791 | <phrase> |
3792 | id: LANG_BATTERY_TYPE_NIMH | 3792 | id: LANG_BATTERY_TYPE_2 |
3793 | desc: in battery settings | 3793 | desc: in battery settings |
3794 | user: core | 3794 | user: core |
3795 | <source> | 3795 | <source> |
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang index f627c38da0..b1670e72b2 100644 --- a/apps/lang/portugues.lang +++ b/apps/lang/portugues.lang | |||
@@ -3357,7 +3357,7 @@ | |||
3357 | </voice> | 3357 | </voice> |
3358 | </phrase> | 3358 | </phrase> |
3359 | <phrase> | 3359 | <phrase> |
3360 | id: LANG_BATTERY_TYPE_ALKALINE | 3360 | id: LANG_BATTERY_TYPE_1 |
3361 | desc: in battery settings | 3361 | desc: in battery settings |
3362 | user: core | 3362 | user: core |
3363 | <source> | 3363 | <source> |
@@ -3374,7 +3374,7 @@ | |||
3374 | </voice> | 3374 | </voice> |
3375 | </phrase> | 3375 | </phrase> |
3376 | <phrase> | 3376 | <phrase> |
3377 | id: LANG_BATTERY_TYPE_NIMH | 3377 | id: LANG_BATTERY_TYPE_2 |
3378 | desc: in battery settings | 3378 | desc: in battery settings |
3379 | user: core | 3379 | user: core |
3380 | <source> | 3380 | <source> |
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang index fece7bd2e1..5eec774c19 100644 --- a/apps/lang/romaneste.lang +++ b/apps/lang/romaneste.lang | |||
@@ -2890,7 +2890,7 @@ | |||
2890 | </voice> | 2890 | </voice> |
2891 | </phrase> | 2891 | </phrase> |
2892 | <phrase> | 2892 | <phrase> |
2893 | id: LANG_BATTERY_TYPE_ALKALINE | 2893 | id: LANG_BATTERY_TYPE_1 |
2894 | desc: in battery settings | 2894 | desc: in battery settings |
2895 | user: core | 2895 | user: core |
2896 | <source> | 2896 | <source> |
@@ -6298,7 +6298,7 @@ | |||
6298 | </voice> | 6298 | </voice> |
6299 | </phrase> | 6299 | </phrase> |
6300 | <phrase> | 6300 | <phrase> |
6301 | id: LANG_BATTERY_TYPE_NIMH | 6301 | id: LANG_BATTERY_TYPE_2 |
6302 | desc: in battery settings | 6302 | desc: in battery settings |
6303 | user: core | 6303 | user: core |
6304 | <source> | 6304 | <source> |
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang index e5079e3e2d..cf0eb96910 100644 --- a/apps/lang/russian.lang +++ b/apps/lang/russian.lang | |||
@@ -3393,7 +3393,7 @@ | |||
3393 | </voice> | 3393 | </voice> |
3394 | </phrase> | 3394 | </phrase> |
3395 | <phrase> | 3395 | <phrase> |
3396 | id: LANG_BATTERY_TYPE_ALKALINE | 3396 | id: LANG_BATTERY_TYPE_1 |
3397 | desc: in battery settings | 3397 | desc: in battery settings |
3398 | user: core | 3398 | user: core |
3399 | <source> | 3399 | <source> |
@@ -3410,7 +3410,7 @@ | |||
3410 | </voice> | 3410 | </voice> |
3411 | </phrase> | 3411 | </phrase> |
3412 | <phrase> | 3412 | <phrase> |
3413 | id: LANG_BATTERY_TYPE_NIMH | 3413 | id: LANG_BATTERY_TYPE_2 |
3414 | desc: in battery settings | 3414 | desc: in battery settings |
3415 | user: core | 3415 | user: core |
3416 | <source> | 3416 | <source> |
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang index fa975ae817..058e2ce563 100644 --- a/apps/lang/slovak.lang +++ b/apps/lang/slovak.lang | |||
@@ -3562,7 +3562,7 @@ | |||
3562 | </voice> | 3562 | </voice> |
3563 | </phrase> | 3563 | </phrase> |
3564 | <phrase> | 3564 | <phrase> |
3565 | id: LANG_BATTERY_TYPE_ALKALINE | 3565 | id: LANG_BATTERY_TYPE_1 |
3566 | desc: in battery settings | 3566 | desc: in battery settings |
3567 | user: core | 3567 | user: core |
3568 | <source> | 3568 | <source> |
@@ -3579,7 +3579,7 @@ | |||
3579 | </voice> | 3579 | </voice> |
3580 | </phrase> | 3580 | </phrase> |
3581 | <phrase> | 3581 | <phrase> |
3582 | id: LANG_BATTERY_TYPE_NIMH | 3582 | id: LANG_BATTERY_TYPE_2 |
3583 | desc: in battery settings | 3583 | desc: in battery settings |
3584 | user: core | 3584 | user: core |
3585 | <source> | 3585 | <source> |
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang index b4c6ecb6c2..f38489f68e 100644 --- a/apps/lang/slovenscina.lang +++ b/apps/lang/slovenscina.lang | |||
@@ -3335,7 +3335,7 @@ | |||
3335 | </voice> | 3335 | </voice> |
3336 | </phrase> | 3336 | </phrase> |
3337 | <phrase> | 3337 | <phrase> |
3338 | id: LANG_BATTERY_TYPE_ALKALINE | 3338 | id: LANG_BATTERY_TYPE_1 |
3339 | desc: in battery settings | 3339 | desc: in battery settings |
3340 | user: core | 3340 | user: core |
3341 | <source> | 3341 | <source> |
@@ -7200,7 +7200,7 @@ | |||
7200 | </voice> | 7200 | </voice> |
7201 | </phrase> | 7201 | </phrase> |
7202 | <phrase> | 7202 | <phrase> |
7203 | id: LANG_BATTERY_TYPE_NIMH | 7203 | id: LANG_BATTERY_TYPE_2 |
7204 | desc: in battery settings | 7204 | desc: in battery settings |
7205 | user: core | 7205 | user: core |
7206 | <source> | 7206 | <source> |
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang index 0b11e4ab91..dc6da6a245 100644 --- a/apps/lang/srpski.lang +++ b/apps/lang/srpski.lang | |||
@@ -3759,7 +3759,7 @@ | |||
3759 | </voice> | 3759 | </voice> |
3760 | </phrase> | 3760 | </phrase> |
3761 | <phrase> | 3761 | <phrase> |
3762 | id: LANG_BATTERY_TYPE_ALKALINE | 3762 | id: LANG_BATTERY_TYPE_1 |
3763 | desc: in battery settings | 3763 | desc: in battery settings |
3764 | user: core | 3764 | user: core |
3765 | <source> | 3765 | <source> |
@@ -3776,7 +3776,7 @@ | |||
3776 | </voice> | 3776 | </voice> |
3777 | </phrase> | 3777 | </phrase> |
3778 | <phrase> | 3778 | <phrase> |
3779 | id: LANG_BATTERY_TYPE_NIMH | 3779 | id: LANG_BATTERY_TYPE_2 |
3780 | desc: in battery settings | 3780 | desc: in battery settings |
3781 | user: core | 3781 | user: core |
3782 | <source> | 3782 | <source> |
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang index eb992e58d4..c0cc384554 100644 --- a/apps/lang/svenska.lang +++ b/apps/lang/svenska.lang | |||
@@ -3779,7 +3779,7 @@ | |||
3779 | </voice> | 3779 | </voice> |
3780 | </phrase> | 3780 | </phrase> |
3781 | <phrase> | 3781 | <phrase> |
3782 | id: LANG_BATTERY_TYPE_ALKALINE | 3782 | id: LANG_BATTERY_TYPE_1 |
3783 | desc: in battery settings | 3783 | desc: in battery settings |
3784 | user: core | 3784 | user: core |
3785 | <source> | 3785 | <source> |
@@ -3796,7 +3796,7 @@ | |||
3796 | </voice> | 3796 | </voice> |
3797 | </phrase> | 3797 | </phrase> |
3798 | <phrase> | 3798 | <phrase> |
3799 | id: LANG_BATTERY_TYPE_NIMH | 3799 | id: LANG_BATTERY_TYPE_2 |
3800 | desc: in battery settings | 3800 | desc: in battery settings |
3801 | user: core | 3801 | user: core |
3802 | <source> | 3802 | <source> |
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang index 2b48f7873f..0005dfb6b8 100644 --- a/apps/lang/tagalog.lang +++ b/apps/lang/tagalog.lang | |||
@@ -3755,7 +3755,7 @@ | |||
3755 | </voice> | 3755 | </voice> |
3756 | </phrase> | 3756 | </phrase> |
3757 | <phrase> | 3757 | <phrase> |
3758 | id: LANG_BATTERY_TYPE_ALKALINE | 3758 | id: LANG_BATTERY_TYPE_1 |
3759 | desc: in battery settings | 3759 | desc: in battery settings |
3760 | user: core | 3760 | user: core |
3761 | <source> | 3761 | <source> |
@@ -3772,7 +3772,7 @@ | |||
3772 | </voice> | 3772 | </voice> |
3773 | </phrase> | 3773 | </phrase> |
3774 | <phrase> | 3774 | <phrase> |
3775 | id: LANG_BATTERY_TYPE_NIMH | 3775 | id: LANG_BATTERY_TYPE_2 |
3776 | desc: in battery settings | 3776 | desc: in battery settings |
3777 | user: core | 3777 | user: core |
3778 | <source> | 3778 | <source> |
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang index c03a5f1c01..5660f7a01e 100644 --- a/apps/lang/thai.lang +++ b/apps/lang/thai.lang | |||
@@ -3739,7 +3739,7 @@ | |||
3739 | </voice> | 3739 | </voice> |
3740 | </phrase> | 3740 | </phrase> |
3741 | <phrase> | 3741 | <phrase> |
3742 | id: LANG_BATTERY_TYPE_ALKALINE | 3742 | id: LANG_BATTERY_TYPE_1 |
3743 | desc: in battery settings | 3743 | desc: in battery settings |
3744 | user: core | 3744 | user: core |
3745 | <source> | 3745 | <source> |
@@ -3756,7 +3756,7 @@ | |||
3756 | </voice> | 3756 | </voice> |
3757 | </phrase> | 3757 | </phrase> |
3758 | <phrase> | 3758 | <phrase> |
3759 | id: LANG_BATTERY_TYPE_NIMH | 3759 | id: LANG_BATTERY_TYPE_2 |
3760 | desc: in battery settings | 3760 | desc: in battery settings |
3761 | user: core | 3761 | user: core |
3762 | <source> | 3762 | <source> |
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang index 01edc921b1..24a816798f 100644 --- a/apps/lang/turkce.lang +++ b/apps/lang/turkce.lang | |||
@@ -10262,7 +10262,7 @@ | |||
10262 | </voice> | 10262 | </voice> |
10263 | </phrase> | 10263 | </phrase> |
10264 | <phrase> | 10264 | <phrase> |
10265 | id: LANG_BATTERY_TYPE_NIMH | 10265 | id: LANG_BATTERY_TYPE_2 |
10266 | desc: in battery settings | 10266 | desc: in battery settings |
10267 | user: core | 10267 | user: core |
10268 | <source> | 10268 | <source> |
@@ -13368,7 +13368,7 @@ | |||
13368 | </voice> | 13368 | </voice> |
13369 | </phrase> | 13369 | </phrase> |
13370 | <phrase> | 13370 | <phrase> |
13371 | id: LANG_BATTERY_TYPE_ALKALINE | 13371 | id: LANG_BATTERY_TYPE_1 |
13372 | desc: in battery settings | 13372 | desc: in battery settings |
13373 | user: core | 13373 | user: core |
13374 | <source> | 13374 | <source> |
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang index 8f1d9f135d..ae5d648f3f 100644 --- a/apps/lang/ukrainian.lang +++ b/apps/lang/ukrainian.lang | |||
@@ -3771,7 +3771,7 @@ | |||
3771 | </voice> | 3771 | </voice> |
3772 | </phrase> | 3772 | </phrase> |
3773 | <phrase> | 3773 | <phrase> |
3774 | id: LANG_BATTERY_TYPE_ALKALINE | 3774 | id: LANG_BATTERY_TYPE_1 |
3775 | desc: in battery settings | 3775 | desc: in battery settings |
3776 | user: core | 3776 | user: core |
3777 | <source> | 3777 | <source> |
@@ -3788,7 +3788,7 @@ | |||
3788 | </voice> | 3788 | </voice> |
3789 | </phrase> | 3789 | </phrase> |
3790 | <phrase> | 3790 | <phrase> |
3791 | id: LANG_BATTERY_TYPE_NIMH | 3791 | id: LANG_BATTERY_TYPE_2 |
3792 | desc: in battery settings | 3792 | desc: in battery settings |
3793 | user: core | 3793 | user: core |
3794 | <source> | 3794 | <source> |
diff --git a/apps/lang/vlaams.lang b/apps/lang/vlaams.lang index 11038d2813..8bf0faf857 100644 --- a/apps/lang/vlaams.lang +++ b/apps/lang/vlaams.lang | |||
@@ -3576,7 +3576,7 @@ | |||
3576 | </voice> | 3576 | </voice> |
3577 | </phrase> | 3577 | </phrase> |
3578 | <phrase> | 3578 | <phrase> |
3579 | id: LANG_BATTERY_TYPE_ALKALINE | 3579 | id: LANG_BATTERY_TYPE_1 |
3580 | desc: in battery settings | 3580 | desc: in battery settings |
3581 | user: core | 3581 | user: core |
3582 | <source> | 3582 | <source> |
@@ -3593,7 +3593,7 @@ | |||
3593 | </voice> | 3593 | </voice> |
3594 | </phrase> | 3594 | </phrase> |
3595 | <phrase> | 3595 | <phrase> |
3596 | id: LANG_BATTERY_TYPE_NIMH | 3596 | id: LANG_BATTERY_TYPE_2 |
3597 | desc: in battery settings | 3597 | desc: in battery settings |
3598 | user: core | 3598 | user: core |
3599 | <source> | 3599 | <source> |
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang index f508f44fba..857167dc18 100644 --- a/apps/lang/walon.lang +++ b/apps/lang/walon.lang | |||
@@ -3776,7 +3776,7 @@ | |||
3776 | </voice> | 3776 | </voice> |
3777 | </phrase> | 3777 | </phrase> |
3778 | <phrase> | 3778 | <phrase> |
3779 | id: LANG_BATTERY_TYPE_ALKALINE | 3779 | id: LANG_BATTERY_TYPE_1 |
3780 | desc: in battery settings | 3780 | desc: in battery settings |
3781 | user: core | 3781 | user: core |
3782 | <source> | 3782 | <source> |
@@ -3793,7 +3793,7 @@ | |||
3793 | </voice> | 3793 | </voice> |
3794 | </phrase> | 3794 | </phrase> |
3795 | <phrase> | 3795 | <phrase> |
3796 | id: LANG_BATTERY_TYPE_NIMH | 3796 | id: LANG_BATTERY_TYPE_2 |
3797 | desc: in battery settings | 3797 | desc: in battery settings |
3798 | user: core | 3798 | user: core |
3799 | <source> | 3799 | <source> |
diff --git a/apps/settings_list.c b/apps/settings_list.c index a38ebc639c..64a150c806 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1050,8 +1050,12 @@ const struct settings_list settings[] = { | |||
1050 | 1050 | ||
1051 | #if BATTERY_TYPES_COUNT > 1 | 1051 | #if BATTERY_TYPES_COUNT > 1 |
1052 | CHOICE_SETTING(0, battery_type, LANG_BATTERY_TYPE, 0, "battery type", | 1052 | CHOICE_SETTING(0, battery_type, LANG_BATTERY_TYPE, 0, "battery type", |
1053 | "alkaline,nimh", NULL, 2, ID2P(LANG_BATTERY_TYPE_ALKALINE), | 1053 | #ifdef XDUOO_X3 |
1054 | ID2P(LANG_BATTERY_TYPE_NIMH)), | 1054 | "new_2000mAh,old_1500mAh", |
1055 | #else | ||
1056 | "alkaline,nimh", | ||
1057 | #endif | ||
1058 | NULL, 2, ID2P(LANG_BATTERY_TYPE_1), ID2P(LANG_BATTERY_TYPE_2)), | ||
1055 | #endif | 1059 | #endif |
1056 | #ifdef HAVE_REMOTE_LCD | 1060 | #ifdef HAVE_REMOTE_LCD |
1057 | /* remote lcd */ | 1061 | /* remote lcd */ |
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h index 30f0330edd..18d396a515 100644 --- a/firmware/export/config/xduoox3.h +++ b/firmware/export/config/xduoox3.h | |||
@@ -114,7 +114,7 @@ | |||
114 | #define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ | 114 | #define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ |
115 | #define BATTERY_CAPACITY_MAX 2000 /* max. capacity selectable */ | 115 | #define BATTERY_CAPACITY_MAX 2000 /* max. capacity selectable */ |
116 | #define BATTERY_CAPACITY_INC 100 /* capacity increment */ | 116 | #define BATTERY_CAPACITY_INC 100 /* capacity increment */ |
117 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 117 | #define BATTERY_TYPES_COUNT 2 /* Two types (2000mAh and 1500mAh) */ |
118 | 118 | ||
119 | #define CURRENT_NORMAL 167 // 2.78mA * 60s | 119 | #define CURRENT_NORMAL 167 // 2.78mA * 60s |
120 | #define CURRENT_BACKLIGHT 180 // 15mA * 60s | 120 | #define CURRENT_BACKLIGHT 180 // 15mA * 60s |
diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c index e1e578ae67..ffc6f25a38 100644 --- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c +++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c | |||
@@ -148,29 +148,39 @@ void KEY_INT_IRQ(void) | |||
148 | { | 148 | { |
149 | } | 149 | } |
150 | 150 | ||
151 | /* Notes on batteries | ||
152 | |||
153 | xDuoo shipped two types of batteries: | ||
154 | |||
155 | First is the 2000mAh battery shipped in newer units | ||
156 | Second is the 1500mAh battery shipped in older units | ||
157 | |||
158 | */ | ||
159 | |||
151 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = | 160 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = |
152 | { | 161 | { |
153 | /* 5% */ | 162 | /* 5% */ |
154 | 3414 | 163 | 3414, 3634 |
155 | }; | 164 | }; |
156 | 165 | ||
157 | const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = | 166 | const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = |
158 | { | 167 | { |
159 | /* 0% */ | 168 | /* 0% */ |
160 | 3307 | 169 | 3307, 3307 |
161 | }; | 170 | }; |
162 | 171 | ||
163 | |||
164 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ | 172 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ |
165 | const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = | 173 | const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = |
166 | { | 174 | { |
167 | { 3307, 3459, 3530, 3575, 3608, 3648, 3723, 3819, 3918, 4022, 4162 } | 175 | { 3307, 3459, 3530, 3575, 3608, 3648, 3723, 3819, 3918, 4022, 4162 }, |
176 | { 3300, 3652, 3704, 3730, 3753, 3786, 3836, 3906, 3973, 4061, 4160 } | ||
168 | }; | 177 | }; |
169 | 178 | ||
170 | #if CONFIG_CHARGING | 179 | #if CONFIG_CHARGING |
171 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ | 180 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ |
172 | const unsigned short percent_to_volt_charge[11] = | 181 | const unsigned short percent_to_volt_charge[11] = |
173 | { 3307, 3459, 3530, 3575, 3608, 3648, 3723, 3819, 3918, 4022, 4162 }; | 182 | // { 3300, 3652, 3704, 3730, 3753, 3786, 3836, 3906, 3973, 4061, 4160 }; |
183 | { 3444, 3827, 3893, 3909, 3931, 4001, 4067, 4150, 4206, 4207, 4208 }; | ||
174 | #endif /* CONFIG_CHARGING */ | 184 | #endif /* CONFIG_CHARGING */ |
175 | 185 | ||
176 | /* VBAT = (BDATA/1024) * 2.5V */ | 186 | /* VBAT = (BDATA/1024) * 2.5V */ |
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex index f23be48370..4faeafb895 100755 --- a/manual/configure_rockbox/system_options.tex +++ b/manual/configure_rockbox/system_options.tex | |||
@@ -26,6 +26,7 @@ | |||
26 | \opt{mrobe100}{720~mAh}% | 26 | \opt{mrobe100}{720~mAh}% |
27 | \opt{samsungyh920,samsungyh925}{900~mAh}% | 27 | \opt{samsungyh920,samsungyh925}{900~mAh}% |
28 | \opt{samsungyh820}{650~mAh}% | 28 | \opt{samsungyh820}{650~mAh}% |
29 | \opt{xduoox3}{2000~mAh}% | ||
29 | , which is the capacity value for the standard battery shipped with the \dap. | 30 | , which is the capacity value for the standard battery shipped with the \dap. |
30 | Rockbox uses this value for runtime estimation, not battery percentage | 31 | Rockbox uses this value for runtime estimation, not battery percentage |
31 | calculation. Changing this setting has no effect whatsoever on | 32 | calculation. Changing this setting has no effect whatsoever on |
@@ -44,8 +45,10 @@ | |||
44 | 45 | ||
45 | \opt{battery_types}{ | 46 | \opt{battery_types}{ |
46 | \item [Battery Type.] This setting tells Rockbox which type of battery | 47 | \item [Battery Type.] This setting tells Rockbox which type of battery |
47 | is currently used in the \dap{}. The two supported battery types are | 48 | is currently used in the \dap{}. |
48 | ``Alkaline'' or ``NiMH''.} | 49 | \nopt{xduoox3}{The two supported battery types are ``Alkaline'' or ``NiMH''.} |
50 | \opt{xduoox3}{Older \playerman{} \playertype{} units shipped with a 1500mAh battery, while newer units ships with a 2000mAh battery. If you are not sure which type you have, older units have a button marked ``ESC''.} | ||
51 | } | ||
49 | 52 | ||
50 | \opt{usb_charging_enable}{ | 53 | \opt{usb_charging_enable}{ |
51 | \item [Charge During USB Connection.] This option lets you control whether | 54 | \item [Charge During USB Connection.] This option lets you control whether |