diff --git a/src/locales/bg/units.json b/src/locales/bg/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/bg/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/cs/units.json b/src/locales/cs/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/cs/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/da/units.json b/src/locales/da/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/da/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/de/units.json b/src/locales/de/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/de/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/el/units.json b/src/locales/el/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/el/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/en-GB/commands/convert.json b/src/locales/en-GB/commands/convert.json
index 2253f9d58..c44344b31 100644
--- a/src/locales/en-GB/commands/convert.json
+++ b/src/locales/en-GB/commands/convert.json
@@ -7,133 +7,7 @@
 	"fromDescription": "The unit to convert from",
 	"toName": "to",
 	"toDescription": "The unit to convert to",
-	"result": "`{{from}}` equals to `{{to}}`.",
-	"lengthName": "length",
-	"lengthDescription": "Converts one unit of length to another",
-	"lengthAstronomicalUnit": "Astronomical Unit",
-	"lengthFeet": "Feet",
-	"lengthInch": "Inch",
-	"lengthKilometer": "Kilometre",
-	"lengthLightSecond": "Light Second",
-	"lengthLightYear": "Light Year",
-	"lengthMeter": "Metre",
-	"lengthCentimeter": "Centimetre",
-	"lengthMile": "Mile",
-	"lengthNauticalMile": "Nautical Mile",
-	"lengthMachSecond": "Mach Second",
-	"lengthParsec": "Parsec",
-	"massName": "mass",
-	"massDescription": "Converts one unit of mass to another",
-	"massElectronVolt": "Electron Volt",
-	"massGrain": "Grain",
-	"massGram": "Gram",
-	"massKilogram": "Kilogram",
-	"massOunce": "Ounce",
-	"massPound": "Pound",
-	"massTon": "Ton",
-	"massTonne": "Tonne",
-	"timeName": "time",
-	"timeDescription": "Converts one unit of time to another",
-	"timeCentury": "Century",
-	"timeDay": "Day",
-	"timeDecade": "Decade",
-	"timeHour": "Hour",
-	"timeLunarYear": "Lunar Year",
-	"timeMillennium": "Millennium",
-	"timeMinute": "Minute",
-	"timeMonth": "Month",
-	"timeSecond": "Second",
-	"timeTropicalMonth": "Tropical Month",
-	"timeTropicalYear": "Tropical Year",
-	"timeWeek": "Week",
-	"timeShortCentury": "c",
-	"timeShortDay": "d",
-	"timeShortDecade": "de",
-	"timeShortHour": "h",
-	"timeShortLunarYear": "yr",
-	"timeShortMillennium": "mill",
-	"timeShortMinute": "min",
-	"timeShortMonth": "mo",
-	"timeShortSecond": "s",
-	"timeShortTropicalMonth": "trmo",
-	"timeShortTropicalYear": "tryr",
-	"timeShortWeek": "w",
-	"temperatureName": "temperature",
-	"temperatureDescription": "Converts one unit of temperature to another",
-	"temperatureCelsius": "Celsius",
-	"temperatureDelisle": "Delisle",
-	"temperatureFahrenheit": "Fahrenheit",
-	"temperatureNewton": "Newton",
-	"temperatureRankine": "Rankine",
-	"temperatureReaumur": "Réaumur",
-	"temperatureRomer": "Rømer",
-	"temperatureKelvin": "Kelvin",
-	"speedName": "speed",
-	"speedDescription": "Converts one unit of speed to another",
-	"fromLengthName": "from-length",
-	"fromLengthDescription": "The unit of length to convert from",
-	"fromTimeName": "from-time",
-	"fromTimeDescription": "The unit of time to convert from",
-	"toLengthName": "to-length",
-	"toLengthDescription": "The unit of length to convert to",
-	"toTimeName": "to-time",
-	"toTimeDescription": "The unit of time to convert to",
-	"unitAstronomicalUnit": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}AU",
-	"unitFeet": "{{value, number(style: unit; unit: foot; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitInch": "{{value, number(style: unit; unit: inch; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilometer": "{{value, number(style: unit; unit: kilometer; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLightSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} light seconds",
-	"unitLightYear": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}ly",
-	"unitMeter": "{{value, number(style: unit; unit: meter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCentimeter": "{{value, number(style: unit; unit: centimeter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNauticalMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMachSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} Ms",
-	"unitParsec": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} parsecs",
-	"unitElectronVolt": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}eV",
-	"unitGrain": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} grains",
-	"unitGram": "{{value, number(style: unit; unit: gram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilogram": "{{value, number(style: unit; unit: kilogram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitOunce": "{{value, number(style: unit; unit: ounce; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitPound": "{{value, number(style: unit; unit: pound; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTon": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} tonne",
-	"unitTonne": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} metric tonne",
-	"unitCentury": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} centuries",
-	"unitDay": "{{value, number(style: unit; unit: day; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDecade": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} decades",
-	"unitHour": "{{value, number(style: unit; unit: hour; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLunarYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMillennium": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} millennia",
-	"unitMinute": "{{value, number(style: unit; unit: minute; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitSecond": "{{value, number(style: unit; unit: second; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitWeek": "{{value, number(style: unit; unit: week; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCelsius": "{{value, number(style: unit; unit: celsius; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDelisle": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°De",
-	"unitFahrenheit": "{{value, number(style: unit; unit: fahrenheit; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNewton": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}N",
-	"unitRankine": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°R",
-	"unitReaumur": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Ré",
-	"unitRomer": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Rø",
-	"unitKelvin": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}K",
-	"unitCubicCentimeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} cm³",
-	"unitCubicFoot": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} ft³",
-	"unitCubicInch": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} in³",
-	"unitCubicMeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} m³",
-	"unitCubicYard": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} yd³",
-	"unitLiter": "{{value, number(style: unit; unit: liter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitUsGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitImperialGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"volumeName": "volume",
-	"volumeDescription": "Converts one unit of volume to another",
-	"volumeCubicCentimeter": "Cubic Centimetre",
-	"volumeCubicFoot": "Cubic Foot",
-	"volumeCubicInch": "Cubic Inch",
-	"volumeCubicMeter": "Cubic Metre",
-	"volumeCubicYard": "Cubic Yard",
-	"volumeLiter": "Liter",
-	"volumeUsGallon": "US Gallon",
-	"volumeImperialGallon": "Imperial Gallon"
+	"unitNotSupported": "The unit `{{unit}}` is not supported.",
+	"mismatchingTypes": "The unit **{{fromUnit}}** cannot be converted to **{{toUnit}}**.",
+	"result": "**{{fromValue, number}} {{fromUnitSymbol}}** ({{fromUnitName}}) equals to **{{toValue, number}} {{toUnitSymbol}}** ({{toUnitName}})."
 }
diff --git a/src/locales/en-GB/commands/dictionary.json b/src/locales/en-GB/commands/dictionary.json
index 870ce1cdc..5f54f1f59 100644
--- a/src/locales/en-GB/commands/dictionary.json
+++ b/src/locales/en-GB/commands/dictionary.json
@@ -4,9 +4,10 @@
 	"optionsInputName": "input",
 	"optionsInputDescription": "The word to get the definition of",
 	"contentTitle": "**Dictionary:** `{{value}}`",
-	"contentLexicalCategory": "## Lexical category: `{{value}}`",
+	"contentPhonetic": "Phonetic: `{{value}}`",
+	"contentLexicalCategory": "## {{index}}. Lexical category: `{{value}}`",
 	"contentExample": "Example: `{{value}}`",
-	"contentDefinition": "### Definition:\n> {{value}}",
+	"contentDefinition": "### {{index}}. {{subIndex}}. Definition:\n> {{value}}",
 	"fetchAbort": "I couldn't search for `{{value}}` because the Dictionary API did not respond within 2 seconds, please try again later.",
 	"fetchNoResults": "The Dictionary API did not return any results for `{{value}}`.",
 	"fetchRateLimited": "I couldn't search for `{{value}}` because I have made too many requests recently to the Dictionary API. Please try again in around a minute.",
diff --git a/src/locales/en-GB/units.json b/src/locales/en-GB/units.json
new file mode 100644
index 000000000..d0ee5a3aa
--- /dev/null
+++ b/src/locales/en-GB/units.json
@@ -0,0 +1,85 @@
+{
+	"astronomicalUnit": "Astronomical Unit",
+	"feet": "Feet",
+	"inch": "Inch",
+	"lightSecond": "Light Second",
+	"lightYear": "Light Year",
+	"meter": "Metre",
+	"mile": "Mile",
+	"nauticalMile": "Nautical Mile",
+	"yard": "Yard",
+	"parsec": "Parsec",
+	"electronVolt": "Electronvolt",
+	"grain": "Grain",
+	"gram": "Gram",
+	"ounce": "Ounce",
+	"pound": "Pound",
+	"quintal": "Quintal",
+	"ton": "Ton",
+	"tonne": "Tonne",
+	"century": "Century",
+	"day": "Day",
+	"hour": "Hour",
+	"minute": "Minute",
+	"second": "Second",
+	"week": "Week",
+	"year": "Year",
+	"millennium": "Millennium",
+	"celsius": "Celsius",
+	"delisle": "Delisle",
+	"fahrenheit": "Fahrenheit",
+	"gasMark": "Gas Mark",
+	"kelvin": "Kelvin",
+	"newton": "Newton",
+	"rankine": "Rankine",
+	"reaumur": "Réaumur",
+	"romer": "Rømer",
+	"acre": "Acre",
+	"are": "Are",
+	"barn": "Barn",
+	"hectare": "Hectare",
+	"barrel": "Barrel",
+	"bushel": "Bushel",
+	"cord": "Cord",
+	"dram": "Dram",
+	"fluidOunce": "Fluid Ounce",
+	"gallonImperial": "Gallon (Imperial)",
+	"gallonUS": "Gallon (US)",
+	"gill": "Gill",
+	"hogshead": "Hogshead",
+	"liter": "Litre",
+	"minim": "Minim",
+	"peck": "Peck",
+	"pint": "Pint",
+	"quart": "Quart",
+	"tablespoon": "Tablespoon",
+	"teaspoon": "Teaspoon",
+	"prefixUnit": "{{prefix}}{{unit, lowerCapital}}",
+	"quetta": "Quetta",
+	"ronna": "Ronna",
+	"yotta": "Yotta",
+	"zetta": "Zetta",
+	"exa": "Exa",
+	"peta": "Peta",
+	"tera": "Tera",
+	"giga": "Giga",
+	"mega": "Mega",
+	"kilo": "Kilo",
+	"hecto": "Hecto",
+	"deca": "Deca",
+	"deci": "Deci",
+	"centi": "Centi",
+	"milli": "Milli",
+	"micro": "Micro",
+	"nano": "Nano",
+	"pico": "Pico",
+	"femto": "Femto",
+	"atto": "Atto",
+	"zepto": "Zepto",
+	"yocto": "Yocto",
+	"ronto": "Ronto",
+	"quecto": "Quecto",
+	"prefixDimension": "{{dimension}} {{unit}}",
+	"square": "Square",
+	"cubic": "Cubic"
+}
diff --git a/src/locales/es-419/commands/convert.json b/src/locales/es-419/commands/convert.json
index c23888742..99caa2450 100644
--- a/src/locales/es-419/commands/convert.json
+++ b/src/locales/es-419/commands/convert.json
@@ -7,133 +7,7 @@
 	"fromDescription": "La unidad de la cual convertir",
 	"toName": "a",
 	"toDescription": "La unidad a la cual convertir",
-	"result": "`{{from}}` equivale a `{{to}}`.",
-	"lengthName": "longitud",
-	"lengthDescription": "Convierte una unidad de longitud a otra",
-	"lengthAstronomicalUnit": "Unidad Astronómica",
-	"lengthFeet": "Pie",
-	"lengthInch": "Pulgada",
-	"lengthKilometer": "Kilómetro",
-	"lengthLightSecond": "Segundo Luz",
-	"lengthLightYear": "Año Luz",
-	"lengthMeter": "Metro",
-	"lengthCentimeter": "Centímetro",
-	"lengthMile": "Milla",
-	"lengthNauticalMile": "Milla Náutica",
-	"lengthMachSecond": "Segundo Mach",
-	"lengthParsec": "Pársec",
-	"massName": "masa",
-	"massDescription": "Convierte una unidad de masa a otra",
-	"massElectronVolt": "Electronvoltio",
-	"massGrain": "Grano",
-	"massGram": "Gramo",
-	"massKilogram": "Kilogramo",
-	"massOunce": "Onza",
-	"massPound": "Libra",
-	"massTon": "Tonelada (Imperial)",
-	"massTonne": "Tonelada",
-	"timeName": "tiempo",
-	"timeDescription": "Convierte una unidad de tiempo a otra",
-	"timeCentury": "Siglo",
-	"timeDay": "Día",
-	"timeDecade": "Década",
-	"timeHour": "Hora",
-	"timeLunarYear": "Año Lunar",
-	"timeMillennium": "Milenio",
-	"timeMinute": "Minuto",
-	"timeMonth": "Mes",
-	"timeSecond": "Segundo",
-	"timeTropicalMonth": "Mes Tropical",
-	"timeTropicalYear": "Año Tropical",
-	"timeWeek": "Semana",
-	"timeShortCentury": "c",
-	"timeShortDay": "día",
-	"timeShortDecade": "de",
-	"timeShortHour": "h",
-	"timeShortLunarYear": "año",
-	"timeShortMillennium": "mil",
-	"timeShortMinute": "min",
-	"timeShortMonth": "mes",
-	"timeShortSecond": "s",
-	"timeShortTropicalMonth": "mes trop.",
-	"timeShortTropicalYear": "año trop.",
-	"timeShortWeek": "sem",
-	"temperatureName": "temperatura",
-	"temperatureDescription": "Convierte una unidad de temperatura a otra",
-	"temperatureCelsius": "Celsius",
-	"temperatureDelisle": "Delisle",
-	"temperatureFahrenheit": "Fahrenheit",
-	"temperatureNewton": "Newton",
-	"temperatureRankine": "Rankine",
-	"temperatureReaumur": "Réaumur",
-	"temperatureRomer": "Rømer",
-	"temperatureKelvin": "Kelvin",
-	"speedName": "velocidad",
-	"speedDescription": "Convierte una unidad de velocidad a otra",
-	"fromLengthName": "desde-longitud",
-	"fromLengthDescription": "La unidad de longitud de la cual convertir",
-	"fromTimeName": "desde-tiempo",
-	"fromTimeDescription": "La unidad de tiempo de la cual convertir",
-	"toLengthName": "a-longitud",
-	"toLengthDescription": "La unidad de longitud a la cual convertir",
-	"toTimeName": "a-tiempo",
-	"toTimeDescription": "La unidad de tiempo a la cual convertir",
-	"unitAstronomicalUnit": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}UA",
-	"unitFeet": "{{value, number(style: unit; unit: foot; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitInch": "{{value, number(style: unit; unit: inch; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilometer": "{{value, number(style: unit; unit: kilometer; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLightSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} segundos luz",
-	"unitLightYear": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} años luz",
-	"unitMeter": "{{value, number(style: unit; unit: meter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCentimeter": "{{value, number(style: unit; unit: centimeter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNauticalMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMachSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} Ms",
-	"unitParsec": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} pársecs",
-	"unitElectronVolt": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}eV",
-	"unitGrain": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} granos",
-	"unitGram": "{{value, number(style: unit; unit: gram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilogram": "{{value, number(style: unit; unit: kilogram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitOunce": "{{value, number(style: unit; unit: ounce; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitPound": "{{value, number(style: unit; unit: pound; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTon": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} toneladas americanas",
-	"unitTonne": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} toneladas",
-	"unitCentury": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} siglos",
-	"unitDay": "{{value, number(style: unit; unit: day; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDecade": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} décadas",
-	"unitHour": "{{value, number(style: unit; unit: hour; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLunarYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMillennium": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} milenios",
-	"unitMinute": "{{value, number(style: unit; unit: minute; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitSecond": "{{value, number(style: unit; unit: second; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitWeek": "{{value, number(style: unit; unit: week; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCelsius": "{{value, number(style: unit; unit: celsius; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDelisle": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°De",
-	"unitFahrenheit": "{{value, number(style: unit; unit: fahrenheit; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNewton": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}N",
-	"unitRankine": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°R",
-	"unitReaumur": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Ré",
-	"unitRomer": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Rø",
-	"unitKelvin": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}K",
-	"unitCubicCentimeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} cm³",
-	"unitCubicFoot": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} ft³",
-	"unitCubicInch": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} in³",
-	"unitCubicMeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} m³",
-	"unitCubicYard": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} yd³",
-	"unitLiter": "{{value, number(style: unit; unit: liter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitUsGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitImperialGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"volumeName": "volumen",
-	"volumeDescription": "Convierte una unidad de volumen a otra",
-	"volumeCubicCentimeter": "Centímetro Cúbico",
-	"volumeCubicFoot": "Pie Cúbico",
-	"volumeCubicInch": "Pulgada Cúbica",
-	"volumeCubicMeter": "Metro Cúbico",
-	"volumeCubicYard": "Yarda Cúbica",
-	"volumeLiter": "Litro",
-	"volumeUsGallon": "Galón de Estados Unidos",
-	"volumeImperialGallon": "Galón Imperial"
+	"unitNotSupported": "La unidad `{{unit}}` no está soportada.",
+	"mismatchingTypes": "La unidad **{{fromUnit}}** no puede ser convertida a **{{toUnit}}**.",
+	"result": "**{{fromValue, number}} {{fromUnitSymbol}}** ({{fromUnitName}}) equivale a **{{toValue, number}} {{toUnitSymbol}}** ({{toUnitName}})."
 }
diff --git a/src/locales/es-419/units.json b/src/locales/es-419/units.json
new file mode 100644
index 000000000..9fd226ade
--- /dev/null
+++ b/src/locales/es-419/units.json
@@ -0,0 +1,85 @@
+{
+	"astronomicalUnit": "Unidad Astronómica",
+	"feet": "Pie",
+	"inch": "Pulgada",
+	"lightSecond": "Segundo Luz",
+	"lightYear": "Año Luz",
+	"meter": "Metro",
+	"mile": "Milla",
+	"nauticalMile": "Milla Náutica",
+	"yard": "Yarda",
+	"parsec": "Pársec",
+	"electronVolt": "Electronvoltio",
+	"grain": "Grano",
+	"gram": "Gramo",
+	"ounce": "Onza",
+	"pound": "Libra",
+	"quintal": "Quintal",
+	"ton": "Tonelada Imperial",
+	"tonne": "Tonelada",
+	"century": "Siglo",
+	"day": "Día",
+	"hour": "Hora",
+	"minute": "Minuto",
+	"second": "Segundo",
+	"week": "Semana",
+	"year": "Año",
+	"millennium": "Milenio",
+	"celsius": "Celsius",
+	"delisle": "Delisle",
+	"fahrenheit": "Fahrenheit",
+	"gasMark": "Marca de Gas",
+	"kelvin": "Kelvin",
+	"newton": "Newton",
+	"rankine": "Rankine",
+	"reaumur": "Réaumur",
+	"romer": "Rømer",
+	"acre": "Acre",
+	"are": "Área",
+	"barn": "Barnio",
+	"hectare": "Hectárea",
+	"barrel": "Barril",
+	"bushel": "Bushel",
+	"cord": "Cordón",
+	"dram": "Dram",
+	"fluidOunce": "Onza Fluida",
+	"gallonImperial": "Galón (Imperial)",
+	"gallonUS": "Galón (EE.UU.)",
+	"gill": "Gill",
+	"hogshead": "Tonel",
+	"liter": "Litro",
+	"minim": "Minim",
+	"peck": "Peck",
+	"pint": "Pinta",
+	"quart": "Cuarto",
+	"tablespoon": "Cuchara",
+	"teaspoon": "Cucharada",
+	"prefixUnit": "{{prefix}}{{unit, lowerCapital}}",
+	"quetta": "Quetta",
+	"ronna": "Ronna",
+	"yotta": "Yotta",
+	"zetta": "Zetta",
+	"exa": "Exa",
+	"peta": "Peta",
+	"tera": "Tera",
+	"giga": "Giga",
+	"mega": "Mega",
+	"kilo": "Kilo",
+	"hecto": "Hecto",
+	"deca": "Deca",
+	"deci": "Deci",
+	"centi": "Centi",
+	"milli": "Mili",
+	"micro": "Micro",
+	"nano": "Nano",
+	"pico": "Pico",
+	"femto": "Femto",
+	"atto": "Atto",
+	"zepto": "Zepto",
+	"yocto": "Yocto",
+	"ronto": "Ronto",
+	"quecto": "Quecto",
+	"prefixDimension": "{{unit}} {{dimension}}",
+	"square": "Cuadrados",
+	"cubic": "Cúbicos"
+}
diff --git a/src/locales/es-ES/commands/convert.json b/src/locales/es-ES/commands/convert.json
index c23888742..99caa2450 100644
--- a/src/locales/es-ES/commands/convert.json
+++ b/src/locales/es-ES/commands/convert.json
@@ -7,133 +7,7 @@
 	"fromDescription": "La unidad de la cual convertir",
 	"toName": "a",
 	"toDescription": "La unidad a la cual convertir",
-	"result": "`{{from}}` equivale a `{{to}}`.",
-	"lengthName": "longitud",
-	"lengthDescription": "Convierte una unidad de longitud a otra",
-	"lengthAstronomicalUnit": "Unidad Astronómica",
-	"lengthFeet": "Pie",
-	"lengthInch": "Pulgada",
-	"lengthKilometer": "Kilómetro",
-	"lengthLightSecond": "Segundo Luz",
-	"lengthLightYear": "Año Luz",
-	"lengthMeter": "Metro",
-	"lengthCentimeter": "Centímetro",
-	"lengthMile": "Milla",
-	"lengthNauticalMile": "Milla Náutica",
-	"lengthMachSecond": "Segundo Mach",
-	"lengthParsec": "Pársec",
-	"massName": "masa",
-	"massDescription": "Convierte una unidad de masa a otra",
-	"massElectronVolt": "Electronvoltio",
-	"massGrain": "Grano",
-	"massGram": "Gramo",
-	"massKilogram": "Kilogramo",
-	"massOunce": "Onza",
-	"massPound": "Libra",
-	"massTon": "Tonelada (Imperial)",
-	"massTonne": "Tonelada",
-	"timeName": "tiempo",
-	"timeDescription": "Convierte una unidad de tiempo a otra",
-	"timeCentury": "Siglo",
-	"timeDay": "Día",
-	"timeDecade": "Década",
-	"timeHour": "Hora",
-	"timeLunarYear": "Año Lunar",
-	"timeMillennium": "Milenio",
-	"timeMinute": "Minuto",
-	"timeMonth": "Mes",
-	"timeSecond": "Segundo",
-	"timeTropicalMonth": "Mes Tropical",
-	"timeTropicalYear": "Año Tropical",
-	"timeWeek": "Semana",
-	"timeShortCentury": "c",
-	"timeShortDay": "día",
-	"timeShortDecade": "de",
-	"timeShortHour": "h",
-	"timeShortLunarYear": "año",
-	"timeShortMillennium": "mil",
-	"timeShortMinute": "min",
-	"timeShortMonth": "mes",
-	"timeShortSecond": "s",
-	"timeShortTropicalMonth": "mes trop.",
-	"timeShortTropicalYear": "año trop.",
-	"timeShortWeek": "sem",
-	"temperatureName": "temperatura",
-	"temperatureDescription": "Convierte una unidad de temperatura a otra",
-	"temperatureCelsius": "Celsius",
-	"temperatureDelisle": "Delisle",
-	"temperatureFahrenheit": "Fahrenheit",
-	"temperatureNewton": "Newton",
-	"temperatureRankine": "Rankine",
-	"temperatureReaumur": "Réaumur",
-	"temperatureRomer": "Rømer",
-	"temperatureKelvin": "Kelvin",
-	"speedName": "velocidad",
-	"speedDescription": "Convierte una unidad de velocidad a otra",
-	"fromLengthName": "desde-longitud",
-	"fromLengthDescription": "La unidad de longitud de la cual convertir",
-	"fromTimeName": "desde-tiempo",
-	"fromTimeDescription": "La unidad de tiempo de la cual convertir",
-	"toLengthName": "a-longitud",
-	"toLengthDescription": "La unidad de longitud a la cual convertir",
-	"toTimeName": "a-tiempo",
-	"toTimeDescription": "La unidad de tiempo a la cual convertir",
-	"unitAstronomicalUnit": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}UA",
-	"unitFeet": "{{value, number(style: unit; unit: foot; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitInch": "{{value, number(style: unit; unit: inch; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilometer": "{{value, number(style: unit; unit: kilometer; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLightSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} segundos luz",
-	"unitLightYear": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} años luz",
-	"unitMeter": "{{value, number(style: unit; unit: meter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCentimeter": "{{value, number(style: unit; unit: centimeter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNauticalMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMachSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} Ms",
-	"unitParsec": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} pársecs",
-	"unitElectronVolt": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}eV",
-	"unitGrain": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} granos",
-	"unitGram": "{{value, number(style: unit; unit: gram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilogram": "{{value, number(style: unit; unit: kilogram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitOunce": "{{value, number(style: unit; unit: ounce; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitPound": "{{value, number(style: unit; unit: pound; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTon": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} toneladas americanas",
-	"unitTonne": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} toneladas",
-	"unitCentury": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} siglos",
-	"unitDay": "{{value, number(style: unit; unit: day; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDecade": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} décadas",
-	"unitHour": "{{value, number(style: unit; unit: hour; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLunarYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMillennium": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} milenios",
-	"unitMinute": "{{value, number(style: unit; unit: minute; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitSecond": "{{value, number(style: unit; unit: second; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitWeek": "{{value, number(style: unit; unit: week; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCelsius": "{{value, number(style: unit; unit: celsius; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDelisle": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°De",
-	"unitFahrenheit": "{{value, number(style: unit; unit: fahrenheit; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNewton": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}N",
-	"unitRankine": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°R",
-	"unitReaumur": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Ré",
-	"unitRomer": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Rø",
-	"unitKelvin": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}K",
-	"unitCubicCentimeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} cm³",
-	"unitCubicFoot": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} ft³",
-	"unitCubicInch": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} in³",
-	"unitCubicMeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} m³",
-	"unitCubicYard": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} yd³",
-	"unitLiter": "{{value, number(style: unit; unit: liter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitUsGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitImperialGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"volumeName": "volumen",
-	"volumeDescription": "Convierte una unidad de volumen a otra",
-	"volumeCubicCentimeter": "Centímetro Cúbico",
-	"volumeCubicFoot": "Pie Cúbico",
-	"volumeCubicInch": "Pulgada Cúbica",
-	"volumeCubicMeter": "Metro Cúbico",
-	"volumeCubicYard": "Yarda Cúbica",
-	"volumeLiter": "Litro",
-	"volumeUsGallon": "Galón de Estados Unidos",
-	"volumeImperialGallon": "Galón Imperial"
+	"unitNotSupported": "La unidad `{{unit}}` no está soportada.",
+	"mismatchingTypes": "La unidad **{{fromUnit}}** no puede ser convertida a **{{toUnit}}**.",
+	"result": "**{{fromValue, number}} {{fromUnitSymbol}}** ({{fromUnitName}}) equivale a **{{toValue, number}} {{toUnitSymbol}}** ({{toUnitName}})."
 }
diff --git a/src/locales/es-ES/units.json b/src/locales/es-ES/units.json
new file mode 100644
index 000000000..5df727873
--- /dev/null
+++ b/src/locales/es-ES/units.json
@@ -0,0 +1,85 @@
+{
+	"astronomicalUnit": "Unidad Astronómica",
+	"feet": "Pie",
+	"inch": "Pulgada",
+	"lightSecond": "Segundo Luz",
+	"lightYear": "Año Luz",
+	"meter": "Metro",
+	"mile": "Milla",
+	"nauticalMile": "Milla Náutica",
+	"yard": "Yarda",
+	"parsec": "Pársec",
+	"electronVolt": "Electronvoltio",
+	"grain": "Grano",
+	"gram": "Gramo",
+	"ounce": "Onza",
+	"pound": "Libra",
+	"quintal": "Quintal",
+	"ton": "Tonelada Imperial",
+	"tonne": "Tonelada",
+	"century": "Siglo",
+	"day": "Día",
+	"hour": "Hora",
+	"minute": "Minuto",
+	"second": "Segundo",
+	"week": "Semana",
+	"year": "Year",
+	"millennium": "Milenio",
+	"celsius": "Celsius",
+	"delisle": "Delisle",
+	"fahrenheit": "Fahrenheit",
+	"gasMark": "Marca de Gas",
+	"kelvin": "Kelvin",
+	"newton": "Newton",
+	"rankine": "Rankine",
+	"reaumur": "Réaumur",
+	"romer": "Rømer",
+	"acre": "Acre",
+	"are": "Área",
+	"barn": "Barnio",
+	"hectare": "Hectárea",
+	"barrel": "Barril",
+	"bushel": "Bushel",
+	"cord": "Cordón",
+	"dram": "Dram",
+	"fluidOunce": "Onza Fluida",
+	"gallonImperial": "Galón (Imperial)",
+	"gallonUS": "Galón (EE.UU.)",
+	"gill": "Gill",
+	"hogshead": "Tonel",
+	"liter": "Litro",
+	"minim": "Minim",
+	"peck": "Peck",
+	"pint": "Pinta",
+	"quart": "Cuarto",
+	"tablespoon": "Cuchara",
+	"teaspoon": "Cucharada",
+	"prefixUnit": "{{prefix}}{{unit, lowerCapital}}",
+	"quetta": "Quetta",
+	"ronna": "Ronna",
+	"yotta": "Yotta",
+	"zetta": "Zetta",
+	"exa": "Exa",
+	"peta": "Peta",
+	"tera": "Tera",
+	"giga": "Giga",
+	"mega": "Mega",
+	"kilo": "Kilo",
+	"hecto": "Hecto",
+	"deca": "Deca",
+	"deci": "Deci",
+	"centi": "Centi",
+	"milli": "Mili",
+	"micro": "Micro",
+	"nano": "Nano",
+	"pico": "Pico",
+	"femto": "Femto",
+	"atto": "Atto",
+	"zepto": "Zepto",
+	"yocto": "Yocto",
+	"ronto": "Ronto",
+	"quecto": "Quecto",
+	"prefixDimension": "{{unit}} {{dimension}}",
+	"square": "Cuadrados",
+	"cubic": "Cúbicos"
+}
diff --git a/src/locales/fi/units.json b/src/locales/fi/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/fi/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/fr/commands/convert.json b/src/locales/fr/commands/convert.json
index 7146f6cb5..1077af859 100644
--- a/src/locales/fr/commands/convert.json
+++ b/src/locales/fr/commands/convert.json
@@ -6,64 +6,5 @@
 	"fromName": "depuis",
 	"fromDescription": "L'unité à convertir à partir de",
 	"toName": "vers",
-	"toDescription": "L'unité à convertir en",
-	"result": "`{{from}}` est égal à `{{to}}`.",
-	"lengthName": "longueur",
-	"lengthDescription": "Convertit une unité de longueur en une autre",
-	"lengthAstronomicalUnit": "Unité astronomique",
-	"lengthFeet": "Pieds",
-	"lengthInch": "Pouce",
-	"lengthKilometer": "Kilomètre",
-	"lengthLightSecond": "Seconde lumière",
-	"lengthLightYear": "Année-lumière",
-	"lengthMeter": "Mètre",
-	"lengthCentimeter": "Centimètre",
-	"lengthMile": "Mile",
-	"lengthNauticalMile": "Mile nautique",
-	"lengthParsec": "Parsec",
-	"massName": "masse",
-	"massDescription": "Convertit une unité de masse vers une autre",
-	"massKilogram": "Kilogramme",
-	"massTonne": "Tonne",
-	"timeName": "temps",
-	"timeDescription": "Convertit une unité de temps vers une autre",
-	"timeCentury": "Siècle",
-	"timeDay": "Jour",
-	"timeDecade": "Décennie",
-	"timeHour": "Heure",
-	"timeLunarYear": "Année lunaire",
-	"timeMillennium": "Millénaire",
-	"timeMinute": "Minute",
-	"timeMonth": "Mois",
-	"timeSecond": "Seconde",
-	"timeTropicalMonth": "Mois tropical",
-	"timeTropicalYear": "Année tropicale",
-	"timeWeek": "Semaine",
-	"temperatureName": "température",
-	"temperatureDescription": "Convertit une unité de température en une autre",
-	"temperatureCelsius": "Celsius",
-	"temperatureFahrenheit": "Fahrenheit",
-	"temperatureNewton": "Newton",
-	"temperatureKelvin": "Kelvin",
-	"unitFeet": "{{value, number(style: unit; unit: foot; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitInch": "{{value, number(style: unit; unit: inch; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilometer": "{{value, number(style: unit; unit: kilometer; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMeter": "{{value, number(style: unit; unit: meter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCentimeter": "{{value, number(style: unit; unit: centimeter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNauticalMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitGram": "{{value, number(style: unit; unit: gram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilogram": "{{value, number(style: unit; unit: kilogram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitOunce": "{{value, number(style: unit; unit: ounce; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDay": "{{value, number(style: unit; unit: day; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitHour": "{{value, number(style: unit; unit: hour; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLunarYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMinute": "{{value, number(style: unit; unit: minute; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitSecond": "{{value, number(style: unit; unit: second; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitWeek": "{{value, number(style: unit; unit: week; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCelsius": "{{value, number(style: unit; unit: celsius; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitFahrenheit": "{{value, number(style: unit; unit: fahrenheit; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}"
+	"toDescription": "L'unité à convertir en"
 }
diff --git a/src/locales/fr/units.json b/src/locales/fr/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/fr/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/hi/commands/convert.json b/src/locales/hi/commands/convert.json
index b94137dae..a89eedf62 100644
--- a/src/locales/hi/commands/convert.json
+++ b/src/locales/hi/commands/convert.json
@@ -6,90 +6,5 @@
 	"fromName": "से",
 	"fromDescription": "से परिवर्तन करने के लिए इकाई",
 	"toName": "को",
-	"toDescription": "परिवर्तित करने के लिए इकाई",
-	"result": "`{{from}}` बराबर है `{{to}}` के|",
-	"lengthName": "लंबाई",
-	"lengthDescription": "लंबाई की एक इकाई को दूसरी इकाई में परिवर्तित करता है",
-	"lengthAstronomicalUnit": "खगोलीय इकाई",
-	"lengthFeet": "फीट",
-	"lengthInch": "इंच",
-	"lengthKilometer": "किलोमीटर",
-	"lengthLightSecond": "प्रकाश सेकंड",
-	"lengthLightYear": "प्रकाश वर्ष",
-	"lengthMeter": "मीटर",
-	"lengthCentimeter": "सेंटीमीटर",
-	"lengthMile": "मील",
-	"lengthNauticalMile": "समुद्री मील",
-	"lengthParsec": "पारसैक",
-	"massName": "द्रव्यमान",
-	"massDescription": "द्रव्यमान की एक इकाई को दूसरी इकाई में परिवर्तित करता है",
-	"massElectronVolt": "इलेक्ट्रॉन वोल्ट",
-	"massGrain": "कण",
-	"massGram": "ग्राम",
-	"massKilogram": "किलोग्राम",
-	"massOunce": "आउंस",
-	"massTon": "टन",
-	"massTonne": "टन",
-	"timeName": "समय",
-	"timeDescription": "समय की एक इकाई को दूसरी इकाई में परिवर्तित करता है",
-	"timeCentury": "सदी",
-	"timeDay": "दिन",
-	"timeDecade": "दशक",
-	"timeHour": "घंटा",
-	"timeLunarYear": "चंद्र वर्ष",
-	"timeMillennium": "सहस्राब्द",
-	"timeMinute": "मिनट",
-	"timeMonth": "महीना",
-	"timeSecond": "सेकंड",
-	"timeTropicalMonth": "उष्णकटिबंधीय महीना",
-	"timeTropicalYear": "उष्णकटिबंधीय वर्ष",
-	"timeWeek": "सप्ताह",
-	"temperatureName": "तापमान",
-	"temperatureDescription": "तापमान की एक इकाई को दूसरे में परिवर्तित करता है",
-	"temperatureCelsius": "सेल्सियस",
-	"temperatureDelisle": "देलिसल",
-	"temperatureFahrenheit": "फेरन्हाइट",
-	"temperatureNewton": "न्यूटन",
-	"temperatureRankine": "रैंकिन",
-	"temperatureReaumur": "रेउमुर",
-	"temperatureRomer": "रोमर",
-	"temperatureKelvin": "केल्विन",
-	"unitAstronomicalUnit": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}AU",
-	"unitFeet": "{{value, number(style: unit; unit: foot; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitInch": "{{value, number(style: unit; unit: inch; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilometer": "{{value, number(style: unit; unit: kilometer; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLightSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} प्रकाश सेकंडस",
-	"unitLightYear": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} प्रकाश-वर्ष",
-	"unitMeter": "{{value, number(style: unit; unit: meter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCentimeter": "{{value, number(style: unit; unit: centimeter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNauticalMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitParsec": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} पारसैकस",
-	"unitElectronVolt": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}eV",
-	"unitGrain": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} कण",
-	"unitGram": "{{value, number(style: unit; unit: gram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilogram": "{{value, number(style: unit; unit: kilogram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitOunce": "{{value, number(style: unit; unit: ounce; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTon": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} टन",
-	"unitTonne": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} मीट्रिक टन",
-	"unitCentury": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} सदियां",
-	"unitDay": "{{value, number(style: unit; unit: day; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDecade": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} दशक",
-	"unitHour": "{{value, number(style: unit; unit: hour; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLunarYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMillennium": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} सहस्राब्दी",
-	"unitMinute": "{{value, number(style: unit; unit: minute; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitSecond": "{{value, number(style: unit; unit: second; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitWeek": "{{value, number(style: unit; unit: week; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCelsius": "{{value, number(style: unit; unit: celsius; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDelisle": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°De",
-	"unitFahrenheit": "{{value, number(style: unit; unit: fahrenheit; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNewton": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}N",
-	"unitRankine": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°R",
-	"unitReaumur": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Ré",
-	"unitRomer": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Rø",
-	"unitKelvin": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}के"
+	"toDescription": "परिवर्तित करने के लिए इकाई"
 }
diff --git a/src/locales/hi/commands/createEmoji.json b/src/locales/hi/commands/createEmoji.json
index 6df5db1ef..ba631b294 100644
--- a/src/locales/hi/commands/createEmoji.json
+++ b/src/locales/hi/commands/createEmoji.json
@@ -11,6 +11,7 @@
 	"duplicated": "आपने इमोजी और फ़ाइल दोनों अपलोड किए हैं, कृपया केवल एक ही भेजें।",
 	"none": "आपने न तो कोई इमोजी अपलोड किया है और न ही कोई फ़ाइल, कृपया उनमें से कोई भेजें।",
 	"invalidName": "नाम 2 और 32 वर्णों के बीच होना चाहिए, और केवल इसमें शामिल होना चाहिए: `0` से `9`, `a` से `z` बड़े अक्षरों के साथ, या `_`।",
+	"invalidDiscordURL": "आपके द्वारा प्रदान किया गया यूआरएल आवश्यक पैटर्न (`https://cdn.discordapp.com/emojis/{emoji_id}.{format}`) से मेल नहीं खाता है। कृपया सुनिश्चित करें कि आप इमोजी के लिए वैध Discord CDN यूआरएल का उपयोग कर रहे हैं।",
 	"notAnImage": "आपके द्वारा अपलोड की गई फ़ाइल छवि नहीं है, इसलिए इसे अपलोड नहीं किया जा सकता।",
 	"failedToDownload": "मैं फ़ाइल डाउनलोड करने में असमर्थ था। यदि आपने कोई इमोजी भेजा है, तो कृपया सुनिश्चित करें कि यह मान्य है।",
 	"uploaded": "मैंने सफलतापूर्वक {{emoji}} अपलोड कर दिया है।",
diff --git a/src/locales/hi/commands/dictionary.json b/src/locales/hi/commands/dictionary.json
index 3dea47566..94e550490 100644
--- a/src/locales/hi/commands/dictionary.json
+++ b/src/locales/hi/commands/dictionary.json
@@ -3,5 +3,14 @@
 	"description": "एक शब्द की परिभाषा प्राप्त करें",
 	"optionsInputName": "इनपुट",
 	"optionsInputDescription": "परिभाषा पाने के लिए शब्द",
+	"contentTitle": "**शब्दकोश:** `{{value}}`",
+	"contentPhonetic": "ध्वन्यात्मक: `{{value}}`",
+	"contentLexicalCategory": "## {{index}}. शाब्दिक प्रकार: `{{value}}`",
+	"contentExample": "उदाहरण: `{{value}}`",
+	"contentDefinition": "### {{index}}. {{subIndex}}. परिभाषा:\n> {{value}}",
+	"fetchAbort": "मैं `{{value}}` की खोज नहीं कर सका क्योंकि Dictionary API ने 2 सेकंड के भीतर जवाब नहीं दिया, कृपया बाद में पुनः प्रयास करें।",
+	"fetchNoResults": "Dictionary API ने `{{value}}` के लिए कोई परिणाम नहीं दिया।",
+	"fetchRateLimited": "मैं `{{value}}` की खोज नहीं कर सका क्योंकि मैंने हाल ही में Dictionary API को बहुत सारे अनुरोध किए हैं। कृपया लगभग एक मिनट में पुन: प्रयास करें।",
+	"fetchServerError": "मैं `{{value}}` की खोज नहीं कर सका क्योंकि Dictionary API का सर्वर उपलब्ध नहीं है। कृपया बाद में पुन: प्रयास करें।",
 	"fetchUnknownError": "अज्ञात त्रुटि के कारण मैं `{{value}}` की खोज नहीं कर सका। कृपया इस बारे में मेरे डेवलपर्स से संपर्क करें।"
 }
diff --git a/src/locales/hi/units.json b/src/locales/hi/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/hi/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/hr/units.json b/src/locales/hr/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/hr/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/hu/units.json b/src/locales/hu/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/hu/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/id/units.json b/src/locales/id/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/id/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/it/units.json b/src/locales/it/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/it/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/ja/units.json b/src/locales/ja/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/ja/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/ko/units.json b/src/locales/ko/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/ko/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/lt/units.json b/src/locales/lt/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/lt/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/nl/commands/convert.json b/src/locales/nl/commands/convert.json
index 79ec678a8..2cb929255 100644
--- a/src/locales/nl/commands/convert.json
+++ b/src/locales/nl/commands/convert.json
@@ -7,133 +7,7 @@
 	"fromDescription": "De eenheid om van te converteren",
 	"toName": "naar",
 	"toDescription": "De eenheid om naar te converteren",
-	"result": "`{{from}}` is gelijk aan `{{to}}`.",
-	"lengthName": "lengte",
-	"lengthDescription": "Converteert één eenheid van lengte om naar een andere",
-	"lengthAstronomicalUnit": "Astronomische eenheid",
-	"lengthFeet": "Voet",
-	"lengthInch": "Inch",
-	"lengthKilometer": "Kilometer",
-	"lengthLightSecond": "Lichtseconde",
-	"lengthLightYear": "Lichtjaar",
-	"lengthMeter": "Meter",
-	"lengthCentimeter": "Centimeter",
-	"lengthMile": "Mijl",
-	"lengthNauticalMile": "Zeemijl",
-	"lengthMachSecond": "Mach Seconden",
-	"lengthParsec": "Parsec",
-	"massName": "massa",
-	"massDescription": "Converteert een eenheid van massa om naar een andere",
-	"massElectronVolt": "Elektronvolt",
-	"massGrain": "Grein",
-	"massGram": "Gram",
-	"massKilogram": "Kilogram",
-	"massOunce": "Ons",
-	"massPound": "Pond",
-	"massTon": "Amerikaanse Ton",
-	"massTonne": "Ton",
-	"timeName": "tijd",
-	"timeDescription": "Zet een eenheid van tijd om naar een ander",
-	"timeCentury": "Eeuw",
-	"timeDay": "Dag",
-	"timeDecade": "Decennium",
-	"timeHour": "Uur",
-	"timeLunarYear": "Maanjaar",
-	"timeMillennium": "Millennium",
-	"timeMinute": "Minuut",
-	"timeMonth": "Maand",
-	"timeSecond": "Seconde",
-	"timeTropicalMonth": "Tropische maand",
-	"timeTropicalYear": "Tropischjaar",
-	"timeWeek": "Week",
-	"timeShortCentury": "c",
-	"timeShortDay": "d",
-	"timeShortDecade": "de",
-	"timeShortHour": "h",
-	"timeShortLunarYear": "jr",
-	"timeShortMillennium": "mill",
-	"timeShortMinute": "min",
-	"timeShortMonth": "m",
-	"timeShortSecond": "s",
-	"timeShortTropicalMonth": "tm",
-	"timeShortTropicalYear": "tjr",
-	"timeShortWeek": "w",
-	"temperatureName": "temperatuur",
-	"temperatureDescription": "Zet een eenheid van tijd om naar een ander",
-	"temperatureCelsius": "Celsius",
-	"temperatureDelisle": "Delisle",
-	"temperatureFahrenheit": "Fahrenheit",
-	"temperatureNewton": "Newton",
-	"temperatureRankine": "Rankine",
-	"temperatureReaumur": "Réaumur",
-	"temperatureRomer": "Rømer",
-	"temperatureKelvin": "Kelvin",
-	"speedName": "snelheid",
-	"speedDescription": "Zet een eenheid van snelheid om naar een ander",
-	"fromLengthName": "van-lengte",
-	"fromLengthDescription": "De eenheid van lengte om van te converteren",
-	"fromTimeName": "van-tijd",
-	"fromTimeDescription": "De eenheid van tijd om van te converteren",
-	"toLengthName": "naar-lengte",
-	"toLengthDescription": "De eenheid van lengte om naar te converteren",
-	"toTimeName": "naar-tijd",
-	"toTimeDescription": "De eenheid van tijd om naar te converteren",
-	"unitAstronomicalUnit": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}AE",
-	"unitFeet": "{{value, number(style: unit; unit: foot; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitInch": "{{value, number(style: unit; unit: inch; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilometer": "{{value, number(style: unit; unit: kilometer; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLightSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} lichtseconden",
-	"unitLightYear": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}lj",
-	"unitMeter": "{{value, number(style: unit; unit: meter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCentimeter": "{{value, number(style: unit; unit: centimeter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNauticalMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMachSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} Ms",
-	"unitParsec": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} parsecs",
-	"unitElectronVolt": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}eV",
-	"unitGrain": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} greinen",
-	"unitGram": "{{value, number(style: unit; unit: gram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilogram": "{{value, number(style: unit; unit: kilogram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitOunce": "{{value, number(style: unit; unit: ounce; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitPound": "{{value, number(style: unit; unit: pound; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTon": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} Amerikaanse tonnen",
-	"unitTonne": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} tonnen",
-	"unitCentury": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} eeuwen",
-	"unitDay": "{{value, number(style: unit; unit: day; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDecade": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} decennia",
-	"unitHour": "{{value, number(style: unit; unit: hour; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLunarYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMillennium": "{{value, number(minimumSignificantDigits: 3; maximumcijfers: 8)}} millennia",
-	"unitMinute": "{{value, number(style: unit; unit: minute; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitSecond": "{{value, number(style: unit; unit: second; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitWeek": "{{value, number(style: unit; unit: week; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCelsius": "{{value, number(style: unit; unit: celsius; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDelisle": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°De",
-	"unitFahrenheit": "{{value, number(style: unit; unit: fahrenheit; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNewton": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}N",
-	"unitRankine": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°R",
-	"unitReaumur": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Ré",
-	"unitRomer": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Rø",
-	"unitKelvin": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}K",
-	"unitCubicCentimeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} cm³",
-	"unitCubicFoot": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} ft³",
-	"unitCubicInch": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} in³",
-	"unitCubicMeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} m³",
-	"unitCubicYard": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} yd³",
-	"unitLiter": "{{value, number(style: unit; unit: liter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitUsGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitImperialGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"volumeName": "volume",
-	"volumeDescription": "Zet de ene eenheid van volume om naar een andere",
-	"volumeCubicCentimeter": "Kubieke centimeter",
-	"volumeCubicFoot": "Kubieke voet",
-	"volumeCubicInch": "Kubieke inch",
-	"volumeCubicMeter": "Kubieke meter",
-	"volumeCubicYard": "Kubieke yard",
-	"volumeLiter": "Liter",
-	"volumeUsGallon": "Amerikaanse gallon",
-	"volumeImperialGallon": "Imperiale gallon"
+	"unitNotSupported": "De eenheid`{{unit}}` wordt niet ondersteund.",
+	"mismatchingTypes": "De eenheid **{{fromUnit}}** kan niet geconverteerd worden naar **{{toUnit}}**.",
+	"result": "**{{fromValue, number}} {{fromUnitSymbol}}** ({{fromUnitName}}) is gelijk aan **{{toValue, number}} {{toUnitSymbol}}** ({{toUnitName}})."
 }
diff --git a/src/locales/nl/units.json b/src/locales/nl/units.json
new file mode 100644
index 000000000..dbd27e938
--- /dev/null
+++ b/src/locales/nl/units.json
@@ -0,0 +1,85 @@
+{
+	"astronomicalUnit": "Astronomische eenheid",
+	"feet": "Voet",
+	"inch": "Inch",
+	"lightSecond": "Lichtseconde",
+	"lightYear": "Lichtjaar",
+	"meter": "Meter",
+	"mile": "Mijl",
+	"nauticalMile": "Zeemijl",
+	"yard": "Yard",
+	"parsec": "Parsec",
+	"electronVolt": "Electronvolt",
+	"grain": "Grein",
+	"gram": "Gram",
+	"ounce": "Ons",
+	"pound": "Pond",
+	"quintal": "Centenaar",
+	"ton": "Amerikaanse Ton",
+	"tonne": "Ton",
+	"century": "Eeuw",
+	"day": "Dag",
+	"hour": "Uur",
+	"minute": "Minuut",
+	"second": "Seconde",
+	"week": "Week",
+	"year": "Jaar",
+	"millennium": "Millennium",
+	"celsius": "Celsius",
+	"delisle": "Delisle",
+	"fahrenheit": "Fahrenheit",
+	"gasMark": "Gas Mark",
+	"kelvin": "Kelvin",
+	"newton": "Newton",
+	"rankine": "Rankine",
+	"reaumur": "Réaumur",
+	"romer": "Rømer",
+	"acre": "Acre",
+	"are": "Hectare",
+	"barn": "Barn",
+	"hectare": "Hectare",
+	"barrel": "Vat",
+	"bushel": "Bushel",
+	"cord": "Cord",
+	"dram": "Dram",
+	"fluidOunce": "Fluid Ounce",
+	"gallonImperial": "Gallon (Brits-Amerikaans)",
+	"gallonUS": "Gallon (Amerikaans)",
+	"gill": "Gill",
+	"hogshead": "Okshoofd",
+	"liter": "Liter",
+	"minim": "Minim",
+	"peck": "Peck",
+	"pint": "Pint",
+	"quart": "Quart",
+	"tablespoon": "Eetlepel",
+	"teaspoon": "Theelepel",
+	"prefixUnit": "{{prefix}}{{unit, lowerCapital}}",
+	"quetta": "Quetta",
+	"ronna": "Ronna",
+	"yotta": "Yotta",
+	"zetta": "Zetta",
+	"exa": "Exa",
+	"peta": "Peta",
+	"tera": "Tera",
+	"giga": "Giga",
+	"mega": "Mega",
+	"kilo": "Kilo",
+	"hecto": "Hecto",
+	"deca": "Deca",
+	"deci": "Deci",
+	"centi": "Centi",
+	"milli": "Milli",
+	"micro": "Micro",
+	"nano": "Nano",
+	"pico": "Pico",
+	"femto": "Femto",
+	"atto": "Atto",
+	"zepto": "Zepto",
+	"yocto": "Yocto",
+	"ronto": "Ronto",
+	"quecto": "Quecto",
+	"prefixDimension": "{{dimension}} {{unit}}",
+	"square": "Vierkante",
+	"cubic": "Kubieke"
+}
diff --git a/src/locales/no/units.json b/src/locales/no/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/no/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/pl/units.json b/src/locales/pl/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/pl/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/pt-BR/units.json b/src/locales/pt-BR/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/pt-BR/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/ro/units.json b/src/locales/ro/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/ro/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/ru/commands/convert.json b/src/locales/ru/commands/convert.json
index c91058839..287a8c9fb 100644
--- a/src/locales/ru/commands/convert.json
+++ b/src/locales/ru/commands/convert.json
@@ -7,121 +7,7 @@
 	"fromDescription": "Исходная единица измерения",
 	"toName": "в",
 	"toDescription": "Целевая единица измерения",
-	"result": "`{{from}}` равно `{{to}}`.",
-	"lengthName": "длина",
-	"lengthDescription": "Преобразует одну единицу измерения длины в другую",
-	"lengthAstronomicalUnit": "Астрономическая единица",
-	"lengthFeet": "Фут",
-	"lengthInch": "Дюйм",
-	"lengthKilometer": "Километр",
-	"lengthLightSecond": "Световая секунда",
-	"lengthLightYear": "Световой год",
-	"lengthMeter": "Метр",
-	"lengthCentimeter": "Сантиметр",
-	"lengthMile": "Миля",
-	"lengthNauticalMile": "Морская миля",
-	"lengthParsec": "Парсек",
-	"massName": "масса",
-	"massDescription": "Преобразует одну единицу измерения массы в другую",
-	"massElectronVolt": "Электронвольт",
-	"massGrain": "Гран",
-	"massGram": "Грамм",
-	"massKilogram": "Килограмм",
-	"massOunce": "Унция",
-	"massPound": "Фунт",
-	"massTon": "Американская тонна",
-	"massTonne": "Тонна",
-	"timeName": "время",
-	"timeDescription": "Преобразует одну единицу измерения времени в другую",
-	"timeCentury": "Век",
-	"timeDay": "День",
-	"timeDecade": "Декада",
-	"timeHour": "Час",
-	"timeLunarYear": "Лунный год",
-	"timeMillennium": "Тысячелетие",
-	"timeMinute": "Минута",
-	"timeMonth": "Месяц",
-	"timeSecond": "Секунда",
-	"timeTropicalMonth": "Тропический месяц",
-	"timeTropicalYear": "Тропический год",
-	"timeWeek": "Неделя",
-	"timeShortCentury": "в",
-	"timeShortDay": "д",
-	"timeShortHour": "ч",
-	"timeShortMinute": "мин",
-	"timeShortMonth": "мес",
-	"timeShortSecond": "с",
-	"timeShortWeek": "нед",
-	"temperatureName": "температура",
-	"temperatureDescription": "Преобразует одну единицу измерения температуры в другую",
-	"temperatureCelsius": "Градус Цельсия",
-	"temperatureDelisle": "Градус Делиля",
-	"temperatureFahrenheit": "Градус Фаренгейта",
-	"temperatureNewton": "Градус Ньютона",
-	"temperatureRankine": "Градус Ранкина",
-	"temperatureReaumur": "Градус Реомюра",
-	"temperatureRomer": "Градус Рёмера",
-	"temperatureKelvin": "Кельвин",
-	"speedName": "скорость",
-	"speedDescription": "Преобразует одну единицу измерения скорости в другую",
-	"fromLengthDescription": "Исходная единица измерения длины",
-	"fromTimeDescription": "Исходная единица измерения времени",
-	"toLengthDescription": "Целевая единица измерения длины",
-	"toTimeDescription": "Целевая единица измерения времени",
-	"unitAstronomicalUnit": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}АЕ",
-	"unitFeet": "{{value, number(style: unit; unit: foot; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitInch": "{{value, number(style: unit; unit: inch; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilometer": "{{value, number(style: unit; unit: kilometer; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLightSecond": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} световых секунд",
-	"unitLightYear": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}l лет",
-	"unitMeter": "{{value, number(style: unit; unit: meter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCentimeter": "{{value, number(style: unit; unit: centimeter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNauticalMile": "{{value, number(style: unit; unit: mile; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitParsec": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} парсеков",
-	"unitElectronVolt": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}эВ",
-	"unitGrain": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} гранов",
-	"unitGram": "{{value, number(style: unit; unit: gram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitKilogram": "{{value, number(style: unit; unit: kilogram; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitOunce": "{{value, number(style: unit; unit: ounce; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitPound": "{{value, number(style: unit; unit: pound; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTon": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} американских тонн",
-	"unitTonne": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} тонн",
-	"unitCentury": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} веков",
-	"unitDay": "{{value, number(style: unit; unit: day; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDecade": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} декад",
-	"unitHour": "{{value, number(style: unit; unit: hour; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitLunarYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMillennium": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} тысячелетий",
-	"unitMinute": "{{value, number(style: unit; unit: minute; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitSecond": "{{value, number(style: unit; unit: second; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalMonth": "{{value, number(style: unit; unit: month; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitTropicalYear": "{{value, number(style: unit; unit: year; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitWeek": "{{value, number(style: unit; unit: week; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitCelsius": "{{value, number(style: unit; unit: celsius; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitDelisle": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°D",
-	"unitFahrenheit": "{{value, number(style: unit; unit: fahrenheit; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitNewton": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}Н",
-	"unitRankine": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Ra",
-	"unitReaumur": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Ré",
-	"unitRomer": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}°Rø",
-	"unitKelvin": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}К",
-	"unitCubicCentimeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} см³",
-	"unitCubicFoot": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} фут³",
-	"unitCubicInch": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} дюйм³",
-	"unitCubicMeter": "{{value, number(minimumSignificantDigits: 3; maximumSignificantDigits: 8)}} м³",
-	"unitLiter": "{{value, number(style: unit; unit: liter; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitUsGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"unitImperialGallon": "{{value, number(style: unit; unit: gallon; minimumSignificantDigits: 3; maximumSignificantDigits: 8)}}",
-	"volumeName": "объём",
-	"volumeDescription": "Преобразует одну единицу измерения объёма в другую",
-	"volumeCubicCentimeter": "Кубический сантиметр",
-	"volumeCubicFoot": "Кубический фут",
-	"volumeCubicInch": "Кубический дюйм",
-	"volumeCubicMeter": "Кубический метр",
-	"volumeCubicYard": "Кубический ярд",
-	"volumeLiter": "Литр",
-	"volumeUsGallon": "Американский галлон",
-	"volumeImperialGallon": "Имперский галлон"
+	"unitNotSupported": "Единица измерения `{{unit}}` не поддерживается.",
+	"mismatchingTypes": "Единица измерения **{{fromUnit}}** не может быть преобразована в **{{toUnit}}**.",
+	"result": "**{{fromValue, number}} {{fromUnitSymbol}}** ({{fromUnitName}}) равно **{{toValue, number}} {{toUnitSymbol}}** ({{toUnitName}})."
 }
diff --git a/src/locales/ru/units.json b/src/locales/ru/units.json
new file mode 100644
index 000000000..363048db8
--- /dev/null
+++ b/src/locales/ru/units.json
@@ -0,0 +1,85 @@
+{
+	"astronomicalUnit": "Астрономическая единица",
+	"feet": "Фут",
+	"inch": "Дюйм",
+	"lightSecond": "Световая секунда",
+	"lightYear": "Световой год",
+	"meter": "Метр",
+	"mile": "Миля",
+	"nauticalMile": "Морская миля",
+	"yard": "Ярд",
+	"parsec": "Парсек",
+	"electronVolt": "Электронвольт",
+	"grain": "Гран",
+	"gram": "Грамм",
+	"ounce": "Унция",
+	"pound": "Фунт",
+	"quintal": "Центнер",
+	"ton": "Американская тонна",
+	"tonne": "Тонна",
+	"century": "Век",
+	"day": "День",
+	"hour": "Час",
+	"minute": "Минута",
+	"second": "Секунда",
+	"week": "Неделя",
+	"year": "Год",
+	"millennium": "Тысячелетие",
+	"celsius": "Градус Цельсия",
+	"delisle": "Градус Делиля",
+	"fahrenheit": "Градус Фаренгейта",
+	"gasMark": "Газовая метка",
+	"kelvin": "Кельвин",
+	"newton": "Ньютон",
+	"rankine": "Градус Ранкина",
+	"reaumur": "Градус Реомюра",
+	"romer": "Градус Рёмера",
+	"acre": "Акр",
+	"are": "Ар",
+	"barn": "Барн",
+	"hectare": "Гектар",
+	"barrel": "Баррель",
+	"bushel": "Бушель",
+	"cord": "Корд",
+	"dram": "Драхма",
+	"fluidOunce": "Жидкая унция",
+	"gallonImperial": "Галлон (имперский)",
+	"gallonUS": "Галлон (американский)",
+	"gill": "Джилл",
+	"hogshead": "Хогсхед",
+	"liter": "Литр",
+	"minim": "Миним",
+	"peck": "Пек",
+	"pint": "Пинта",
+	"quart": "Кварта",
+	"tablespoon": "Столовая ложка",
+	"teaspoon": "Чайная ложка",
+	"prefixUnit": "{{prefix}}{{unit, lowerCapital}}",
+	"quetta": "Кветта",
+	"ronna": "Ронна",
+	"yotta": "Иотта",
+	"zetta": "Зетта",
+	"exa": "Экса",
+	"peta": "Пета",
+	"tera": "Тера",
+	"giga": "Гига",
+	"mega": "Мега",
+	"kilo": "Кило",
+	"hecto": "Гекто",
+	"deca": "Дека",
+	"deci": "Деци",
+	"centi": "Санти",
+	"milli": "Милли",
+	"micro": "Микро",
+	"nano": "Нано",
+	"pico": "Пико",
+	"femto": "Фемто",
+	"atto": "Атто",
+	"zepto": "Зепто",
+	"yocto": "Иокто",
+	"ronto": "Ронто",
+	"quecto": "Квекто",
+	"prefixDimension": "{{dimension}} {{unit}}",
+	"square": "Квадратный",
+	"cubic": "Кубический"
+}
diff --git a/src/locales/sv-SE/units.json b/src/locales/sv-SE/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/sv-SE/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/th/units.json b/src/locales/th/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/th/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/tr/units.json b/src/locales/tr/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/tr/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/uk/units.json b/src/locales/uk/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/uk/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/vi/units.json b/src/locales/vi/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/vi/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/zh-CN/units.json b/src/locales/zh-CN/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/zh-CN/units.json
@@ -0,0 +1 @@
+{}
diff --git a/src/locales/zh-TW/units.json b/src/locales/zh-TW/units.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/locales/zh-TW/units.json
@@ -0,0 +1 @@
+{}