diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -191,15 +191,15 @@ STR_COLOUR_WHITE                                                :白
 STR_COLOUR_RANDOM                                               :ランダム
 
 # Units used in OpenTTD
-STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}mph
-STR_UNITS_VELOCITY_METRIC                                       :{COMMA}km/h
-STR_UNITS_VELOCITY_SI                                           :{COMMA}m/s
+STR_UNITS_VELOCITY_IMPERIAL                                     :{DECIMAL}mph
+STR_UNITS_VELOCITY_METRIC                                       :{DECIMAL}km/h
+STR_UNITS_VELOCITY_SI                                           :{DECIMAL}m/s
 STR_UNITS_VELOCITY_GAMEUNITS                                    :{DECIMAL}{NBSP}タイル/日
-STR_UNITS_VELOCITY_KNOTS                                        :{COMMA}{NBSP}ノット
-
-STR_UNITS_POWER_IMPERIAL                                        :{COMMA}英馬力
-STR_UNITS_POWER_METRIC                                          :{COMMA}仏馬力
-STR_UNITS_POWER_SI                                              :{COMMA}kW
+STR_UNITS_VELOCITY_KNOTS                                        :{DECIMAL}{NBSP}ノット
+
+STR_UNITS_POWER_IMPERIAL                                        :{DECIMAL}英馬力
+STR_UNITS_POWER_METRIC                                          :{DECIMAL}仏馬力
+STR_UNITS_POWER_SI                                              :{DECIMAL}kW
 
 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_IMPERIAL                     :{DECIMAL}{NBSP}hp/t
 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_METRIC                       :{DECIMAL}{NBSP}hp/t
@@ -211,29 +211,29 @@ STR_UNITS_POWER_SI_TO_WEIGHT_IMPERIAL   
 STR_UNITS_POWER_SI_TO_WEIGHT_METRIC                             :{DECIMAL}{NBSP}kW/t
 STR_UNITS_POWER_SI_TO_WEIGHT_SI                                 :{DECIMAL}{NBSP}W/kg
 
-STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}t
-STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}t.
-STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}kg
-
-STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA}米トン
-STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA}トン
-STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA}kg
-
-STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}gal.
-STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}ℓ
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³
-
-STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA}ガロン
-STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA}リットル
-STR_UNITS_VOLUME_LONG_SI                                        :{COMMA}m³
-
-STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}重量ポンド
-STR_UNITS_FORCE_METRIC                                          :{COMMA}kgf
-STR_UNITS_FORCE_SI                                              :{COMMA}kN
-
-STR_UNITS_HEIGHT_IMPERIAL                                       :{COMMA}フィート
-STR_UNITS_HEIGHT_METRIC                                         :{COMMA}m
-STR_UNITS_HEIGHT_SI                                             :{COMMA}m
+STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{DECIMAL}t
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{DECIMAL}t.
+STR_UNITS_WEIGHT_SHORT_SI                                       :{DECIMAL}kg
+
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{DECIMAL}米トン
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{DECIMAL}トン
+STR_UNITS_WEIGHT_LONG_SI                                        :{DECIMAL}kg
+
+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{DECIMAL}gal.
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{DECIMAL}ℓ
+STR_UNITS_VOLUME_SHORT_SI                                       :{DECIMAL}m³
+
+STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{DECIMAL}ガロン
+STR_UNITS_VOLUME_LONG_METRIC                                    :{DECIMAL}リットル
+STR_UNITS_VOLUME_LONG_SI                                        :{DECIMAL}m³
+
+STR_UNITS_FORCE_IMPERIAL                                        :{DECIMAL}重量ポンド
+STR_UNITS_FORCE_METRIC                                          :{DECIMAL}kgf
+STR_UNITS_FORCE_SI                                              :{DECIMAL}kN
+
+STR_UNITS_HEIGHT_IMPERIAL                                       :{DECIMAL}フィート
+STR_UNITS_HEIGHT_METRIC                                         :{DECIMAL}m
+STR_UNITS_HEIGHT_SI                                             :{DECIMAL}m
 
 # Common window strings
 STR_LIST_FILTER_TITLE                                           :{BLACK}フィルター: