xduoox3: Include curves for both battery types

There is no way to detect this at runtime so it is a user setting

Change-Id: Ibc5b87312238c59e3678d512af27e3a3bcb9a58a

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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3788,7 +3788,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3794,7 +3794,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3785,7 +3785,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3586,7 +3586,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3585,7 +3585,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3797,7 +3797,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3010,7 +3010,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3797,7 +3797,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3271,7 +3271,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
     *: none
     battery_types: "Alkaline"
+    xduoox3: "Newer (2000 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "Alkaline"
+    xduoox3: "Newer (2000 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "Alkaline"
+    xduoox3: "Newer 2000 milliamp hour"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <source>
     *: none
     battery_types: "NiMH"
+    xduoox3: "Older (1500 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "NiMH"
+    xduoox3: "Older (1500 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "Nickel metal hydride"
+    xduoox3: "Older 1500 milliamp hour"
   </voice>
 </phrase>
 <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
     *: none
     battery_types: "Alkaline"
+    xduoox3: "Newer (2000 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "Alkaline"
+    xduoox3: "Newer (2000 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "Alkaline"
+    xduoox3: "Newer 2000 milliamp hour"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <source>
     *: none
     battery_types: "NiMH"
+    xduoox3: "Older (1500 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "NiMH"
+    xduoox3: "Older (1500 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "Nickel metal hydride"
+    xduoox3: "Older 1500 milliamp hour"
   </voice>
 </phrase>
 <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -2254,7 +2254,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3513,7 +3513,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3585,7 +3585,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3639,7 +3639,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -2231,7 +2231,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3780,7 +3780,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3796,7 +3796,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3787,7 +3787,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -2565,7 +2565,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3580,7 +3580,7 @@ desc: deprecated
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3796,7 +3796,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3596,7 +3596,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3790,7 +3790,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3854,7 +3854,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3766,7 +3766,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3597,7 +3597,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3532,7 +3532,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3015,7 +3015,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3587,7 +3587,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3789,7 +3789,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3374,7 +3374,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -6298,7 +6298,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3410,7 +3410,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3579,7 +3579,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -7200,7 +7200,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3776,7 +3776,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3796,7 +3796,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
  </voice>
 </phrase>
 <phrase>
- id: LANG_BATTERY_TYPE_ALKALINE
+ id: LANG_BATTERY_TYPE_1
  desc: in battery settings
  user: core
  <source>
@@ -3772,7 +3772,7 @@
  </voice>
 </phrase>
 <phrase>
- id: LANG_BATTERY_TYPE_NIMH
+ id: LANG_BATTERY_TYPE_2
  desc: in battery settings
  user: core
  <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3756,7 +3756,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <source>
@@ -13368,7 +13368,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3788,7 +3788,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3593,7 +3593,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
+  id: LANG_BATTERY_TYPE_1
   desc: in battery settings
   user: core
   <source>
@@ -3793,7 +3793,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
+  id: LANG_BATTERY_TYPE_2
   desc: in battery settings
   user: core
   <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[] = {
 
 #if BATTERY_TYPES_COUNT > 1
     CHOICE_SETTING(0, battery_type, LANG_BATTERY_TYPE, 0, "battery type",
-                   "alkaline,nimh", NULL, 2, ID2P(LANG_BATTERY_TYPE_ALKALINE),
-                   ID2P(LANG_BATTERY_TYPE_NIMH)),
+#ifdef XDUOO_X3
+                   "new_2000mAh,old_1500mAh",
+#else
+                   "alkaline,nimh",
+#endif
+                   NULL, 2, ID2P(LANG_BATTERY_TYPE_1), ID2P(LANG_BATTERY_TYPE_2)),
 #endif
 #ifdef HAVE_REMOTE_LCD
     /* 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 @@
 #define BATTERY_CAPACITY_MIN 500      /* min. capacity selectable */
 #define BATTERY_CAPACITY_MAX 2000     /* max. capacity selectable */
 #define BATTERY_CAPACITY_INC 100      /* capacity increment */
-#define BATTERY_TYPES_COUNT  1        /* only one type */
+#define BATTERY_TYPES_COUNT  2        /* Two types (2000mAh and 1500mAh) */
 
 #define CURRENT_NORMAL 167      // 2.78mA * 60s
 #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)
 {
 }
 
+/* Notes on batteries
+
+   xDuoo shipped two types of batteries:
+
+   First is the 2000mAh battery shipped in newer units
+   Second is the 1500mAh battery shipped in older units
+
+*/
+
 const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
 {
     /* 5% */
-    3414
+    3414, 3634
 };
 
 const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
 {
     /* 0% */
-    3307
+    3307, 3307
 };
 
-
 /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
 const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
 {
-    { 3307, 3459, 3530, 3575, 3608, 3648, 3723, 3819, 3918, 4022, 4162 }
+    { 3307, 3459, 3530, 3575, 3608, 3648, 3723, 3819, 3918, 4022, 4162 },
+    { 3300, 3652, 3704, 3730, 3753, 3786, 3836, 3906, 3973, 4061, 4160 }
 };
 
 #if CONFIG_CHARGING
 /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
 const unsigned short percent_to_volt_charge[11] =
-    { 3307, 3459, 3530, 3575, 3608, 3648, 3723, 3819, 3918, 4022, 4162 };
+//    { 3300, 3652, 3704, 3730, 3753, 3786, 3836, 3906, 3973, 4061, 4160 };
+    { 3444, 3827, 3893, 3909, 3931, 4001, 4067, 4150, 4206, 4207, 4208 };
 #endif /* CONFIG_CHARGING */
 
 /* 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 @@
       \opt{mrobe100}{720~mAh}%
       \opt{samsungyh920,samsungyh925}{900~mAh}%
       \opt{samsungyh820}{650~mAh}%
+      \opt{xduoox3}{2000~mAh}%
       , which is the capacity value for the standard battery shipped with the \dap.
         Rockbox uses this value for runtime estimation, not battery percentage
         calculation. Changing this setting has no effect whatsoever on
@@ -44,8 +45,10 @@
 
       \opt{battery_types}{
       \item [Battery Type.] This setting tells Rockbox which type of battery
-        is currently used in the \dap{}. The two supported battery types are
-        ``Alkaline'' or ``NiMH''.}
+        is currently used in the \dap{}.
+       \nopt{xduoox3}{The two supported battery types are ``Alkaline'' or ``NiMH''.}
+       \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''.}
+        }
 
       \opt{usb_charging_enable}{
       \item [Charge During USB Connection.] This option lets you control whether