diff --git a/apps/lang/basque.lang b/apps/lang/basque.lang
index 9bf95fbc74..234c0eddc5 100644
--- a/apps/lang/basque.lang
+++ b/apps/lang/basque.lang
@@ -7076,10 +7076,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index c2c418aa33..d5bdcacd38 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -6512,10 +6512,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 1c6a659767..c91b9deadf 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -7071,10 +7071,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index a25c104d42..4fb1d1f508 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -4333,7 +4333,7 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
     *: "(VBR)"
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 190a547c14..f8796a06c9 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -4432,7 +4432,7 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
     *: " (變動位元率)"
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index 33a5c9a4dd..042a2a863b 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -7084,10 +7084,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "vé bé er"
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 015d8100a5..f27d73b3fc 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -4064,10 +4064,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 09a0b266a8..1c28f172fc 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -6498,10 +6498,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang
index 2cbd86c199..31dd38525f 100644
--- a/apps/lang/eesti.lang
+++ b/apps/lang/eesti.lang
@@ -4550,10 +4550,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index 603beabcce..2c94e8a178 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -6506,10 +6506,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index c6422b4807..dcaeb2f7e5 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -91,6 +91,7 @@
 # GoGear SA9200     gogearsa9200
 # Samsung
 # YH820/YH920/YH925 samsungyh*
+# First item will be shown when P2STR is passed a NULL pointer
 <phrase>
   id: LANG_ROCKBOX_TITLE
   desc: main menu title
@@ -105,7 +106,6 @@
     *: "Rockbox"
   </voice>
 </phrase>
-# First item will be shown when P2STR is passed a NULL pointer
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -3524,18 +3524,15 @@
   user: core
   <source>
     *: none
-    battery_types: ""
-    xduoox3: ""
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: ""
-    xduoox3: ""
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: ""
-    xduoox3: ""
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
@@ -3544,18 +3541,15 @@
   user: core
   <source>
     *: none
-    battery_types: ""
-    xduoox3: ""
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: ""
-    xduoox3: ""
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: ""
-    xduoox3: ""
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
@@ -3688,8 +3682,8 @@
   user: core
   <source>
     *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     aigoerosq,erosqnative,gogearsa9200,samsungyh*: "PLAY = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
@@ -3698,8 +3692,8 @@
   </source>
   <dest>
     *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     aigoerosq,erosqnative,gogearsa9200,samsungyh*: "PLAY = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
@@ -3717,8 +3711,8 @@
   user: core
   <source>
     *: none
-    gigabeatfx,mrobe500: "POWER = Revert"
     aigoerosq,erosqnative,gigabeats,sansafuzeplus: "BACK = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
@@ -3731,8 +3725,8 @@
   </source>
   <dest>
     *: none
-    gigabeatfx,mrobe500: "POWER = Revert"
     aigoerosq,erosqnative,gigabeats,sansafuzeplus: "BACK = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
@@ -6674,10 +6668,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6994,7 +6988,6 @@
     *: "Add Current to Shortcuts"
   </voice>
 </phrase>
-
 <phrase>
   id: LANG_PITCH
   desc: "pitch" in the pitch screen
@@ -16998,15 +16991,15 @@
   user: core
   <source>
     *: none
-    lineout_poweroff,erosqnative: "Line Out"
+    erosqnative,lineout_poweroff: "Line Out"
   </source>
   <dest>
     *: none
-    lineout_poweroff,erosqnative: "Line Out"
+    erosqnative,lineout_poweroff: "Line Out"
   </dest>
   <voice>
     *: none
-    lineout_poweroff,erosqnative: "Line Out"
+    erosqnative,lineout_poweroff: "Line Out"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 5b61b4f088..0cdd0940c7 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -4932,10 +4932,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index 9626add951..e06ac744c6 100644
--- a/apps/lang/esperanto.lang
+++ b/apps/lang/esperanto.lang
@@ -4659,10 +4659,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index b328b93dec..fccc548f3b 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -4781,10 +4781,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 399c868dc6..7fdecce2eb 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -6593,10 +6593,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index a97dcf2ddf..3a3d59472d 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -6155,10 +6155,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 854193a92e..7d1bcf2756 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -7030,10 +7030,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index e5576bea23..7d93514a77 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -7109,10 +7109,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang
index 95c6774296..89af1f0dc6 100644
--- a/apps/lang/hrvatski.lang
+++ b/apps/lang/hrvatski.lang
@@ -7073,10 +7073,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index b4d51d409c..1c0ddc04a4 100644
--- a/apps/lang/islenska.lang
+++ b/apps/lang/islenska.lang
@@ -3643,10 +3643,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 6ee01abb49..965f49d067 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -6496,10 +6496,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 9a758aa3c9..0fad7f1085 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -6516,10 +6516,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 8ddc514999..f3ceb75db2 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -6523,10 +6523,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang
index b4d3c5b489..875874e5eb 100644
--- a/apps/lang/latviesu.lang
+++ b/apps/lang/latviesu.lang
@@ -6509,7 +6509,7 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
     *: "(MBR)"
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 41bac94417..1629c2bb3d 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -7151,10 +7151,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index a88488a3f0..fe0a298a4e 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -6681,10 +6681,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index a676c47a19..ae5dda256f 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -4464,10 +4464,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "Variabele bitrate"
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 840c5fd922..55d74aadd6 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -4731,10 +4731,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index 2a65128bb7..8479e8fb12 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -4052,10 +4052,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index fa770ee0d0..bb29114247 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -6502,10 +6502,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 7bc8ecc3a1..50d3978e0b 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -6511,10 +6511,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 92f2f345b2..e47c1d0f0c 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -4431,10 +4431,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index d707b96499..fb2ef17e7f 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -2414,7 +2414,7 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
     *: "(VBR)"
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 3603ed0c99..1f9c00a734 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -3960,7 +3960,7 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
     *: " (Переменный)"
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index ec41d11d46..e8f99f16e5 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -6494,10 +6494,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index 62113361df..975b7e288f 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -3200,10 +3200,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index ea90e2ff0b..cebf7177ee 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -6592,10 +6592,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index d8b0bb4d5b..a43d352b1d 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -6516,10 +6516,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index a08b3a4d97..9c3cb5d936 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -6142,10 +6142,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index f37e44dfdb..1b2ba14ee9 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -7054,10 +7054,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index c6aa3ad20e..d61d64be06 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -6550,10 +6550,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 436fcff760..4cdc690ca3 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -6509,10 +6509,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/lang/vlaams.lang b/apps/lang/vlaams.lang
index 90d72fbff7..48da11b932 100644
--- a/apps/lang/vlaams.lang
+++ b/apps/lang/vlaams.lang
@@ -4796,10 +4796,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "Variabele bitrate"
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index fcd3477761..a918611e66 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -7092,10 +7092,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
diff --git a/apps/screens.c b/apps/screens.c
index b5c38755b8..c7c13a8e75 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -666,7 +666,8 @@ static const char * id3_get_or_speak_info(int selected_item, void* data,
             case LANG_ID3_BITRATE:
                 if (!id3->bitrate)
                     return NULL;
-                snprintf(buffer, buffer_len, "%d kbps%s", id3->bitrate,
+                snprintf(buffer, buffer_len, "%d kbps%s%s", id3->bitrate,
+            id3->vbr ? " " : "",
             id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) "");
                 val=buffer;
                 if(say_it)
diff --git a/tools/updatelang b/tools/updatelang
index 22560c1faf..e68d958221 100755
--- a/tools/updatelang
+++ b/tools/updatelang
@@ -20,6 +20,7 @@ sub trim {
     my ($string) = @_;
     $string =~ s/^\s+//;
     $string =~ s/\s+$//;
+    $string =~ tr/\t//d;
     return $string;
 }
 
@@ -61,7 +62,13 @@ sub parselangfile {
 	    }
 	} elsif ($pos ne 'phrase' && $line =~ /^([^:]+): ?\"?([^\"]*)\"?$/) {
 	    my @targets = split(',', $1);
-	    my $w = $2;
+	    my $w;
+
+	    if ($id ne 'VOICE_PAUSE') {
+               $w = trim($2);
+            } else {
+               $w = $2;
+            }
 
 	    foreach (@targets) {
 		my $l = trim($_);
diff --git a/tools/voice.pl b/tools/voice.pl
index 1e6cc32b45..4782ac69c3 100755
--- a/tools/voice.pl
+++ b/tools/voice.pl
@@ -698,6 +698,9 @@ if (defined($v) or defined($ENV{'V'})) {
 # add the tools dir to the path temporarily, for calling various tools
 $ENV{'PATH'} = dirname($0) . ':' . $ENV{'PATH'};
 
+# logging needs to be UTF8
+binmode(*STDOUT, ':encoding(utf8)');
+
 my $tts_object = init_tts($s, $S, $l);
 
 # Do what we're told