From 045428481a3b6bdd7d7434c7df900646dd85088a Mon Sep 17 00:00:00 2001
From: Damien <damien@frawley.id.au>
Date: Wed, 12 Apr 2023 20:21:48 +1000
Subject: [PATCH] Update languages for new units

---
 commands.py                                   |  19 +-
 .../translations/en/LC_MESSAGES/messages.mo   | Bin 4313 -> 4239 bytes
 .../translations/en/LC_MESSAGES/messages.po   | 380 +++++++++++++-----
 .../translations/zh/LC_MESSAGES/messages.mo   | Bin 4081 -> 4790 bytes
 .../translations/zh/LC_MESSAGES/messages.po   | 380 +++++++++++++-----
 5 files changed, 565 insertions(+), 214 deletions(-)

diff --git a/commands.py b/commands.py
index fcc0a20..8ac28e3 100644
--- a/commands.py
+++ b/commands.py
@@ -2,25 +2,8 @@
 
 import json
 import os
-
 import click
 
-from plugin import (
-    ICON_PATH,
-    PLUGIN_ACTION_KEYWORD,
-    PLUGIN_AUTHOR,
-    PLUGIN_EXECUTE_FILENAME,
-    PLUGIN_ID,
-    PLUGIN_PROGRAM_LANG,
-    PLUGIN_URL,
-    __long_description__,
-    __package_name__,
-    __package_title__,
-    __short_description__,
-    __version__,
-    basedir,
-)
-
 
 @click.group()
 def translate():
@@ -96,4 +79,4 @@ def gen_plugin_info():
 cli = click.CommandCollection(sources=[plugin, translate])
 
 if __name__ == "__main__":
-    cli()
\ No newline at end of file
+    cli()
diff --git a/plugin/translations/en/LC_MESSAGES/messages.mo b/plugin/translations/en/LC_MESSAGES/messages.mo
index 61586549d27577a3a97aa1c16792a33a9285563a..68e1222451c7488d7cac1c967cda1daef251164f 100644
GIT binary patch
literal 4239
zcmeH|ON<mn7{^Nml;I_a3It6d5qa3_%peG}yJUH@S%?V3#zX=(JvFlhJ>5fB&Em3}
zNTPVagTd&*1ofZ?Bt{R!NKAYrXkzq$CLRnyJg6~vK@&YlH2(kHH9NE7(c^A<>sQ~i
zzWS=B`@1=lUK04*kN<`EpL-Lf_TTg=LKGp+0B;BTz?;EAa0$2%TmU``-U7Z3=D^e7
zRPZb~8~hNQ4qgCffR{i#;uj2D_ctfcLUQK60|V`MgOk8}!O7rqkooiAG_V_F-mM`0
z%OLYV2I3JK1LF^abHQP7CU^qmeqI4*f$xI!``F2!f~@}=@K*3L$aSxR^t%SK9&Q>_
zF$LuQXJVlJPLTC1bo#|0^WE>b8f3mcka-3``ak02N1eP6WIpBe2SLU)K<<Ck$<I0Y
zB*=WPg3R{@$bOswS?4*B`~L*QBQ9W||F<ChFN3uI1mY3DV_<*&23h}13_Q<y;2dx{
z$U1r*`yKayT-OKLzZhiP(;(05q_e*UGX8C+Kj-AnocuM&`YwY!zaK%?_a}H8I2Fy{
zI(LE0zXD9_0a;%^$o2Mu%%ef>GX~k$VW%GjZ-jgdeDMY$o&kC9=OLK)WB_FUd~gY<
zLEifpK=$bjh!AlWL}}t9ko9~H;t>}yu+E=BuKx$fd;gb{7r@B;i$L0!fvhhNvhGzN
z^LK;X-xd&|Vi!pN{U9Du#lSokWc-sL`*sXu-(Ci}pEp6C>jxnHzHssdkoA8L^4zX~
zT=yDCzbQz<dZvL~XEw<F&j)G02V_0>Ieiz%d=ELU2bpgGWS&8g{(GGqI9Y?t*KqnK
z$hc9E`#<jFlTJPbGT&*C`Q8ChvUm?<o##P3;!6yy_aaFDA3*wF0r7}mG0@KDus>5V
zu>ScV&vP-zd$kH=9ornsj*o*}Hw4+gqafo>fIP2L&i)q2`1hUuypz9j@+FY<T>*K1
zS3%Y{8A*BX=Ym{kDaib*!L%Nb^_4-cR|A>Hg52j(kbOPo^v6No`{zN?vn{rV)W|y7
zv%VfTBa6xIxS0e>HX}`GlQLFEzSVJ*sl@tWUx)sIP{|;UhE-x<GGe0&jc$TNDmWx7
zanP)*$YycXIFWu3sD@RQGzs0}*eGd_#ImBRRh7WmnKo%-{U}gkbCMv?lcP_GEj}EE
zl(u54id5o<a$~x-Rf*`YH&mjbvT-y{Fk(Q3!#Wb>So%>#R+G4%t|7INc1TI%*Ol0_
zI}OZW#9$nva^VL_HW(40G+kE~iuM%hW<$1?PK7<Y2{TS<B(znftf+=fU6E)pT00ij
zsib4urz6ccExqE{ikcsWIFYeTPKG&~b;P$6v?YE$9gM&+Sv0jpBXkrDrGql!kPhS2
zw>8OBSre#BXGVmYT}ekHGOM%Hb*Kaf=ye$C%(FdpY8OKf7npWPq@xiHjaxCc$5g^D
z$d3JGBK3%>WTO#>n|{&}n~88rCmqpFhQ)A-OWi*1>olh2lpd)wr|043X%jo<*uIm-
zx^|sn%q44v^LOoNNo;4wd@N?fPbw_~=P=-BpoH}g;0M`=@zZQKuv3W*L&W*eXPiq*
zM-S!y+uqW2SUXp6=Jej95LUv`h_ukGLj0b0Ch<XBK(D{z4Q6kUl9a`+d{;iVOEu!e
zdOJ)_SG*0)n(@kUNmi7qCjOC7jr7&(c>i<-aXq*5;j*_eQRz#@+vHnSlEr*+rI&xu
zD->m6ZE00;MIoQh!_nKNhBe<*ZNEI6yuwO^l!~iY6yTWK?i=fs6F)McZ{wtMS=sYn
zC9Fe8RBQS*EUlt3!7D4jPL1r@zP&HhU2#%dm)jXO@#gZj#7W(hWYkDS(_8G8*|c|Q
zBp3C{!m`|s{vDg!jVYijc->iCOs_oBz*1H{VIOFOzK*(OFytpj+1{qDdTZK#+yq{$
z-sUKXD>|x`<eCH8=Cao(-oxI8k&@iNTY|o??JDFZJ_Qq>g7lLx@hND%P$xbG?(@*`
NvhVm*{6C+9e*iHxDQN%z

literal 4313
zcmeH|Ux-vy9LG<anoXOPW)G%xDpFJKv@?q6?5?Q0Ypt%hxT_XXbiH$C_PY1ac+Z)2
zw<t3Z3PHlqUQ7ZZEHIQJDo9_f9*nSuLZZT6^d$>2f{3W^_uex*v)OwuyWBmW^ZT9O
z?{|K`-#K&d4|8W65%_xs{|otlGlrJGg|mbxLS6*U2M57hzzVn+jKBrp5pXtm8q9$o
zfwzL^!MngO!FKR6csqCv#3TO1z<t{gl)Mk5z6<0&JyzZf&ValPoC)p(xzAJJZQuyV
z_y(l^evtdT4B`<-G0^`wcsF<goCAIcvaZj;JHYQj+Fi5quORDaLveS4?I8DE1k!FP
z$b1|SreXz%M|5J~dN0U)`mKHtWV|OVJ&^H2ka5OA+P`4s16Do=GTvdUe;uUX8zAdH
zY328=d=6y13n1ft1+pKPK<0S`Wc@#bc*I{AXg>?d(Y_tz`aF>94}k2?auAQ`#K3dy
z1LuM}LFTdBa?J82koz72*}r2T{Z4^AuXA?&3y}WbTKyF(U$^q#AoFWS(LBGoAoE)S
z&I4D0+-DQW_>Y5WJ|OcO1G(QTAmbbbS?4j3eLZ3IC&4zz?}D%0B*Ynz_rDL$yeH!z
z`*#Rj3?2n}|33lQr%NDQ#E&3S7C(W^=XVf~n2jWv=X?y@|3Q%VewpQ?R$m6W&#09(
z$UL6~ng2eJ`y2pS=c^#&9|IZpZ4i$*je&8_g7p6kWdAOJ?B8XOb^QYJd}l&QyZIpH
z1t9BK2J-w?g50+cq}?FMe71w!=Sh%#@a%d3GM_zGKMpe9e#?U(;~fDR=S`6IZ&~@2
zmEQxo-^W&e4y50wAnU(q<?pO~6=b~YAmjZ3qQtZ)<~aw&K_%`1neRg&?eie*SK9SX
zyS@p;BZe?Ae-Grjh9K|PK9G4Fwmfe64#<5!0NKCuApO1ud0toT`fnip+h9cf9FX$8
zR$c-!zm*`*uLLsxtsw9J(;)XrK*oO&O!EPm-*J#}&wz|`7G$00LH6~6)n5d8|Gxo6
z*JH66RTFDv*ZMH7M+TFjxSn`Q)+3)%uhPbkT;s=4rV{JNTt9Gk1xk8xG^P@bB`tbX
zp#3^HqP$UAj=g%QB9r-5;zYWhr)ox((;zg9W38mw8_Tj^si*|TcB$9b#*I8B`jP~W
zj(qNUvC)OWi1LkiR7EOr1KE@AZB!!q!<tHbs7xG95wzH>f-yf5gGr2ZLz^$ksUoIy
zqcTGe$LXw+#9^9%^tCi2N@_P$V*5}UHG>vA;s9j{*GsZN3lDkwp)yc3r%=~xvXNIR
zY#$=@6s4BXR+KWL64d>&ME}wENw-!d4VyMCVWwzl6~{(Y-5|hmO-8aZma|!le?!5w
z#0}Fy3!I@r#~akbkGzp|P+E-oL7dt)CYdU00(I$3i@;}B(ou_S)vknopaci#{UGo&
z%jVRotq(1%W7;8+j#|`wT$#xlQwdd&E%jw0_3$cZqZWJWZqnkLi7-khE#6kfislqI
zzIog?XmrCUJyN@zo`;>MO>CK?d@D_M?FPl9N!AQ&Z`;w3*v^*uq|bz#lp712V*$Sr
zC5*cZzt&oe-)*yjtx6OO5$8jjDJBgaEtLE3^@gTpwRH!(oZfpR!b~`7ktUjDh+iar
zuDfvoo&K`3BYVA+q%7nM`4zcssum~4*`lj{+1XI9YG*hu$+A+F#N8XHiFMTwFQ>d0
zhq=M6!%k14(l?OP>l#&(#g1apDHNQJ)v{wvsaRZID0Fnd(AlQOe7?q-b{$RurYqo5
zDz3`x23&2N;lzz};F>sT-Bxz}R|;!$18!8UyH#whqDjFSR&Gd*>>3zY7x?)&sjkfp
z26epFoQ-i3>XM9Vsi?b)oidwtFOB5=-Lmj-ZcG1`zGh<z`Hmdkg$5VX8J?(NE2GBE
zBelTwqfY6KxQSM#yKXAZ>ZTowz&qFJi@dmu*I`Mn-sPKI_HM;X+SxEsk{ftSWHG-c
dU&u{=C#Js>_@t!2-0APc^moF3JpSMB#6OZ;M6Cb-

diff --git a/plugin/translations/en/LC_MESSAGES/messages.po b/plugin/translations/en/LC_MESSAGES/messages.po
index e2b0cf6..0e06881 100644
--- a/plugin/translations/en/LC_MESSAGES/messages.po
+++ b/plugin/translations/en/LC_MESSAGES/messages.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version:  1.1.3\n"
+"Project-Id-Version:  2.0.0\n"
 "Report-Msgid-Bugs-To: deefrawley@gmail.com\n"
-"POT-Creation-Date: 2022-11-08 09:22+1100\n"
+"POT-Creation-Date: 2023-04-12 19:52+1000\n"
 "PO-Revision-Date: 2020-12-13 20:26+1100\n"
 "Last-Translator: deefrawley <deefrawley@gmail.com>\n"
 "Language: en\n"
@@ -18,34 +18,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: plugin/ui.py:48 plugin/ui.py:108
+#: plugin/general_converter.py:24 plugin/general_converter.py:92
 msgid "General Converter"
 msgstr "General Converter"
 
-#: plugin/ui.py:49 plugin/ui.py:109
-msgid "<Hotkey> <Amount> <Source unit> <Destination unit>"
+#: plugin/general_converter.py:25
+#, fuzzy
+msgid ""
+"<Hotkey> <Amount> <Source unit - case sensitive> <Destination unit - case"
+" sensitive>"
 msgstr "<Hotkey> <Amount> <Source unit> <Destination unit>"
 
-#: plugin/ui.py:67
+#: plugin/general_converter.py:56
 msgid "Available conversions"
 msgstr "Available conversions"
 
-#: plugin/ui.py:81
+#: plugin/general_converter.py:65 plugin/general_converter.py:173
+msgid "To and from unit is the same"
+msgstr "To and from unit is the same"
+
+#: plugin/general_converter.py:67
 msgid "{}"
 msgstr "{}"
 
-#: plugin/ui.py:82
+#: plugin/general_converter.py:68
 msgid "Choose two different units"
 msgstr "Choose two different units"
 
-#: plugin/ui.py:87 plugin/ui.py:104
+#: plugin/general_converter.py:73
 msgid "Error - {}"
 msgstr "Error - {}"
 
-#: plugin/ui.py:88
+#: plugin/general_converter.py:74
 msgid "Check documentation for accepted units"
 msgstr "Check documentation for accepted units"
 
+#: plugin/general_converter.py:93
+msgid "<Hotkey> <Amount> <Source unit> <Destination unit>"
+msgstr "<Hotkey> <Amount> <Source unit> <Destination unit>"
+
 #: plugin/units.py:20
 msgid "Distance"
 msgstr "Distance"
@@ -59,343 +70,516 @@ msgid "metres"
 msgstr "metres"
 
 #: plugin/units.py:24
+#, fuzzy
+msgid "decimetre"
+msgstr "centimetre"
+
+#: plugin/units.py:24
+#, fuzzy
+msgid "decimetres"
+msgstr "centimetres"
+
+#: plugin/units.py:25
 msgid "millimetre"
 msgstr "millimetre"
 
-#: plugin/units.py:24
+#: plugin/units.py:25
 msgid "millimetres"
 msgstr "millimetres"
 
-#: plugin/units.py:25
+#: plugin/units.py:26
 msgid "centimetre"
 msgstr "centimetre"
 
-#: plugin/units.py:25
+#: plugin/units.py:26
 msgid "centimetres"
 msgstr "centimetres"
 
-#: plugin/units.py:26
+#: plugin/units.py:27
 msgid "kilometre"
 msgstr "kilometre"
 
-#: plugin/units.py:26
+#: plugin/units.py:27
 msgid "kilometres"
 msgstr "kilometres"
 
-#: plugin/units.py:27
+#: plugin/units.py:28
 msgid "inch"
 msgstr "inch"
 
-#: plugin/units.py:27
+#: plugin/units.py:28
 msgid "inches"
 msgstr "inches"
 
-#: plugin/units.py:28
+#: plugin/units.py:29
 msgid "foot"
 msgstr "foot"
 
-#: plugin/units.py:28
+#: plugin/units.py:29
 msgid "feet"
 msgstr "feet"
 
-#: plugin/units.py:29
+#: plugin/units.py:30
 msgid "yard"
 msgstr "yard"
 
-#: plugin/units.py:29
+#: plugin/units.py:30
 msgid "yards"
 msgstr "yards"
 
-#: plugin/units.py:30
+#: plugin/units.py:31
 msgid "mile"
 msgstr "mile"
 
-#: plugin/units.py:30
+#: plugin/units.py:31
 msgid "miles"
 msgstr "miles"
 
-#: plugin/units.py:32
+#: plugin/units.py:33
 msgid "Volume"
 msgstr "Volume"
 
-#: plugin/units.py:37
+#: plugin/units.py:38
 msgid "millilitre"
 msgstr "millilitre"
 
-#: plugin/units.py:37
+#: plugin/units.py:38
 msgid "millilitres"
 msgstr "millilitres"
 
-#: plugin/units.py:39 plugin/units.py:160
+#: plugin/units.py:40 plugin/units.py:218
 msgid "gram"
 msgstr "gram"
 
-#: plugin/units.py:39 plugin/units.py:160
+#: plugin/units.py:40 plugin/units.py:218
 msgid "grams"
 msgstr "grams"
 
-#: plugin/units.py:40
+#: plugin/units.py:41
 msgid "litre"
 msgstr "litre"
 
-#: plugin/units.py:40
+#: plugin/units.py:41
 msgid "litres"
 msgstr "litres"
 
-#: plugin/units.py:41
+#: plugin/units.py:42
+#, fuzzy
+msgid "decalitre"
+msgstr "litre"
+
+#: plugin/units.py:42
+#, fuzzy
+msgid "decalitres"
+msgstr "litres"
+
+#: plugin/units.py:43
 msgid "pint US"
 msgstr "pint US"
 
-#: plugin/units.py:41
+#: plugin/units.py:43
 msgid "pints US"
 msgstr "pints US"
 
-#: plugin/units.py:44
+#: plugin/units.py:46
 msgid "pint Imperial"
 msgstr "pint Imperial"
 
-#: plugin/units.py:45
+#: plugin/units.py:47
 msgid "pints Imperial"
 msgstr "pints Imperial"
 
-#: plugin/units.py:49
+#: plugin/units.py:51
 msgid "quart US"
 msgstr "quart US"
 
-#: plugin/units.py:49
+#: plugin/units.py:51
 msgid "quarts US"
 msgstr "quarts US"
 
-#: plugin/units.py:52
+#: plugin/units.py:54
 msgid "quart Imperial"
 msgstr "quart Imperial"
 
-#: plugin/units.py:53
+#: plugin/units.py:55
 msgid "quarts Imperial"
 msgstr "quarts Imperial"
 
-#: plugin/units.py:59
+#: plugin/units.py:61
 msgid "cup US"
 msgstr "cup US"
 
-#: plugin/units.py:60
+#: plugin/units.py:62
 msgid "cups US"
 msgstr "cups US"
 
-#: plugin/units.py:66
+#: plugin/units.py:68
 msgid "cup Imperial"
 msgstr "cup Imperial"
 
-#: plugin/units.py:67
+#: plugin/units.py:69
 msgid "cups Imperial"
 msgstr "cups Imperial"
 
-#: plugin/units.py:73
+#: plugin/units.py:75
 msgid "tablespoon US"
 msgstr "tablespoon US"
 
-#: plugin/units.py:74
+#: plugin/units.py:76
 msgid "tabelspoons US"
 msgstr "tabelspoons US"
 
-#: plugin/units.py:80
+#: plugin/units.py:82
 msgid "tablespoon Imperial"
 msgstr "tablespoon Imperial"
 
-#: plugin/units.py:81
+#: plugin/units.py:83
 msgid "tabelspoons Imperial"
 msgstr "tabelspoons Imperial"
 
-#: plugin/units.py:87
+#: plugin/units.py:89
 msgid "teaspoon US"
 msgstr "teaspoon US"
 
-#: plugin/units.py:88
+#: plugin/units.py:90
 msgid "teaspoons US"
 msgstr "teaspoons US"
 
-#: plugin/units.py:94
+#: plugin/units.py:96
 msgid "teaspoon Imperial"
 msgstr "teaspoon Imperial"
 
-#: plugin/units.py:95
+#: plugin/units.py:97
 msgid "teaspoons Imperial"
 msgstr "teaspoons Imperial"
 
-#: plugin/units.py:101
+#: plugin/units.py:103
 msgid "gallon US"
 msgstr "gallon US"
 
-#: plugin/units.py:102
+#: plugin/units.py:104
 msgid "gallons US"
 msgstr "gallons US"
 
-#: plugin/units.py:108
+#: plugin/units.py:110
 msgid "gallon Imperial"
 msgstr "gallon Imperial"
 
-#: plugin/units.py:109
+#: plugin/units.py:111
 msgid "gallons Imperial"
 msgstr "gallons Imperial"
 
-#: plugin/units.py:115
+#: plugin/units.py:117
 msgid "fluid ounce US"
 msgstr "fluid ounce US"
 
-#: plugin/units.py:116
+#: plugin/units.py:118
 msgid "fluid ounces US"
 msgstr "fluid ounces US"
 
-#: plugin/units.py:122
+#: plugin/units.py:124
 msgid "fluid ounce Imperial"
 msgstr "fluid ounce Imperial"
 
-#: plugin/units.py:123
+#: plugin/units.py:125
 msgid "fluid ounces Imperial"
 msgstr "fluid ounces Imperial"
 
-#: plugin/units.py:130
+#: plugin/units.py:131
+#, fuzzy
+msgid "cubic decimetre"
+msgstr "centimetre"
+
+#: plugin/units.py:132
+#, fuzzy
+msgid "cubic decimetres"
+msgstr "centimetres"
+
+#: plugin/units.py:138
+#, fuzzy
+msgid "cubic millimetre"
+msgstr "millimetre"
+
+#: plugin/units.py:139
+#, fuzzy
+msgid "cubic millimetres"
+msgstr "millimetres"
+
+#: plugin/units.py:145
+#, fuzzy
+msgid "cubic centimetre"
+msgstr "centimetre"
+
+#: plugin/units.py:146
+#, fuzzy
+msgid "cubic centimetres"
+msgstr "centimetres"
+
+#: plugin/units.py:152
+#, fuzzy
+msgid "cubic metre"
+msgstr "centimetre"
+
+#: plugin/units.py:153
+#, fuzzy
+msgid "cubic metres"
+msgstr "centimetres"
+
+#: plugin/units.py:159
+msgid "cubic inch"
+msgstr ""
+
+#: plugin/units.py:160
+#, fuzzy
+msgid "cubic inches"
+msgstr "inches"
+
+#: plugin/units.py:166 plugin/units.py:167
+msgid "cubic feet"
+msgstr ""
+
+#: plugin/units.py:173
+msgid "bushel UK"
+msgstr ""
+
+#: plugin/units.py:174
+msgid "bushels UK"
+msgstr ""
+
+#: plugin/units.py:180
+msgid "bushel US"
+msgstr ""
+
+#: plugin/units.py:181
+msgid "bushels US"
+msgstr ""
+
+#: plugin/units.py:188
 msgid "square metre"
 msgstr "square metre"
 
-#: plugin/units.py:130
+#: plugin/units.py:188
 msgid "square metres"
 msgstr "square metres"
 
-#: plugin/units.py:131
+#: plugin/units.py:189
 msgid "hectare"
 msgstr "hectare"
 
-#: plugin/units.py:131
+#: plugin/units.py:189
 msgid "hectares"
 msgstr "hectares"
 
-#: plugin/units.py:132
+#: plugin/units.py:190
 msgid "acre"
 msgstr "acre"
 
-#: plugin/units.py:132
+#: plugin/units.py:190
 msgid "acres"
 msgstr "acres"
 
-#: plugin/units.py:135
+#: plugin/units.py:193
 msgid "square centimetre"
 msgstr "square centimetre"
 
-#: plugin/units.py:136
+#: plugin/units.py:194
 msgid "square centimetres"
 msgstr "square centimetres"
 
-#: plugin/units.py:142
+#: plugin/units.py:200
 msgid "square kilometre"
 msgstr "square kilometre"
 
-#: plugin/units.py:143
+#: plugin/units.py:201
 msgid "square kilometres"
 msgstr "square kilometres"
 
-#: plugin/units.py:147
+#: plugin/units.py:205
 msgid "square inch"
 msgstr "square inch"
 
-#: plugin/units.py:147
+#: plugin/units.py:205
 msgid "square inches"
 msgstr "square inches"
 
-#: plugin/units.py:150
+#: plugin/units.py:208
 msgid "square mile"
 msgstr "square mile"
 
-#: plugin/units.py:151
+#: plugin/units.py:209
 msgid "square miles"
 msgstr "square miles"
 
-#: plugin/units.py:155
+#: plugin/units.py:213
 msgid "square foot"
 msgstr "square foot"
 
-#: plugin/units.py:155
+#: plugin/units.py:213
 msgid "square feet"
 msgstr "square feet"
 
-#: plugin/units.py:156
+#: plugin/units.py:214
 msgid "square yard"
 msgstr "square yard"
 
-#: plugin/units.py:156
+#: plugin/units.py:214
 msgid "square yards"
 msgstr "square yards"
 
-#: plugin/units.py:162
+#: plugin/units.py:220
 msgid "kilogram"
 msgstr "kilogram"
 
-#: plugin/units.py:162
+#: plugin/units.py:220
 msgid "kilograms"
 msgstr "kilograms"
 
-#: plugin/units.py:163
+#: plugin/units.py:221
 msgid "pound"
 msgstr "pound"
 
-#: plugin/units.py:163
+#: plugin/units.py:221
 msgid "pounds"
 msgstr "pounds"
 
-#: plugin/units.py:164
+#: plugin/units.py:222
 msgid "ounce"
 msgstr "ounce"
 
-#: plugin/units.py:164
+#: plugin/units.py:222
 msgid "ounces"
 msgstr "ounces"
 
-#: plugin/units.py:165
+#: plugin/units.py:223
 msgid "stone"
 msgstr "stone"
 
-#: plugin/units.py:168
+#: plugin/units.py:226
 msgid "tonne"
 msgstr "tonne"
 
-#: plugin/units.py:169
+#: plugin/units.py:227
 msgid "tonnes"
 msgstr "tonnes"
 
-#: plugin/units.py:175
+#: plugin/units.py:233
 msgid "US ton"
 msgstr "US ton"
 
-#: plugin/units.py:176
+#: plugin/units.py:234
 msgid "US tons"
 msgstr "US tons"
 
-#: plugin/units.py:182
+#: plugin/units.py:240
 msgid "Imperial ton"
 msgstr "Imperial ton"
 
-#: plugin/units.py:183
+#: plugin/units.py:241
 msgid "Imperial tons"
 msgstr "Imperial tons"
 
-#: plugin/units.py:190
+#: plugin/units.py:248
 msgid "Celsius"
 msgstr "Celsius"
 
-#: plugin/units.py:192
+#: plugin/units.py:250
 msgid "Farenheit"
 msgstr "Farenheit"
 
-#: plugin/units.py:193
+#: plugin/units.py:251
 msgid "Kelvin"
 msgstr "Kelvin"
 
-#: plugin/utils.py:82
-msgid "To and from unit is the same"
-msgstr "To and from unit is the same"
+#: plugin/units.py:255
+#, fuzzy
+msgid "kilometres per hour"
+msgstr "kilometres"
+
+#: plugin/units.py:258 plugin/units.py:259
+msgid "metres per second"
+msgstr ""
+
+#: plugin/units.py:265 plugin/units.py:266
+msgid "miles per hour"
+msgstr ""
+
+#: plugin/units.py:272
+msgid "knot"
+msgstr ""
+
+#: plugin/units.py:273
+msgid "knots"
+msgstr ""
+
+#: plugin/units.py:280
+#, fuzzy
+msgid "joule"
+msgstr "ounce"
+
+#: plugin/units.py:280
+#, fuzzy
+msgid "joules"
+msgstr "ounces"
+
+#: plugin/units.py:283
+msgid "calorie"
+msgstr ""
+
+#: plugin/units.py:284
+#, fuzzy
+msgid "calories"
+msgstr "hectares"
+
+#: plugin/units.py:290
+msgid "kilocalorie"
+msgstr ""
+
+#: plugin/units.py:291
+#, fuzzy
+msgid "kilocalories"
+msgstr "kilometres"
+
+#: plugin/units.py:297
+msgid "kilojoule"
+msgstr ""
+
+#: plugin/units.py:298
+#, fuzzy
+msgid "kilojoules"
+msgstr "kilometres"
+
+#: plugin/units.py:304
+msgid "megajoule"
+msgstr ""
+
+#: plugin/units.py:305
+msgid "megajoules"
+msgstr ""
+
+#: plugin/units.py:311
+msgid "gigajoule"
+msgstr ""
+
+#: plugin/units.py:312
+msgid "gigajoules"
+msgstr ""
+
+#: plugin/units.py:318
+msgid "kilowatt hour"
+msgstr ""
+
+#: plugin/units.py:319
+msgid "kilowatt hours"
+msgstr ""
+
+#: plugin/units.py:325
+msgid "British thermal unit"
+msgstr ""
 
-#: plugin/utils.py:110
-msgid "Problem converting {} and {}"
-msgstr "Problem converting {} and {}"
+#: plugin/units.py:326
+msgid "British thermal units"
+msgstr ""
 
+#~ msgid "Problem converting {} and {}"
+#~ msgstr "Problem converting {} and {}"
 
diff --git a/plugin/translations/zh/LC_MESSAGES/messages.mo b/plugin/translations/zh/LC_MESSAGES/messages.mo
index 8365bb6d06b1ecc35f669e0ba612abc200ed6003..b646cd1a19f7920fd37a2de840b5a9f8756bfa31 100644
GIT binary patch
literal 4790
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

delta 1790
zcmYMze`wTo9LMp`bhg{vcIVQSO>31Y>~wi&MJ}TykwylR5N24dJasW|bemF`9!PFM
zn}uJ*8I`*B#|mx8g+f~BA4Mzz|1kea2WqpeDAPauqZagh-Coi0z0c$G{``7>KA-R1
z@%ygdl^>}o-52=0#CHzgnNt=0|Eatsgfw9l&cbFa!{=~5zKD0=Zj9j}tiVsP9KXOB
z_%&AIS**f~$deDhQ7Z8b8)tQ@VIeBf6335VDe-cghAU8sp26w37L{NFYX0k}L~kHZ
z=%Ud4Jvb91tR{aLq@t6Zz&QSZ8hFw1Wz<P-U;-yliK{rS#@&wE&|IV|+>1ORNumA+
zP#aq6_GZ+2Pf7BJHB_|VdelOjQ4_L`w>sXAT5y-!yHWFcQ8&=%c);-xYQ2-F_0FJf
z<U7<x&ttxt$_N#n@H>Sj+(b>7K=n^$yXvn&-B2Cs1W5|L+Xt}*SD-es&Th0hRN|ee
z8|*>N`>34z*E<{XfK#XihEeV39ba*L4Yk1u)H|HQ@wLI*@K&6UO4Ni(uo8<KLTzv(
zYTY+c>vUCc|2k<84Z7OM9evnS62iy0koF|AG;uA3#%Hhr+prGzyS;!)_$9K(@Ga`M
zb=L7!`=|XYPo<UtrEL37tV1PevX7(wkt-dqvTN)*+hRA{cDv2)K&|sOk}|ww^ZQ)s
zw?n9br%)$2ZHMhSJA&Hin7w9i+J9^*??>aN+ZsE2(tN0Q!va*|Mw@o~L-tYognimR
zYoE6-+f6oWx1tX8mhCFa`+wgJAD}icU<ciP#2&Y&?J(*p&)G}%5Bs-`@t4uKS@s@#
zKNkQ0%T!^&lkQk;*Sq~S+lji$osM_g_v``ti9Kph*faKf)H*+6ttuDXaK-)_j~dEW
zMTg5ioU=OD{z_YBOZ}_u*=?CzXKQv-{q`O8E!hnaEsH%C9gWS7F2oAaKzTCyseInN
zw${#ECKSt#uqC6QSQ50hQK#rAbW|*uGA-4ZYFrW>tX!T*FG{5rEq=Iu@zSPrI+;op
zu2;TL66LB7){cF3<Z5sK`2Nqw`}>r5bZ?ImC*sXjqkH;(IaUahMBl`BMJ<VjXm4Wf
h-Q8idw>$iN^0TqSga0x1?y>Rio-j$FcE+KSe*w>W*Ps9Z

diff --git a/plugin/translations/zh/LC_MESSAGES/messages.po b/plugin/translations/zh/LC_MESSAGES/messages.po
index 2510fd2..a7f3aa3 100644
--- a/plugin/translations/zh/LC_MESSAGES/messages.po
+++ b/plugin/translations/zh/LC_MESSAGES/messages.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version:  1.1.3\n"
+"Project-Id-Version: 2.0.0\n"
 "Report-Msgid-Bugs-To: deefrawley@gmail.com\n"
-"POT-Creation-Date: 2022-11-08 09:22+1100\n"
+"POT-Creation-Date: 2023-04-12 19:52+1000\n"
 "PO-Revision-Date: 2021-06-07 15:16+1000\n"
 "Last-Translator: deefrawley <deefrawley@gmail.com>\n"
 "Language: zh\n"
@@ -18,34 +18,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: plugin/ui.py:48 plugin/ui.py:108
+#: plugin/general_converter.py:24 plugin/general_converter.py:92
 msgid "General Converter"
 msgstr "通用单位换算器"
 
-#: plugin/ui.py:49 plugin/ui.py:109
-msgid "<Hotkey> <Amount> <Source unit> <Destination unit>"
+#: plugin/general_converter.py:25
+#, fuzzy
+msgid ""
+"<Hotkey> <Amount> <Source unit - case sensitive> <Destination unit - case"
+" sensitive>"
 msgstr "<热键> <量> <源单元> <目的地单位>"
 
-#: plugin/ui.py:67
+#: plugin/general_converter.py:56
 msgid "Available conversions"
 msgstr "可用转换"
 
-#: plugin/ui.py:81
+#: plugin/general_converter.py:65 plugin/general_converter.py:173
+msgid "To and from unit is the same"
+msgstr "源单元和目标单元相同"
+
+#: plugin/general_converter.py:67
 msgid "{}"
 msgstr ""
 
-#: plugin/ui.py:82
+#: plugin/general_converter.py:68
 msgid "Choose two different units"
 msgstr "选择两个不同的单位"
 
-#: plugin/ui.py:87 plugin/ui.py:104
+#: plugin/general_converter.py:73
 msgid "Error - {}"
 msgstr "错误 - {}"
 
-#: plugin/ui.py:88
+#: plugin/general_converter.py:74
 msgid "Check documentation for accepted units"
 msgstr "检查文档以获取正确的度量单位"
 
+#: plugin/general_converter.py:93
+msgid "<Hotkey> <Amount> <Source unit> <Destination unit>"
+msgstr "<热键> <量> <源单元> <目的地单位>"
+
 #: plugin/units.py:20
 msgid "Distance"
 msgstr "距离"
@@ -59,343 +70,516 @@ msgid "metres"
 msgstr "仪表"
 
 #: plugin/units.py:24
+#, fuzzy
+msgid "decimetre"
+msgstr "厘米"
+
+#: plugin/units.py:24
+#, fuzzy
+msgid "decimetres"
+msgstr "厘米"
+
+#: plugin/units.py:25
 msgid "millimetre"
 msgstr "毫米"
 
-#: plugin/units.py:24
+#: plugin/units.py:25
 msgid "millimetres"
 msgstr "毫米"
 
-#: plugin/units.py:25
+#: plugin/units.py:26
 msgid "centimetre"
 msgstr "厘米"
 
-#: plugin/units.py:25
+#: plugin/units.py:26
 msgid "centimetres"
 msgstr "厘米"
 
-#: plugin/units.py:26
+#: plugin/units.py:27
 msgid "kilometre"
 msgstr "公里"
 
-#: plugin/units.py:26
+#: plugin/units.py:27
 msgid "kilometres"
 msgstr "公里"
 
-#: plugin/units.py:27
+#: plugin/units.py:28
 msgid "inch"
 msgstr "英寸"
 
-#: plugin/units.py:27
+#: plugin/units.py:28
 msgid "inches"
 msgstr "英寸"
 
-#: plugin/units.py:28
+#: plugin/units.py:29
 msgid "foot"
 msgstr "丈"
 
-#: plugin/units.py:28
+#: plugin/units.py:29
 msgid "feet"
 msgstr "丈"
 
-#: plugin/units.py:29
+#: plugin/units.py:30
 msgid "yard"
 msgstr "码尺"
 
-#: plugin/units.py:29
+#: plugin/units.py:30
 msgid "yards"
 msgstr "码尺"
 
-#: plugin/units.py:30
+#: plugin/units.py:31
 msgid "mile"
 msgstr "英里"
 
-#: plugin/units.py:30
+#: plugin/units.py:31
 msgid "miles"
 msgstr "英里"
 
-#: plugin/units.py:32
+#: plugin/units.py:33
 msgid "Volume"
 msgstr "量"
 
-#: plugin/units.py:37
+#: plugin/units.py:38
 msgid "millilitre"
 msgstr "毫升"
 
-#: plugin/units.py:37
+#: plugin/units.py:38
 msgid "millilitres"
 msgstr "毫升"
 
-#: plugin/units.py:39 plugin/units.py:160
+#: plugin/units.py:40 plugin/units.py:218
 msgid "gram"
 msgstr "公克"
 
-#: plugin/units.py:39 plugin/units.py:160
+#: plugin/units.py:40 plugin/units.py:218
 msgid "grams"
 msgstr "公克"
 
-#: plugin/units.py:40
+#: plugin/units.py:41
 msgid "litre"
 msgstr "升"
 
-#: plugin/units.py:40
+#: plugin/units.py:41
 msgid "litres"
 msgstr "升"
 
-#: plugin/units.py:41
+#: plugin/units.py:42
+#, fuzzy
+msgid "decalitre"
+msgstr "升"
+
+#: plugin/units.py:42
+#, fuzzy
+msgid "decalitres"
+msgstr "升"
+
+#: plugin/units.py:43
 msgid "pint US"
 msgstr "品脱 US"
 
-#: plugin/units.py:41
+#: plugin/units.py:43
 msgid "pints US"
 msgstr "品脱 US"
 
-#: plugin/units.py:44
+#: plugin/units.py:46
 msgid "pint Imperial"
 msgstr "英品脱"
 
-#: plugin/units.py:45
+#: plugin/units.py:47
 msgid "pints Imperial"
 msgstr "英品脱"
 
-#: plugin/units.py:49
+#: plugin/units.py:51
 msgid "quart US"
 msgstr "夸脱 US"
 
-#: plugin/units.py:49
+#: plugin/units.py:51
 msgid "quarts US"
 msgstr "夸脱 US"
 
-#: plugin/units.py:52
+#: plugin/units.py:54
 msgid "quart Imperial"
 msgstr "英夸脱"
 
-#: plugin/units.py:53
+#: plugin/units.py:55
 msgid "quarts Imperial"
 msgstr "英夸脱"
 
-#: plugin/units.py:59
+#: plugin/units.py:61
 msgid "cup US"
 msgstr "杯 US"
 
-#: plugin/units.py:60
+#: plugin/units.py:62
 msgid "cups US"
 msgstr "杯 US"
 
-#: plugin/units.py:66
+#: plugin/units.py:68
 msgid "cup Imperial"
 msgstr "英杯"
 
-#: plugin/units.py:67
+#: plugin/units.py:69
 msgid "cups Imperial"
 msgstr "英杯"
 
-#: plugin/units.py:73
+#: plugin/units.py:75
 msgid "tablespoon US"
 msgstr "汤匙 US"
 
-#: plugin/units.py:74
+#: plugin/units.py:76
 msgid "tabelspoons US"
 msgstr "汤匙 US"
 
-#: plugin/units.py:80
+#: plugin/units.py:82
 msgid "tablespoon Imperial"
 msgstr "英汤匙"
 
-#: plugin/units.py:81
+#: plugin/units.py:83
 msgid "tabelspoons Imperial"
 msgstr "英汤匙"
 
-#: plugin/units.py:87
+#: plugin/units.py:89
 msgid "teaspoon US"
 msgstr "茶匙 US"
 
-#: plugin/units.py:88
+#: plugin/units.py:90
 msgid "teaspoons US"
 msgstr "茶匙 US"
 
-#: plugin/units.py:94
+#: plugin/units.py:96
 msgid "teaspoon Imperial"
 msgstr "英茶匙"
 
-#: plugin/units.py:95
+#: plugin/units.py:97
 msgid "teaspoons Imperial"
 msgstr "英茶匙"
 
-#: plugin/units.py:101
+#: plugin/units.py:103
 msgid "gallon US"
 msgstr "加仑 US"
 
-#: plugin/units.py:102
+#: plugin/units.py:104
 msgid "gallons US"
 msgstr "加仑 US"
 
-#: plugin/units.py:108
+#: plugin/units.py:110
 msgid "gallon Imperial"
 msgstr "英加仑"
 
-#: plugin/units.py:109
+#: plugin/units.py:111
 msgid "gallons Imperial"
 msgstr "英加仑"
 
-#: plugin/units.py:115
+#: plugin/units.py:117
 msgid "fluid ounce US"
 msgstr "液盎司 US"
 
-#: plugin/units.py:116
+#: plugin/units.py:118
 msgid "fluid ounces US"
 msgstr "液盎司 US"
 
-#: plugin/units.py:122
+#: plugin/units.py:124
 msgid "fluid ounce Imperial"
 msgstr "英液盎司"
 
-#: plugin/units.py:123
+#: plugin/units.py:125
 msgid "fluid ounces Imperial"
 msgstr "英液盎司"
 
-#: plugin/units.py:130
+#: plugin/units.py:131
+#, fuzzy
+msgid "cubic decimetre"
+msgstr "立方分米"
+
+#: plugin/units.py:132
+#, fuzzy
+msgid "cubic decimetres"
+msgstr "立方分米"
+
+#: plugin/units.py:138
+#, fuzzy
+msgid "cubic millimetre"
+msgstr "立方毫米"
+
+#: plugin/units.py:139
+#, fuzzy
+msgid "cubic millimetres"
+msgstr "立方毫米"
+
+#: plugin/units.py:145
+#, fuzzy
+msgid "cubic centimetre"
+msgstr "立方厘米"
+
+#: plugin/units.py:146
+#, fuzzy
+msgid "cubic centimetres"
+msgstr "立方厘米"
+
+#: plugin/units.py:152
+#, fuzzy
+msgid "cubic metre"
+msgstr "立方米"
+
+#: plugin/units.py:153
+#, fuzzy
+msgid "cubic metres"
+msgstr "立方米"
+
+#: plugin/units.py:159
+msgid "cubic inch"
+msgstr "立方英寸"
+
+#: plugin/units.py:160
+#, fuzzy
+msgid "cubic inches"
+msgstr "英寸"
+
+#: plugin/units.py:166 plugin/units.py:167
+msgid "cubic feet"
+msgstr "立方英尺"
+
+#: plugin/units.py:173
+msgid "bushel UK"
+msgstr "蒲式耳 英国"
+
+#: plugin/units.py:174
+msgid "bushels UK"
+msgstr "蒲式耳 英国"
+
+#: plugin/units.py:180
+msgid "bushel US"
+msgstr "蒲式耳 美国"
+
+#: plugin/units.py:181
+msgid "bushels US"
+msgstr "蒲式耳 美国"
+
+#: plugin/units.py:188
 msgid "square metre"
 msgstr "平方米"
 
-#: plugin/units.py:130
+#: plugin/units.py:188
 msgid "square metres"
 msgstr "平方米"
 
-#: plugin/units.py:131
+#: plugin/units.py:189
 msgid "hectare"
 msgstr "公顷"
 
-#: plugin/units.py:131
+#: plugin/units.py:189
 msgid "hectares"
 msgstr "公顷"
 
-#: plugin/units.py:132
+#: plugin/units.py:190
 msgid "acre"
 msgstr "英亩"
 
-#: plugin/units.py:132
+#: plugin/units.py:190
 msgid "acres"
 msgstr "英亩"
 
-#: plugin/units.py:135
+#: plugin/units.py:193
 msgid "square centimetre"
 msgstr "平方厘米"
 
-#: plugin/units.py:136
+#: plugin/units.py:194
 msgid "square centimetres"
 msgstr "平方厘米"
 
-#: plugin/units.py:142
+#: plugin/units.py:200
 msgid "square kilometre"
 msgstr "平方公里"
 
-#: plugin/units.py:143
+#: plugin/units.py:201
 msgid "square kilometres"
 msgstr "平方公里"
 
-#: plugin/units.py:147
+#: plugin/units.py:205
 msgid "square inch"
 msgstr "平方英寸"
 
-#: plugin/units.py:147
+#: plugin/units.py:205
 msgid "square inches"
 msgstr "平方英寸"
 
-#: plugin/units.py:150
+#: plugin/units.py:208
 msgid "square mile"
 msgstr "平方英里"
 
-#: plugin/units.py:151
+#: plugin/units.py:209
 msgid "square miles"
 msgstr "平方英里"
 
-#: plugin/units.py:155
+#: plugin/units.py:213
 msgid "square foot"
 msgstr "平方英尺"
 
-#: plugin/units.py:155
+#: plugin/units.py:213
 msgid "square feet"
 msgstr "平方英尺"
 
-#: plugin/units.py:156
+#: plugin/units.py:214
 msgid "square yard"
 msgstr "平方码"
 
-#: plugin/units.py:156
+#: plugin/units.py:214
 msgid "square yards"
 msgstr "平方码"
 
-#: plugin/units.py:162
+#: plugin/units.py:220
 msgid "kilogram"
 msgstr "公斤"
 
-#: plugin/units.py:162
+#: plugin/units.py:220
 msgid "kilograms"
 msgstr "公斤"
 
-#: plugin/units.py:163
+#: plugin/units.py:221
 msgid "pound"
 msgstr "磅"
 
-#: plugin/units.py:163
+#: plugin/units.py:221
 msgid "pounds"
 msgstr "磅"
 
-#: plugin/units.py:164
+#: plugin/units.py:222
 msgid "ounce"
 msgstr "盎司"
 
-#: plugin/units.py:164
+#: plugin/units.py:222
 msgid "ounces"
 msgstr "盎司"
 
-#: plugin/units.py:165
+#: plugin/units.py:223
 msgid "stone"
 msgstr "石头"
 
-#: plugin/units.py:168
+#: plugin/units.py:226
 msgid "tonne"
 msgstr "公吨"
 
-#: plugin/units.py:169
+#: plugin/units.py:227
 msgid "tonnes"
 msgstr "公吨"
 
-#: plugin/units.py:175
+#: plugin/units.py:233
 msgid "US ton"
 msgstr "美吨"
 
-#: plugin/units.py:176
+#: plugin/units.py:234
 msgid "US tons"
 msgstr "美吨"
 
-#: plugin/units.py:182
+#: plugin/units.py:240
 msgid "Imperial ton"
 msgstr "英制吨"
 
-#: plugin/units.py:183
+#: plugin/units.py:241
 msgid "Imperial tons"
 msgstr "英制吨"
 
-#: plugin/units.py:190
+#: plugin/units.py:248
 msgid "Celsius"
 msgstr "摄氏"
 
-#: plugin/units.py:192
+#: plugin/units.py:250
 msgid "Farenheit"
 msgstr "华氏度"
 
-#: plugin/units.py:193
+#: plugin/units.py:251
 msgid "Kelvin"
 msgstr "开尔文"
 
-#: plugin/utils.py:82
-msgid "To and from unit is the same"
-msgstr "源单元和目标单元相同"
+#: plugin/units.py:255
+#, fuzzy
+msgid "kilometres per hour"
+msgstr "公里每小时"
+
+#: plugin/units.py:258 plugin/units.py:259
+msgid "metres per second"
+msgstr "米每秒"
+
+#: plugin/units.py:265 plugin/units.py:266
+msgid "miles per hour"
+msgstr "英里每小时"
+
+#: plugin/units.py:272
+msgid "knot"
+msgstr "海里"
+
+#: plugin/units.py:273
+msgid "knots"
+msgstr "海里"
+
+#: plugin/units.py:280
+#, fuzzy
+msgid "joule"
+msgstr "焦耳"
+
+#: plugin/units.py:280
+#, fuzzy
+msgid "joules"
+msgstr "焦耳"
+
+#: plugin/units.py:283
+msgid "calorie"
+msgstr "卡路里"
+
+#: plugin/units.py:284
+#, fuzzy
+msgid "calories"
+msgstr "卡路里"
+
+#: plugin/units.py:290
+msgid "kilocalorie"
+msgstr "大卡"
+
+#: plugin/units.py:291
+#, fuzzy
+msgid "kilocalories"
+msgstr "大卡"
+
+#: plugin/units.py:297
+msgid "kilojoule"
+msgstr ""
+
+#: plugin/units.py:298
+#, fuzzy
+msgid "kilojoules"
+msgstr "千焦耳"
+
+#: plugin/units.py:304
+msgid "megajoule"
+msgstr "兆焦耳"
+
+#: plugin/units.py:305
+msgid "megajoules"
+msgstr "兆焦耳"
+
+#: plugin/units.py:311
+msgid "gigajoule"
+msgstr "千兆焦耳"
+
+#: plugin/units.py:312
+msgid "gigajoules"
+msgstr "千兆焦耳"
+
+#: plugin/units.py:318
+msgid "kilowatt hour"
+msgstr ""
+
+#: plugin/units.py:319
+msgid "kilowatt hours"
+msgstr "千瓦时"
+
+#: plugin/units.py:325
+msgid "British thermal unit"
+msgstr "英国热量单位"
 
-#: plugin/utils.py:110
-msgid "Problem converting {} and {}"
-msgstr "转换问题 {} 和 {}"
+#: plugin/units.py:326
+msgid "British thermal units"
+msgstr "英国热量单位"
 
+#~ msgid "Problem converting {} and {}"
+#~ msgstr "转换问题 {} 和 {}"