diff --git a/overlay.babel b/overlay.babel
index 0a29480f..260e2abf 100644
--- a/overlay.babel
+++ b/overlay.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.0">
+<babeledit_project be_version="2.7.0" version="1.2">
     <!--
 
     BabelEdit project file
@@ -12828,8 +12828,596 @@
             <folder_node>
                 <name>trade</name>
                 <children>
+                    <folder_node>
+                        <name>action</name>
+                        <children>
+                            <concept_node>
+                                <name>finished</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>interested</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>invite</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>item-gone</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>item-highlight</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>resend</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>trade</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>wait</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>whisper</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                        </children>
+                    </folder_node>
+                    <concept_node>
+                        <name>analyzing</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pl-PL</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHS</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHT</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
+                    <concept_node>
+                        <name>empty</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pl-PL</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHS</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHT</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
                     <concept_node>
-                        <name>analyzing</name>
+                        <name>enabled</name>
                         <definition_loaded>false</definition_loaded>
                         <description></description>
                         <comment></comment>
@@ -12882,7 +13470,7 @@
                         </translations>
                     </concept_node>
                     <concept_node>
-                        <name>empty</name>
+                        <name>error</name>
                         <definition_loaded>false</definition_loaded>
                         <description></description>
                         <comment></comment>
@@ -12908,10 +13496,6 @@
                                 <language>ko-KR</language>
                                 <approved>false</approved>
                             </translation>
-                            <translation>
-                                <language>pl-PL</language>
-                                <approved>false</approved>
-                            </translation>
                             <translation>
                                 <language>pt-BR</language>
                                 <approved>false</approved>
@@ -12924,6 +13508,10 @@
                                 <language>th-TH</language>
                                 <approved>false</approved>
                             </translation>
+                            <translation>
+                                <language>pl-PL</language>
+                                <approved>false</approved>
+                            </translation>
                             <translation>
                                 <language>zh-CHS</language>
                                 <approved>false</approved>
@@ -12934,8 +13522,119 @@
                             </translation>
                         </translations>
                     </concept_node>
+                    <folder_node>
+                        <name>errors</name>
+                        <children>
+                            <concept_node>
+                                <name>http</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>rate</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                        </children>
+                    </folder_node>
                     <concept_node>
-                        <name>error</name>
+                        <name>fetching</name>
                         <definition_loaded>false</definition_loaded>
                         <description></description>
                         <comment></comment>
@@ -12962,19 +13661,19 @@
                                 <approved>false</approved>
                             </translation>
                             <translation>
-                                <language>pt-BR</language>
+                                <language>pl-PL</language>
                                 <approved>false</approved>
                             </translation>
                             <translation>
-                                <language>ru-RU</language>
+                                <language>pt-BR</language>
                                 <approved>false</approved>
                             </translation>
                             <translation>
-                                <language>th-TH</language>
+                                <language>ru-RU</language>
                                 <approved>false</approved>
                             </translation>
                             <translation>
-                                <language>pl-PL</language>
+                                <language>th-TH</language>
                                 <approved>false</approved>
                             </translation>
                             <translation>
@@ -12988,10 +13687,10 @@
                         </translations>
                     </concept_node>
                     <folder_node>
-                        <name>errors</name>
+                        <name>message</name>
                         <children>
                             <concept_node>
-                                <name>http</name>
+                                <name>item-gone</name>
                                 <definition_loaded>false</definition_loaded>
                                 <description></description>
                                 <comment></comment>
@@ -13044,7 +13743,113 @@
                                 </translations>
                             </concept_node>
                             <concept_node>
-                                <name>rate</name>
+                                <name>still-interested</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>thanks</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>de-DE</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-ES</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-FR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ko-KR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pl-PL</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>pt-BR</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>ru-RU</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>th-TH</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHS</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>zh-CHT</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>wait</name>
                                 <definition_loaded>false</definition_loaded>
                                 <description></description>
                                 <comment></comment>
@@ -13099,7 +13904,7 @@
                         </children>
                     </folder_node>
                     <concept_node>
-                        <name>fetching</name>
+                        <name>name</name>
                         <definition_loaded>false</definition_loaded>
                         <description></description>
                         <comment></comment>
diff --git a/src/app/core/feature/feature-settings.service.ts b/src/app/core/feature/feature-settings.service.ts
index 2ed094e4..02752e72 100644
--- a/src/app/core/feature/feature-settings.service.ts
+++ b/src/app/core/feature/feature-settings.service.ts
@@ -3,7 +3,7 @@ import { UiLanguage } from '@app/config';
 import { EventEmitter } from '@app/event';
 import { Language } from '@data/poe/schema';
 import { Observable } from 'rxjs';
-import { flatMap } from 'rxjs/operators';
+import { flatMap, tap } from 'rxjs/operators';
 import { FeatureModule } from './feature-module';
 import { FeatureSettings } from './feature-settings';
 import { FeatureSettingsStorageService } from './feature-settings-storage.service';
@@ -32,6 +32,13 @@ export class FeatureSettingsService {
         return this.featureSettingsStorageService.put(settings);
     }
 
+    public update(updateFn: (settings: FeatureSettings) => void): Observable<FeatureSettings> {
+        return this.get().pipe(
+            tap(settings => updateFn(settings)),
+            flatMap(settings => this.put(settings))
+        );
+    }
+
     public init(modules: FeatureModule<FeatureSettings>[]): Observable<FeatureSettings> {
         return this.get().pipe(
             flatMap(settings => {
diff --git a/src/app/layout/window/background-window/background-window.component.ts b/src/app/layout/window/background-window/background-window.component.ts
index 617a8c18..5dfbfb81 100644
--- a/src/app/layout/window/background-window/background-window.component.ts
+++ b/src/app/layout/window/background-window/background-window.component.ts
@@ -12,12 +12,6 @@ import { concat, forkJoin } from 'rxjs';
 import { flatMap } from 'rxjs/operators';
 import { AnnotationWindowService, LauncherWindowService, NotificationWindowService, SettingsWindowService } from '../../service';
 
-const logs = [
-    `2020/06/04 16:17:19 325004765 acf [INFO Client 3172] @To MamaBetra: Hi, I'd like to buy your 34 Orb of Alchemy for my 10 Chaos Orb in Standard.`,
-    `2020/06/04 16:16:57 324981828 acf [INFO Client 3172] @To Ana_Ivanovic: Hi, I would like to buy your Chimeric Vise Fingerless Silk Gloves listed for 1 chaos in Standard (stash tab "mapz"; position: left 3, top 13)`,
-    `2020/06/04 16:16:57 324981828 acf [INFO Client 3172] @To Ana_Ivanovic: Hi, I would like to buy your Chimeric Vise Fingerless Silk Gloves listed for 1 chaos in Standard (stash tab "mapz"; position: left 3, top 13) offer 2c`
-];
-
 @Component({
     selector: 'app-background-window',
     template: '',
@@ -96,15 +90,7 @@ export class BackgroundWindowComponent implements OnInit, OnDestroy {
     private onKeyPressed(event: OnPressedEvent): void {
         switch (event.name) {
             case Hotkey.SettingsToggle:
-                const log = logs.pop();
-                if (log) {
-                    this.modules.forEach(module => {
-                        if (module.onLogLineAdd) {
-                            module.onLogLineAdd(log);
-                        }
-                    });
-                }
-                // this.settingsWindow.toggle().subscribe();
+                this.settingsWindow.toggle().subscribe();
                 break;
             default:
                 for (const module of this.modules) {
diff --git a/src/app/modules/trade/component/trade-message/trade-message.component.html b/src/app/modules/trade/component/trade-message/trade-message.component.html
index f2f52af2..d1853c1d 100644
--- a/src/app/modules/trade/component/trade-message/trade-message.component.html
+++ b/src/app/modules/trade/component/trade-message/trade-message.component.html
@@ -1,4 +1,5 @@
-<div [class]="'message ' + message.direction" (click)="toggle = !toggle">
+<div class="message" [class.incoming]="message.direction === 'incoming'" [class.toggled]="toggle"
+    (click)="toggle = !toggle">
     <div class="content">
         <ng-container [ngSwitch]="message.type">
             <app-trade-message-item *ngSwitchCase="'item'" [message]="message"></app-trade-message-item>
@@ -8,24 +9,31 @@
         </ng-container>
     </div>
     <div class="actions" *ngIf="toggle">
-        <app-trade-message-action action="wait" [visible]="visible" (execute)="onActionExecute($event)">
+        <app-trade-message-action action="wait" [visible]="visible" [title]="' @' + message.name"
+            (execute)="onActionExecute($event)">
         </app-trade-message-action>
-        <app-trade-message-action action="interested" [visible]="visible" (execute)="onActionExecute($event)">
+        <app-trade-message-action action="interested" [visible]="visible" [title]="' @' + message.name"
+            (execute)="onActionExecute($event)">
         </app-trade-message-action>
-        <app-trade-message-action action="resend" [visible]="visible" (execute)="onActionExecute($event)">
+        <app-trade-message-action action="resend" [visible]="visible" [title]="' @' + message.name"
+            (execute)="onActionExecute($event)">
         </app-trade-message-action>
-        <app-trade-message-action action="whisper" [visible]="visible" [title]="message.whispers | tradeWhisperTitle"
+        <app-trade-message-action action="whisper" [visible]="visible" [title]="' @' + message.name + (message.whispers | tradeWhisperTitle)"
             (execute)="onActionExecute($event)">
         </app-trade-message-action>
-        <app-trade-message-action action="invite" [visible]="visible" (execute)="onActionExecute($event)">
+        <app-trade-message-action action="invite" [visible]="visible" [title]="' @' + message.name"
+            (execute)="onActionExecute($event)">
         </app-trade-message-action>
-        <app-trade-message-action action="trade" [visible]="visible" (execute)="onActionExecute($event)">
+        <app-trade-message-action action="trade" [visible]="visible" [title]="' @' + message.name"
+            (execute)="onActionExecute($event)">
         </app-trade-message-action>
         <app-trade-message-action action="item-highlight" [visible]="visible" (execute)="onActionExecute($event)">
         </app-trade-message-action>
-        <app-trade-message-action action="finished" [visible]="visible" (execute)="onActionExecute($event)">
+        <app-trade-message-action action="finished" [visible]="visible" [title]="' @' + message.name"
+            (execute)="onActionExecute($event)">
         </app-trade-message-action>
-        <app-trade-message-action action="item-gone" [visible]="visible" (execute)="onActionExecute($event)">
+        <app-trade-message-action action="item-gone" [visible]="visible" [title]="' @' + message.name"
+            (execute)="onActionExecute($event)">
         </app-trade-message-action>
     </div>
     <div class="dismiss">
diff --git a/src/app/modules/trade/component/trade-message/trade-message.component.scss b/src/app/modules/trade/component/trade-message/trade-message.component.scss
index aa123cec..4ef52c70 100644
--- a/src/app/modules/trade/component/trade-message/trade-message.component.scss
+++ b/src/app/modules/trade/component/trade-message/trade-message.component.scss
@@ -4,7 +4,7 @@
   app-trade-message {
     &:nth-child(even) {
       .message {
-        background: adjust-color($black-transparent, $alpha: 0.25);
+        background: adjust-color($black-transparent, $alpha: -0.2);
       }
     }
 
@@ -26,26 +26,28 @@
 
 .message {
   position: relative;
+  cursor: pointer;
   display: flex;
-  width: 300px;
   flex-direction: column;
-  border-left: 6px solid;
-  background: adjust-color($black-transparent, $alpha: 0.3);
-  cursor: pointer;
   padding: $gutter-half $gutter;
+  width: 300px;
+  background: $black-transparent;
+  border-left: 6px solid;
+  border-color: adjust-color($color: $purple, $alpha: -0.2);
 
   &.incoming {
     border-color: adjust-color($color: $orange, $alpha: -0.2);
   }
 
-  &.outgoing {
-    border-color: adjust-color($color: $purple, $alpha: -0.2);
+  &:hover,
+  &.toggled {
+    background: $black;
   }
 
   .dismiss {
     position: absolute;
     top: -6px;
-    right: -2px;
+    right: -6px;
     display: none;
   }
 
diff --git a/src/app/modules/trade/component/trade-message/trade-message.component.ts b/src/app/modules/trade/component/trade-message/trade-message.component.ts
index f6a26c33..9d311f35 100644
--- a/src/app/modules/trade/component/trade-message/trade-message.component.ts
+++ b/src/app/modules/trade/component/trade-message/trade-message.component.ts
@@ -3,10 +3,11 @@ import { NotificationService } from '@app/notification';
 import { OWGamesEvents } from '@app/odk';
 import { TradeMessageAction, TradeMessageActionState } from '@modules/trade/class';
 import { TradeHighlightWindowService } from '@modules/trade/service';
+import { TradeFeatureSettings } from '@modules/trade/trade-feature-settings';
 import { ChatService } from '@shared/module/poe/chat';
 import { EventInfo } from '@shared/module/poe/poe-event-info';
-import { TradeExchangeMessage, TradeItemMessage, TradeMapMessage, TradeParserType, TradeWhisperDirection } from '@shared/module/poe/trade/chat';
-import { of, throwError } from 'rxjs';
+import { TradeBulkMessage, TradeExchangeMessage, TradeItemMessage, TradeMapMessage, TradeParserType, TradeWhisperDirection } from '@shared/module/poe/trade/chat';
+import { Observable, of, throwError } from 'rxjs';
 import { catchError, flatMap, map } from 'rxjs/operators';
 
 @Component({
@@ -23,6 +24,9 @@ export class TradeMessageComponent implements OnInit {
   @Input()
   public message: TradeExchangeMessage;
 
+  @Input()
+  public settings: TradeFeatureSettings;
+
   @Output()
   public dismiss = new EventEmitter<void>();
 
@@ -37,13 +41,13 @@ export class TradeMessageComponent implements OnInit {
     this.visible[TradeMessageAction.Trade] = true;
     this.visible[TradeMessageAction.Whisper] = true;
     if (this.message.direction === TradeWhisperDirection.Incoming) {
-      this.visible[TradeMessageAction.Wait] = type === TradeParserType.TradeItem;
+      this.visible[TradeMessageAction.Wait] = true;
       this.visible[TradeMessageAction.ItemGone] = true;
-      this.visible[TradeMessageAction.ItemHighlight] = type === TradeParserType.TradeItem || type === TradeParserType.TradeMap;
+      this.visible[TradeMessageAction.ItemHighlight] = type === TradeParserType.TradeItem;
     } else {
       this.visible[TradeMessageAction.Resend] = true;
       this.visible[TradeMessageAction.Finished] = true;
-      this.visible[TradeMessageAction.ItemHighlight] = type === TradeParserType.TradeMap;
+      // this.visible[TradeMessageAction.ItemHighlight] = type === TradeParserType.TradeMap;
     }
   }
 
@@ -59,15 +63,21 @@ export class TradeMessageComponent implements OnInit {
         this.chat.invite(this.message.name);
         break;
       case TradeMessageAction.Wait:
-        this.wait();
+        this.createMessageContext().subscribe(context => {
+          this.chat.whisper(this.message.name, this.settings.tradeMessageWait, context);
+        });
         this.visible[TradeMessageAction.Wait] = false;
         this.visible[TradeMessageAction.Interested] = true;
         break;
       case TradeMessageAction.Interested:
-        this.chat.whisper(this.message.name, 'interested');
+        this.createMessageContext().subscribe(context => {
+          this.chat.whisper(this.message.name, this.settings.tradeMessageStillInterested, context);
+        });
         break;
       case TradeMessageAction.ItemGone:
-        this.chat.whisper(this.message.name, 'item gone');
+        this.createMessageContext().subscribe(context => {
+          this.chat.whisper(this.message.name, this.settings.tradeMessageItemGone, context);
+        });
         this.close();
         break;
       case TradeMessageAction.Resend:
@@ -86,7 +96,9 @@ export class TradeMessageComponent implements OnInit {
         this.chat.whisper(this.message.name);
         break;
       case TradeMessageAction.Finished:
-        this.chat.whisper(this.message.name, 'thanks');
+        this.createMessageContext().subscribe(context => {
+          this.chat.whisper(this.message.name, this.settings.tradeMessageThanks, context);
+        });
         this.kick();
         this.close();
         break;
@@ -151,19 +163,48 @@ export class TradeMessageComponent implements OnInit {
     }
   }
 
-  private wait(): void {
-    OWGamesEvents.getInfo<EventInfo>().pipe(
+  private createMessageContext(): Observable<any> {
+    const context = {
+      zone: 'unknown',
+      itemname: 'unknown',
+      price: 'unknown'
+    };
+
+    switch (this.message.type) {
+      case TradeParserType.TradeItem:
+        {
+          const message = this.message as TradeItemMessage;
+          context.itemname = message.itemName;
+          if (message.price && message.currencyType) {
+            context.price = `${message.price} ${message.currencyType}`;
+          }
+        }
+        break;
+      case TradeParserType.TradeBulk:
+        {
+          const message = this.message as TradeBulkMessage;
+          context.itemname = `${message.count1} × ${message.type1}`;
+          context.price = `${message.count2} × ${message.type2}`;
+        }
+        break;
+      case TradeParserType.TradeMap:
+        {
+          const message = this.message as TradeMapMessage;
+          context.itemname = message.maps1.maps.join(', ');
+          context.price = message.maps2.maps.join(', ');
+        }
+        break;
+    }
+
+    return OWGamesEvents.getInfo<EventInfo>().pipe(
       catchError(() => of(null)),
       map((info: EventInfo) => {
-        const context = { location: 'unknown' };
         if (info?.match_info?.current_zone?.length > 2) {
           const zone = info.match_info.current_zone;
-          context.location = zone.slice(1, zone.length - 1);
+          context.zone = zone.slice(1, zone.length - 1);
         }
         return context;
       })
-    ).subscribe(context => {
-      this.chat.whisper(this.message.name, 'wait @location', context);
-    });
+    );
   }
 }
diff --git a/src/app/modules/trade/component/trade-settings/trade-settings.component.html b/src/app/modules/trade/component/trade-settings/trade-settings.component.html
index 6f46f429..721bd06c 100644
--- a/src/app/modules/trade/component/trade-settings/trade-settings.component.html
+++ b/src/app/modules/trade/component/trade-settings/trade-settings.component.html
@@ -1 +1,38 @@
-<p>trade-settings works!</p>
+<app-card [title]="'trade.name' | translate">
+    <div class="row">
+        <div class="col-12">
+            <mat-slide-toggle [checked]="settings.tradeEnabled" (change)="settings.tradeEnabled = $event.checked"
+                (change)="onChange()">
+                {{'trade.enabled' | translate}}
+            </mat-slide-toggle>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-6">
+            <mat-form-field>
+                <mat-label>{{'trade.message.wait' | translate}}</mat-label>
+                <input matInput [(ngModel)]="settings.tradeMessageWait" (ngModelChange)="onChange()">
+            </mat-form-field>
+        </div>
+        <div class="col-6">
+            <mat-form-field>
+                <mat-label>{{'trade.message.still-interested' | translate}}</mat-label>
+                <input matInput [(ngModel)]="settings.tradeMessageStillInterested" (ngModelChange)="onChange()">
+            </mat-form-field>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-6">
+            <mat-form-field>
+                <mat-label>{{'trade.message.item-gone' | translate}}</mat-label>
+                <input matInput [(ngModel)]="settings.tradeMessageItemGone" (ngModelChange)="onChange()">
+            </mat-form-field>
+        </div>
+        <div class="col-6">
+            <mat-form-field>
+                <mat-label>{{'trade.message.thanks' | translate}}</mat-label>
+                <input matInput [(ngModel)]="settings.tradeMessageThanks" (ngModelChange)="onChange()">
+            </mat-form-field>
+        </div>
+    </div>
+</app-card>
\ No newline at end of file
diff --git a/src/app/modules/trade/component/trade-settings/trade-settings.component.ts b/src/app/modules/trade/component/trade-settings/trade-settings.component.ts
index de4be9a0..848ced75 100644
--- a/src/app/modules/trade/component/trade-settings/trade-settings.component.ts
+++ b/src/app/modules/trade/component/trade-settings/trade-settings.component.ts
@@ -10,4 +10,8 @@ import { TradeFeatureSettings } from '@modules/trade/trade-feature-settings';
 })
 export class TradeSettingsComponent extends FeatureSettingsComponent<TradeFeatureSettings> {
   public load(): void { }
+
+  public onChange(): void {
+    this.save();
+  }
 }
diff --git a/src/app/modules/trade/service/trade-window.service.ts b/src/app/modules/trade/service/trade-window.service.ts
index ffe369c6..38d15364 100644
--- a/src/app/modules/trade/service/trade-window.service.ts
+++ b/src/app/modules/trade/service/trade-window.service.ts
@@ -3,16 +3,145 @@ import { WindowName } from '@app/config';
 import { EventEmitter } from '@app/event';
 import { OWWindow } from '@app/odk';
 import { ProcessStorageService } from '@app/storage';
-import { TradeBulkMessage, TradeExchangeMessage, TradeItemMessage, TradeMapList, TradeMapMessage, TradeParserType, TradeWhisperDirection } from '@shared/module/poe/trade/chat';
+import { TradeExchangeMessage } from '@shared/module/poe/trade/chat';
 import { Observable } from 'rxjs';
+import { TradeFeatureSettings } from '../trade-feature-settings';
 
 const WINDOW_DATA_KEY = 'TRADE_WINDOW_DATA';
 
+// messages: [
+//     {
+//         type: TradeParserType.TradeItem,
+//         direction: TradeWhisperDirection.Incoming,
+//         timeReceived: new Date(),
+//         name: 'Hyve747',
+//         message: 'Hi, I would like to buy your Rusted Sulphite Scarab listed for 2.5 chaos in Delirium (stash tab "C"; position: left 47, top 1) Offer 2c',
+//         league: 'Delirium',
+//         whispers: [{
+//             message: 'Offer 2c',
+//             timeReceived: new Date()
+//         }],
+//         itemName: 'Rusted Sulphite Scarab',
+//         left: 22,
+//         top: 1,
+//         stash: 'C',
+//         currencyType: 'chaos',
+//         price: 2.5
+//     } as TradeItemMessage,
+//     {
+//         type: TradeParserType.TradeItem,
+//         direction: TradeWhisperDirection.Outgoing,
+//         timeReceived: new Date(),
+//         name: 'Hyve747',
+//         message: 'Hi, I would like to buy your Rusted Sulphite Scarab listed for 2.5 chaos in Delirium (stash tab "C"; position: left 47, top 1) Offer 2c',
+//         league: 'Delirium',
+//         whispers: [{
+//             message: 'Offer 2c',
+//             timeReceived: new Date()
+//         }],
+//         itemName: 'Rusted Sulphite Scarab',
+//         left: 22,
+//         top: 1,
+//         stash: 'C',
+//         currencyType: 'chaos',
+//         price: 2.5,
+//     } as TradeItemMessage,
+//     {
+//         type: TradeParserType.TradeBulk,
+//         direction: TradeWhisperDirection.Incoming,
+//         timeReceived: new Date(),
+//         name: 'Hyve747',
+//         message: 'Hi, I\'d like to buy your 1 Rusted Sulphite Scarab for my 2.5 Chaos Orb in Delirium. TEST',
+//         league: 'Delirium',
+//         whispers: [{
+//             message: 'Offer 2c',
+//             timeReceived: new Date()
+//         }],
+//         count1: 1,
+//         type1: 'Rusted Sulphite Scarab',
+//         count2: 2.5,
+//         type2: 'Chaos Orb',
+//     } as TradeBulkMessage,
+//     {
+//         type: TradeParserType.TradeBulk,
+//         direction: TradeWhisperDirection.Outgoing,
+//         timeReceived: new Date(),
+//         name: 'Hyve747',
+//         message: 'Hi, I\'d like to buy your 1 Rusted Sulphite Scarab for my 2.5 Chaos Orb in Delirium. TEST',
+//         league: 'Delirium',
+//         whispers: [{
+//             message: 'Offer 2c',
+//             timeReceived: new Date()
+//         }],
+//         count1: 1,
+//         type1: 'Rusted Sulphite Scarab',
+//         count2: 2.5,
+//         type2: 'Chaos Orb',
+//     } as TradeBulkMessage,
+//     {
+//         type: TradeParserType.TradeMap,
+//         direction: TradeWhisperDirection.Incoming,
+//         timeReceived: new Date(),
+//         name: 'Hyve747',
+//         message: 'I\'d like to exchange my XIV: (Sulphur Vents Map) for your XIV: (Iceberg Map, Glacier Map, Volcano Map, Wharf Map, Laboratory Map, Museum Map, Wasteland Map) in Delirium.',
+//         league: 'Delirium',
+//         whispers: [{
+//             message: 'Offer 2c',
+//             timeReceived: new Date()
+//         }],
+//         maps1: {
+//             tier: 'XIV',
+//             maps: ['Sulphur Vents Map']
+//         } as TradeMapList,
+//         maps2: {
+//             tier: 'XIV',
+//             maps: [
+//                 'Iceberg Map',
+//                 'Glacier Map',
+//                 'Volcano Map',
+//                 'Wharf Map',
+//                 'Laboratory Map',
+//                 'Museum Map',
+//                 'Wasteland Map'
+//             ]
+//         } as TradeMapList,
+//     } as TradeMapMessage,
+//     {
+//         type: TradeParserType.TradeMap,
+//         direction: TradeWhisperDirection.Outgoing,
+//         timeReceived: new Date(),
+//         name: 'Hyve747',
+//         message: 'I\'d like to exchange my XIV: (Sulphur Vents Map) for your XIV: (Iceberg Map, Glacier Map, Volcano Map, Wharf Map, Laboratory Map, Museum Map, Wasteland Map) in Delirium.',
+//         league: 'Delirium',
+//         whispers: [{
+//             message: 'Offer 2c',
+//             timeReceived: new Date()
+//         }],
+//         maps1: {
+//             tier: 'XIV',
+//             maps: ['Sulphur Vents Map']
+//         } as TradeMapList,
+//         maps2: {
+//             tier: 'XIV',
+//             maps: [
+//                 'Iceberg Map',
+//                 'Glacier Map',
+//                 'Volcano Map',
+//                 'Wharf Map',
+//                 'Laboratory Map',
+//                 'Museum Map',
+//                 'Wasteland Map'
+//             ]
+//         } as TradeMapList,
+//     } as TradeMapMessage
+// ],
+
 export interface TradeWindowData {
     // only modified by the background window
     messages: TradeExchangeMessage[];
     // only modified by the trade window
     removed: TradeExchangeMessage[];
+    settings: TradeFeatureSettings;
 }
 
 @Injectable({
@@ -27,137 +156,16 @@ export class TradeWindowService {
 
     public get data$(): EventEmitter<TradeWindowData> {
         return this.storage.get(WINDOW_DATA_KEY, () => new EventEmitter<TradeWindowData>({
-            messages: [
-                {
-                    type: TradeParserType.TradeItem,
-                    direction: TradeWhisperDirection.Incoming,
-                    timeReceived: new Date(),
-                    name: 'Hyve747',
-                    message: 'Hi, I would like to buy your Rusted Sulphite Scarab listed for 2.5 chaos in Delirium (stash tab "C"; position: left 47, top 1) Offer 2c',
-                    league: 'Delirium',
-                    whispers: [{
-                        message: 'Offer 2c',
-                        timeReceived: new Date()
-                    }],
-                    itemName: 'Rusted Sulphite Scarab',
-                    left: 22,
-                    top: 1,
-                    stash: 'C',
-                    currencyType: 'chaos',
-                    price: 2.5
-                } as TradeItemMessage,
-                {
-                    type: TradeParserType.TradeItem,
-                    direction: TradeWhisperDirection.Outgoing,
-                    timeReceived: new Date(),
-                    name: 'Hyve747',
-                    message: 'Hi, I would like to buy your Rusted Sulphite Scarab listed for 2.5 chaos in Delirium (stash tab "C"; position: left 47, top 1) Offer 2c',
-                    league: 'Delirium',
-                    whispers: [{
-                        message: 'Offer 2c',
-                        timeReceived: new Date()
-                    }],
-                    itemName: 'Rusted Sulphite Scarab',
-                    left: 22,
-                    top: 1,
-                    stash: 'C',
-                    currencyType: 'chaos',
-                    price: 2.5,
-                } as TradeItemMessage,
-                {
-                    type: TradeParserType.TradeBulk,
-                    direction: TradeWhisperDirection.Incoming,
-                    timeReceived: new Date(),
-                    name: 'Hyve747',
-                    message: 'Hi, I\'d like to buy your 1 Rusted Sulphite Scarab for my 2.5 Chaos Orb in Delirium. TEST',
-                    league: 'Delirium',
-                    whispers: [{
-                        message: 'Offer 2c',
-                        timeReceived: new Date()
-                    }],
-                    count1: 1,
-                    type1: 'Rusted Sulphite Scarab',
-                    count2: 2.5,
-                    type2: 'Chaos Orb',
-                } as TradeBulkMessage,
-                {
-                    type: TradeParserType.TradeBulk,
-                    direction: TradeWhisperDirection.Outgoing,
-                    timeReceived: new Date(),
-                    name: 'Hyve747',
-                    message: 'Hi, I\'d like to buy your 1 Rusted Sulphite Scarab for my 2.5 Chaos Orb in Delirium. TEST',
-                    league: 'Delirium',
-                    whispers: [{
-                        message: 'Offer 2c',
-                        timeReceived: new Date()
-                    }],
-                    count1: 1,
-                    type1: 'Rusted Sulphite Scarab',
-                    count2: 2.5,
-                    type2: 'Chaos Orb',
-                } as TradeBulkMessage,
-                {
-                    type: TradeParserType.TradeMap,
-                    direction: TradeWhisperDirection.Incoming,
-                    timeReceived: new Date(),
-                    name: 'Hyve747',
-                    message: 'I\'d like to exchange my XIV: (Sulphur Vents Map) for your XIV: (Iceberg Map, Glacier Map, Volcano Map, Wharf Map, Laboratory Map, Museum Map, Wasteland Map) in Delirium.',
-                    league: 'Delirium',
-                    whispers: [{
-                        message: 'Offer 2c',
-                        timeReceived: new Date()
-                    }],
-                    maps1: {
-                        tier: 'XIV',
-                        maps: ['Sulphur Vents Map']
-                    } as TradeMapList,
-                    maps2: {
-                        tier: 'XIV',
-                        maps: [
-                            'Iceberg Map',
-                            'Glacier Map',
-                            'Volcano Map',
-                            'Wharf Map',
-                            'Laboratory Map',
-                            'Museum Map',
-                            'Wasteland Map'
-                        ]
-                    } as TradeMapList,
-                } as TradeMapMessage,
-                {
-                    type: TradeParserType.TradeMap,
-                    direction: TradeWhisperDirection.Outgoing,
-                    timeReceived: new Date(),
-                    name: 'Hyve747',
-                    message: 'I\'d like to exchange my XIV: (Sulphur Vents Map) for your XIV: (Iceberg Map, Glacier Map, Volcano Map, Wharf Map, Laboratory Map, Museum Map, Wasteland Map) in Delirium.',
-                    league: 'Delirium',
-                    whispers: [{
-                        message: 'Offer 2c',
-                        timeReceived: new Date()
-                    }],
-                    maps1: {
-                        tier: 'XIV',
-                        maps: ['Sulphur Vents Map']
-                    } as TradeMapList,
-                    maps2: {
-                        tier: 'XIV',
-                        maps: [
-                            'Iceberg Map',
-                            'Glacier Map',
-                            'Volcano Map',
-                            'Wharf Map',
-                            'Laboratory Map',
-                            'Museum Map',
-                            'Wasteland Map'
-                        ]
-                    } as TradeMapList,
-                } as TradeMapMessage
-            ],
-            removed: []
+            messages: [],
+            removed: [],
+            settings: undefined
         }));
     }
 
-    public restore(): Observable<void> {
+    public restore(settings: TradeFeatureSettings): Observable<void> {
+        const data = this.data$.get();
+        data.settings = settings;
+        this.data$.next(data);
         return this.window.restore();
     }
 
diff --git a/src/app/modules/trade/service/trade.service.ts b/src/app/modules/trade/service/trade.service.ts
index cd32b7da..b0bee289 100644
--- a/src/app/modules/trade/service/trade.service.ts
+++ b/src/app/modules/trade/service/trade.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { TradeChatParserService, TradeExchangeMessage, TradeMessage, TradeParserType, TradePlayerJoinedArea } from '@shared/module/poe/trade/chat';
-import { Observable } from 'rxjs';
 import { TradeWindowData, TradeWindowService } from './trade-window.service';
 
 @Injectable({
@@ -12,7 +11,7 @@ export class TradeService {
         private readonly window: TradeWindowService,
         private readonly parser: TradeChatParserService) { }
 
-    public onLogLineAdd(line: string): Observable<void> {
+    public onLogLineAdd(line: string): void {
         const data = this.window.data$.get();
         if (this.processRemoved(data)) {
             this.window.data$.next(data);
@@ -43,11 +42,11 @@ export class TradeService {
             case TradeParserType.Ignored:
                 break;
         }
+    }
 
-        if (data.messages.length) {
-            return this.window.restore();
-        }
-        return this.window.close();
+    public clear(): void {
+        const data = this.window.data$.get();
+        data.messages = [];
     }
 
     private processMessage(newMessage: TradeExchangeMessage, messages: TradeExchangeMessage[]): boolean {
diff --git a/src/app/modules/trade/trade-feature-settings.ts b/src/app/modules/trade/trade-feature-settings.ts
index bb6f220f..81106306 100644
--- a/src/app/modules/trade/trade-feature-settings.ts
+++ b/src/app/modules/trade/trade-feature-settings.ts
@@ -1,5 +1,13 @@
 import { FeatureSettings } from '@app/feature';
 
 export interface TradeFeatureSettings extends FeatureSettings {
-    todo?: boolean;
+    tradeEnabled: boolean;
+    tradeMessageWait: string;
+    tradeMessageStillInterested: string;
+    tradeMessageItemGone: string;
+    tradeMessageThanks: string;
+    tradeWindowPinned: boolean;
+    tradeStashFactor: {
+        [key: string]: number
+    };
 }
diff --git a/src/app/modules/trade/trade.module.ts b/src/app/modules/trade/trade.module.ts
index 5390f245..defefaf5 100644
--- a/src/app/modules/trade/trade.module.ts
+++ b/src/app/modules/trade/trade.module.ts
@@ -1,8 +1,9 @@
 import { NgModule } from '@angular/core';
 import { Feature, FeatureConfig, FeatureModule, FEATURE_MODULES } from '@app/feature';
+import { RunningGameInfo } from '@app/odk';
 import { SharedModule } from '@shared/shared.module';
 import { TradeMessageActionComponent, TradeMessageBulkComponent, TradeMessageComponent, TradeMessageDirectionComponent, TradeMessageItemComponent, TradeMessageMapComponent, TradeMessageMapTierComponent, TradeSettingsComponent } from './component';
-import { TradeService } from './service';
+import { TradeService, TradeWindowService } from './service';
 import { TradeFeatureSettings } from './trade-feature-settings';
 import { TradeHighlightWindowComponent, TradeWindowComponent } from './window';
 
@@ -28,13 +29,24 @@ const WINDOWS = [
     imports: [SharedModule]
 })
 export class TradeModule implements FeatureModule<TradeFeatureSettings> {
-    constructor(private readonly trade: TradeService) { }
+    private enabled = false;
+
+    constructor(
+        private readonly trade: TradeService,
+        private readonly window: TradeWindowService) { }
 
     public getConfig(): FeatureConfig<TradeFeatureSettings> {
         const config: FeatureConfig<TradeFeatureSettings> = {
             name: 'trade.name',
             component: TradeSettingsComponent,
             default: {
+                tradeEnabled: true,
+                tradeMessageWait: 'Currently in @zone. Do you want to wait until finished?',
+                tradeMessageStillInterested: 'Do you still want @itemname for @price?',
+                tradeMessageItemGone: 'Sorry, @itemname already sold. Good luck on your search.',
+                tradeMessageThanks: 'Thank you for the trade. Have a nice day and good luck.',
+                tradeStashFactor: {},
+                tradeWindowPinned: false
             }
         };
         return config;
@@ -45,7 +57,32 @@ export class TradeModule implements FeatureModule<TradeFeatureSettings> {
         return features;
     }
 
+    public onSettingsChange(settings: TradeFeatureSettings): void {
+        if (settings.tradeEnabled) {
+            this.window.restore(settings).subscribe();
+        } else {
+            this.window.close().subscribe();
+            this.trade.clear();
+        }
+        this.enabled = settings.tradeEnabled;
+    }
+
+    public onInfo(info: RunningGameInfo, settings: TradeFeatureSettings): void {
+        const { isRunning } = info;
+        if (isRunning) {
+            if (settings.tradeEnabled) {
+                this.window.restore(settings).subscribe();
+            }
+        } else {
+            this.window.close().subscribe();
+            this.trade.clear();
+        }
+        this.enabled = settings.tradeEnabled;
+    }
+
     public onLogLineAdd(line: string): void {
-        this.trade.onLogLineAdd(line).subscribe();
+        if (this.enabled) {
+            this.trade.onLogLineAdd(line);
+        }
     }
 }
diff --git a/src/app/modules/trade/window/trade-highlight-window/trade-highlight-window.component.html b/src/app/modules/trade/window/trade-highlight-window/trade-highlight-window.component.html
index 821ad927..c7af5ead 100644
--- a/src/app/modules/trade/window/trade-highlight-window/trade-highlight-window.component.html
+++ b/src/app/modules/trade/window/trade-highlight-window/trade-highlight-window.component.html
@@ -2,7 +2,7 @@
     <app-header [name]="'PoE Overlay - Trade Highlight - Stash: ' + (data.stash || '-') " [inline]="true"
         [closeable]="false">
         <ng-container ngProjectAs="controlsRight">
-            <mat-icon (click)="onQuadChange()" [title]="'trade.stash-size' | translate">
+            <mat-icon (click)="onFactorChange(data.stash)" [title]="'trade.stash-size' | translate">
                 {{factor === 0.5 ? 'grid_on' : 'border_all'}} </mat-icon>
         </ng-container>
     </app-header>
diff --git a/src/app/modules/trade/window/trade-highlight-window/trade-highlight-window.component.ts b/src/app/modules/trade/window/trade-highlight-window/trade-highlight-window.component.ts
index 19470b89..65e1f672 100644
--- a/src/app/modules/trade/window/trade-highlight-window/trade-highlight-window.component.ts
+++ b/src/app/modules/trade/window/trade-highlight-window/trade-highlight-window.component.ts
@@ -1,8 +1,15 @@
 import { ChangeDetectionStrategy, Component, NgZone, OnDestroy, OnInit } from '@angular/core';
 import { EventSubscription } from '@app/event';
+import { FeatureSettingsService } from '@app/feature/feature-settings.service';
 import { TradeHighlightWindowData, TradeHighlightWindowService } from '@modules/trade/service';
+import { TradeFeatureSettings } from '@modules/trade/trade-feature-settings';
 import { BehaviorSubject } from 'rxjs';
 
+enum TradeStashFactor {
+  Normal = 1,
+  Quad = 0.5
+}
+
 @Component({
   selector: 'app-trade-highlight-window',
   templateUrl: './trade-highlight-window.component.html',
@@ -14,16 +21,17 @@ export class TradeHighlightWindowComponent implements OnInit, OnDestroy {
 
   public data$ = new BehaviorSubject<TradeHighlightWindowData>(null);
 
-  public factor = 1;
+  public factor = TradeStashFactor.Normal;
 
   constructor(
     private readonly window: TradeHighlightWindowService,
+    private readonly settings: FeatureSettingsService,
     private readonly ngZone: NgZone) { }
 
   public ngOnInit(): void {
-    this.data$.next(this.window.data$.get());
+    this.updateData(this.window.data$.get());
     this.subscription = this.window.data$.on(data => this.ngZone.run(() => {
-      this.data$.next(data);
+      this.updateData(data);
     }));
   }
 
@@ -31,7 +39,26 @@ export class TradeHighlightWindowComponent implements OnInit, OnDestroy {
     this.subscription?.unsubscribe();
   }
 
-  public onQuadChange(): void {
-    this.factor = this.factor === 0.5 ? 1 : 0.5;
+  public onFactorChange(stash?: string): void {
+    this.factor = this.factor === TradeStashFactor.Quad
+      ? TradeStashFactor.Normal : TradeStashFactor.Quad;
+    if (stash) {
+      this.settings.update((settings: TradeFeatureSettings) => {
+        settings.tradeStashFactor[stash] = this.factor;
+      }).subscribe();
+    }
+  }
+
+  private updateData(data: TradeHighlightWindowData): void {
+    this.settings.get().subscribe((settings: TradeFeatureSettings) => {
+      const factor = settings.tradeStashFactor[data.stash];
+      if (factor) {
+        this.factor = factor;
+      } else {
+        this.factor = data.left > 13 || data.top > 13
+          ? TradeStashFactor.Quad : TradeStashFactor.Normal;
+      }
+      this.data$.next(data);
+    });
   }
 }
diff --git a/src/app/modules/trade/window/trade-window/trade-window.component.html b/src/app/modules/trade/window/trade-window/trade-window.component.html
index 9192bcb9..0d494192 100644
--- a/src/app/modules/trade/window/trade-window/trade-window.component.html
+++ b/src/app/modules/trade/window/trade-window/trade-window.component.html
@@ -1,7 +1,8 @@
 <div appResize>
     <ng-container *ngIf="data$ | async as data">
         <app-header [name]="'PoE Overlay - Trade (' + (data.messages.length - data.removed.length) + ')'" [width]="300"
-            [closeable]="false" [pinnable]="true">
+            [margin]="10" [closeable]="false" [pinnable]="true" [pinned]="data.settings.tradeWindowPinned"
+            (pinnedChange)="onPinnedChange($event)">
             <ng-container ngProjectAs="controls">
                 <mat-icon (click)="toggle = !toggle" class="indicator" [class.open]="toggle">keyboard_arrow_down
                 </mat-icon>
@@ -9,7 +10,7 @@
             <ng-container *ngIf="toggle">
                 <ng-container *ngFor="let message of data.messages">
                     <app-trade-message *ngIf="!data.removed.includes(message)" [message]="message"
-                        (dismiss)="onDismiss(message)">
+                        [settings]="data.settings" (dismiss)="onDismiss(message)">
                     </app-trade-message>
                 </ng-container>
             </ng-container>
diff --git a/src/app/modules/trade/window/trade-window/trade-window.component.ts b/src/app/modules/trade/window/trade-window/trade-window.component.ts
index 311422c5..3c779af6 100644
--- a/src/app/modules/trade/window/trade-window/trade-window.component.ts
+++ b/src/app/modules/trade/window/trade-window/trade-window.component.ts
@@ -1,6 +1,8 @@
 import { ChangeDetectionStrategy, Component, NgZone, OnDestroy, OnInit } from '@angular/core';
 import { EventSubscription } from '@app/event';
+import { FeatureSettingsService } from '@app/feature/feature-settings.service';
 import { TradeWindowData, TradeWindowService } from '@modules/trade/service';
+import { TradeFeatureSettings } from '@modules/trade/trade-feature-settings';
 import { TradeExchangeMessage } from '@shared/module/poe/trade/chat';
 import { BehaviorSubject } from 'rxjs';
 
@@ -18,7 +20,8 @@ export class TradeWindowComponent implements OnInit, OnDestroy {
 
   constructor(
     private readonly window: TradeWindowService,
-    private readonly ngZone: NgZone) { }
+    private readonly ngZone: NgZone,
+    private readonly settings: FeatureSettingsService) { }
 
   public ngOnInit(): void {
     this.data$.next(this.window.data$.get());
@@ -36,4 +39,10 @@ export class TradeWindowComponent implements OnInit, OnDestroy {
     data.removed.push(message);
     this.window.data$.next(data);
   }
+
+  public onPinnedChange(pinned: boolean): void {
+    this.settings.update((settings: TradeFeatureSettings) =>
+      settings.tradeWindowPinned = pinned
+    ).subscribe();
+  }
 }
diff --git a/src/app/shared/module/odk/component/header/header.component.html b/src/app/shared/module/odk/component/header/header.component.html
index 35ff1c09..9b86af77 100644
--- a/src/app/shared/module/odk/component/header/header.component.html
+++ b/src/app/shared/module/odk/component/header/header.component.html
@@ -1,4 +1,4 @@
-<div class="header" (mousedown)="draggable && onDrag($event)">
+<div class="header" [style.width.px]="width" (mousedown)="draggable && onDrag($event)">
     <div class="controls left">
         <ng-content select="controls"></ng-content>
     </div>
@@ -10,6 +10,6 @@
         <mat-icon (click)="onPinned($event)" class="pin" [class.pinned]="pinned" *ngIf="pinnable">push_pin</mat-icon>
     </div>
 </div>
-<div class="content" [class.inline]="inline" [style.width.px]="width">
+<div class="content" [class.inline]="inline" [style.width.px]="width" [style.margin-right.px]="margin">
     <ng-content></ng-content>
 </div>
\ No newline at end of file
diff --git a/src/app/shared/module/odk/component/header/header.component.ts b/src/app/shared/module/odk/component/header/header.component.ts
index 371506f3..47b355ea 100644
--- a/src/app/shared/module/odk/component/header/header.component.ts
+++ b/src/app/shared/module/odk/component/header/header.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { OWWindow } from '@app/odk';
 import { Observable } from 'rxjs';
 import { map, shareReplay } from 'rxjs/operators';
@@ -13,8 +13,6 @@ export class HeaderComponent implements OnInit {
   private readonly window = new OWWindow();
   private obtained$: Observable<boolean>;
 
-  public pinned = false;
-
   @Input()
   public name: string;
 
@@ -30,9 +28,18 @@ export class HeaderComponent implements OnInit {
   @Input()
   public pinnable = false;
 
+  @Input()
+  public pinned = false;
+
+  @Output()
+  public pinnedChange = new EventEmitter<boolean>();
+
   @Input()
   public width: number;
 
+  @Input()
+  public margin: number;
+
   public ngOnInit(): void {
     this.obtained$ = this.window.assureObtained()
       .pipe(
@@ -59,5 +66,6 @@ export class HeaderComponent implements OnInit {
   public onPinned(event: MouseEvent): void {
     event.preventDefault();
     this.pinned = !this.pinned;
+    this.pinnedChange.next(this.pinned);
   }
 }
diff --git a/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.spec.ts b/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.spec.ts
index 4e810edd..b3597680 100644
--- a/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.spec.ts
+++ b/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.spec.ts
@@ -22,9 +22,11 @@ fdescribe('TradeChatParserService', () => {
     });
 
     const logs = [
+        // tslint:disable:max-line-length
         `2020/06/04 16:17:19 325004765 acf [INFO Client 3172] @To MamaBetra: Hi, I'd like to buy your 34 Orb of Alchemy for my 10 Chaos Orb in Standard.`,
         `2020/06/04 16:16:57 324981828 acf [INFO Client 3172] @To Ana_Ivanovic: Hi, I would like to buy your Chimeric Vise Fingerless Silk Gloves listed for 1 chaos in Standard (stash tab "mapz"; position: left 3, top 13)`,
         `2020/06/04 16:16:57 324981828 acf [INFO Client 3172] @To Ana_Ivanovic: Hi, I would like to buy your Chimeric Vise Fingerless Silk Gloves listed for 1 chaos in Standard (stash tab "mapz"; position: left 3, top 13) offer 2c`
+        // tslint:enable:max-line-length
     ];
 
     logs.forEach(log => {
diff --git a/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.ts b/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.ts
index fcf1705b..d56e39aa 100644
--- a/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.ts
+++ b/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.ts
@@ -70,9 +70,7 @@ export class TradeChatParserService {
                 regexResult = new RegExp(this.regexs.TradeMap.Universal, 'gi').exec(line);
                 if (regexResult) {
                     return this.mapMapMessage(player, direction, regexResult);
-                }
-                else
-                {
+                } else {
                     return this.mapWhisperMessage(player, direction, message);
                 }
             }
@@ -92,7 +90,7 @@ export class TradeChatParserService {
             name: player,
             direction,
             timeReceived: new Date(),
-            message 
+            message
         };
     }
 
diff --git a/src/app/shared/module/poe/window/window.service.ts b/src/app/shared/module/poe/window/window.service.ts
index 2024cf6c..bd9e6807 100644
--- a/src/app/shared/module/poe/window/window.service.ts
+++ b/src/app/shared/module/poe/window/window.service.ts
@@ -2,25 +2,12 @@ import { Injectable } from '@angular/core';
 
 const GAME_HEIGHT_TO_WINDOW_WIDTH_RATIO = 8 / 13;
 
-// 1/1 = 1
-// 2/1 = 2
-// 3/2 = 1.5
-// 5/3 = 1.6666666666666667
-// 8/5 = 1.6
-// 13/8 = 1.625
-// 60/37 = 1.6216216216216217
-// 73/45 = 1.6222222222222222
-// 133/82 = 1.6219512195121952
-// 339/209 = 1.6220095693779903
-// 811/500 = 1.622
-
 @Injectable({
     providedIn: 'root'
 })
 export class WindowService {
     public calculateWidth(gameHeight: number): number {
         const width = Math.ceil(gameHeight * GAME_HEIGHT_TO_WINDOW_WIDTH_RATIO);
-        console.log(width, gameHeight);
         return width;
     }
 }
diff --git a/src/assets/i18n/english.json b/src/assets/i18n/english.json
index 84b97a23..7583e224 100644
--- a/src/assets/i18n/english.json
+++ b/src/assets/i18n/english.json
@@ -377,14 +377,33 @@
 		"zoom": "Zoom"
 	},
 	"trade": {
+		"action": {
+			"finished": "Thanks and Goodbye",
+			"interested": "Still interested?",
+			"invite": "Invite",
+			"item-gone": "Item gone",
+			"item-highlight": "Highlight Item in Stash",
+			"resend": "Resend offer",
+			"trade": "Trade",
+			"wait": "Wait?",
+			"whisper": "Whisper"
+		},
 		"analyzing": "Analyzing data...",
 		"empty": "No results. Open in browser?",
+		"enabled": "Enabled",
 		"error": "An error occured.",
 		"errors": {
 			"http": "Could not communicate with the GGG trade website.\nPlease make sure the website is reachable.",
 			"rate": "Limit reached. Please try again later.\nIf this keeps happening please try lowering the fetched item count. "
 		},
 		"fetching": "Found {{total}}. Fetching {{count}} entries...",
+		"message": {
+			"item-gone": "Item gone message",
+			"still-interested": "Still interested message",
+			"thanks": "Thanks message",
+			"wait": "Wait message"
+		},
+		"name": "Trade",
 		"not-found": "No data found.",
 		"search": "Search",
 		"searching": "Searching...",
diff --git a/src/assets/i18n/french.json b/src/assets/i18n/french.json
index 0a18826f..25072e83 100644
--- a/src/assets/i18n/french.json
+++ b/src/assets/i18n/french.json
@@ -377,14 +377,33 @@
 		"zoom": "Zoom"
 	},
 	"trade": {
+		"action": {
+			"finished": "Merci et au revoir",
+			"interested": "Toujours intéressé?",
+			"invite": "Inviter",
+			"item-gone": "Élément disparu",
+			"item-highlight": "Mettre en surbrillance l'élément dans Stash",
+			"resend": "Renvoyer l'offre",
+			"trade": "commerce",
+			"wait": "Attendre?",
+			"whisper": "Chuchotement"
+		},
 		"analyzing": "Analyse des données ...",
 		"empty": "Aucun résultat. Ouvrir dans le navigateur?",
+		"enabled": "Activée",
 		"error": "Une erreur s'est produite.",
 		"errors": {
 			"http": "Impossible de communiquer avec le site Web commercial GGG.\nVeuillez vous assurer que le site Web est accessible.",
 			"rate": "Limite atteinte. Veuillez réessayer plus tard.\nSi cela continue, essayez de réduire le nombre d'articles récupérés."
 		},
 		"fetching": " {{total}}trouvé. Récupération de {{count}} entrées ...",
+		"message": {
+			"item-gone": "Message d'élément disparu",
+			"still-interested": "Message toujours intéressé",
+			"thanks": "Message de remerciement",
+			"wait": "Message d'attente"
+		},
+		"name": "commerce",
 		"not-found": "Aucune donnée disponible.",
 		"search": "Chercher",
 		"searching": "Recherche...",
diff --git a/src/assets/i18n/german.json b/src/assets/i18n/german.json
index f8d20596..98e05c47 100644
--- a/src/assets/i18n/german.json
+++ b/src/assets/i18n/german.json
@@ -377,14 +377,33 @@
 		"zoom": "Skalierung"
 	},
 	"trade": {
+		"action": {
+			"finished": "Danke und auf Wiedersehen",
+			"interested": "Noch interessiert?",
+			"invite": "Einladen",
+			"item-gone": "Gegenstand weg",
+			"item-highlight": "Markiere das Element in der Truhe",
+			"resend": "Angebot erneut senden",
+			"trade": "Handel",
+			"wait": "Warten?",
+			"whisper": "Flüstern"
+		},
 		"analyzing": "Daten analysieren...",
 		"empty": "Keine Ergebnisse. Im Browser öffnen?",
+		"enabled": "aktiviert",
 		"error": "Es ist ein Fehler aufgetreten.",
 		"errors": {
 			"http": "Konnte nicht mit der GGG-Handelswebsite kommunizieren.\nBitte stellen Sie sicher, dass die Website erreichbar ist.",
 			"rate": "Limit erreicht. Bitte versuchen Sie es später noch einmal.\nWenn dies weiterhin geschieht, versuchen Sie bitte, die Anzahl der abgerufenen Artikel zu verringern."
 		},
 		"fetching": "Gefunden {{total}}. {{count}} Einträge abrufen ...",
+		"message": {
+			"item-gone": "Artikel weg Nachricht",
+			"still-interested": "Immer noch interessierte Nachricht",
+			"thanks": "Danke Nachricht",
+			"wait": "Warte Nachricht"
+		},
+		"name": "Handel",
 		"not-found": "Keine Daten gefunden.",
 		"search": "Suche",
 		"searching": "Suchen...",
diff --git a/src/assets/i18n/korean.json b/src/assets/i18n/korean.json
index 91dd73cd..523c0516 100644
--- a/src/assets/i18n/korean.json
+++ b/src/assets/i18n/korean.json
@@ -377,14 +377,33 @@
 		"zoom": "줌"
 	},
 	"trade": {
+		"action": {
+			"finished": "감사와 안녕",
+			"interested": "여전히 관심이 있습니까?",
+			"invite": "초대",
+			"item-gone": "사라진 항목",
+			"item-highlight": "보관소에서 강조 표시 항목",
+			"resend": "쿠폰 재전송",
+			"trade": "무역",
+			"wait": "기다림?",
+			"whisper": "속삭임"
+		},
 		"analyzing": "데이터 분석 중 ...",
 		"empty": "결과가 없습니다. 브라우저에서 열려?",
+		"enabled": "사용",
 		"error": "오류가 발생했습니다.",
 		"errors": {
 			"http": "GGG 무역 웹 사이트와 통신 할 수 없습니다.\n웹 사이트에 접근 할 수 있는지 확인하십시오.",
 			"rate": "한도에 도달했습니다. 나중에 다시 시도하십시오.\n이 문제가 계속 발생하면 가져온 품목 수를 줄이십시오."
 		},
 		"fetching": " {{total}}을 (를) 찾았습니다. {{count}} 항목을 가져 오는 중 ...",
+		"message": {
+			"item-gone": "사라진 항목 메시지",
+			"still-interested": "여전히 관심있는 메시지",
+			"thanks": "감사 메시지",
+			"wait": "대기 메시지"
+		},
+		"name": "무역",
 		"not-found": "데이터가 없습니다.",
 		"search": "수색",
 		"searching": "수색...",
diff --git a/src/assets/i18n/polish.json b/src/assets/i18n/polish.json
index 9c78cc29..9da50032 100644
--- a/src/assets/i18n/polish.json
+++ b/src/assets/i18n/polish.json
@@ -377,14 +377,33 @@
 		"zoom": "Powiększenie"
 	},
 	"trade": {
+		"action": {
+			"finished": "Dzięki i do widzenia",
+			"interested": "Nadal jesteś zainteresowany?",
+			"invite": "Zapraszam",
+			"item-gone": "Element zniknął",
+			"item-highlight": "Podświetl przedmiot w schowku",
+			"resend": "Wyślij ponownie ofertę",
+			"trade": "Handel",
+			"wait": "Czekać?",
+			"whisper": "Szept"
+		},
 		"analyzing": "Analiza danych ...",
 		"empty": "Brak wyników. Otworzyć w przeglądarce?",
+		"enabled": "Włączone",
 		"error": "Wystąpił błąd.",
 		"errors": {
 			"http": "Nie można nawiązać komunikacji ze stroną aukcyjną GGG.\nUpewnij się, że strona jest dostępna.",
 			"rate": "Limit osiągnięty. Spróbuj ponownie później.\nJeśli problem nadal występuje, spróbuj zmniejszyć liczbę pobieranych ofert sprzedaży."
 		},
 		"fetching": "Znaleziono {{total}}. Pobieranie {{count}} aukcji ...",
+		"message": {
+			"item-gone": "Wiadomość zniknęła z produktu",
+			"still-interested": "Wciąż zainteresowana wiadomość",
+			"thanks": "Dzięki wiadomość",
+			"wait": "Wiadomość oczekująca"
+		},
+		"name": "Handel",
 		"not-found": "Nie znaleziono danych.",
 		"search": "Szukaj",
 		"searching": "Szukam...",
diff --git a/src/assets/i18n/portuguese.json b/src/assets/i18n/portuguese.json
index 18e6c442..acfd0e63 100644
--- a/src/assets/i18n/portuguese.json
+++ b/src/assets/i18n/portuguese.json
@@ -377,14 +377,33 @@
 		"zoom": "Zoom"
 	},
 	"trade": {
+		"action": {
+			"finished": "Obrigado e adeus",
+			"interested": "Ainda interessado?",
+			"invite": "convite",
+			"item-gone": "Item desaparecido",
+			"item-highlight": "Realçar item no esconderijo",
+			"resend": "Reenviar oferta",
+			"trade": "Comércio",
+			"wait": "Esperar?",
+			"whisper": "Sussurro"
+		},
 		"analyzing": "Analisando dados ...",
 		"empty": "Sem resultados. Abra no navegador?",
+		"enabled": "ativado",
 		"error": "Um erro ocorreu.",
 		"errors": {
 			"http": "Não foi possível se comunicar com o site comercial do GGG.\nVerifique se o site está acessível.",
 			"rate": "Limite alcançado. Por favor, tente novamente mais tarde.\nSe isso continuar acontecendo, tente diminuir a contagem de itens buscados."
 		},
 		"fetching": "Encontrado {{total}}. Buscando {{count}} entradas ...",
+		"message": {
+			"item-gone": "Mensagem de item desaparecido",
+			"still-interested": "Mensagem ainda interessada",
+			"thanks": "Obrigado mensagem",
+			"wait": "Mensagem de espera"
+		},
+		"name": "Comércio",
 		"not-found": "Nenhum dado encontrado.",
 		"search": "Procurar",
 		"searching": "Procurando...",
diff --git a/src/assets/i18n/russian.json b/src/assets/i18n/russian.json
index fadccbfb..d03fff6e 100644
--- a/src/assets/i18n/russian.json
+++ b/src/assets/i18n/russian.json
@@ -377,14 +377,33 @@
 		"zoom": "Масштаб"
 	},
 	"trade": {
+		"action": {
+			"finished": "Спасибо и до свидания",
+			"interested": "Все еще заинтересован?",
+			"invite": "приглашение",
+			"item-gone": "Предмет пропал",
+			"item-highlight": "Выделить элемент в тайнике",
+			"resend": "Отправить предложение",
+			"trade": "Сделка",
+			"wait": "Подождите?",
+			"whisper": "шептать"
+		},
 		"analyzing": "Анализ данных...",
 		"empty": "Результатов не найдено. Открыть в браузере?",
+		"enabled": "Включено",
 		"error": "Произошла ошибка.",
 		"errors": {
 			"http": "Не удалось связаться с торговым сайтом GGG.\nПожалуйста, убедитесь, что он доступен.",
 			"rate": "Превышен лимит запросов. Пожалуйста, попробуйте позже.\nЕсли это продолжает происходить, попробуйте уменьшить количество предметов в поисковой выдаче."
 		},
 		"fetching": "Найдено {{total}}. Извлечение {{count}} записей ...",
+		"message": {
+			"item-gone": "Сообщение пропало",
+			"still-interested": "Еще интересное сообщение",
+			"thanks": "Спасибо сообщение",
+			"wait": "Ждать сообщения"
+		},
+		"name": "Сделка",
 		"not-found": "Данные не найдены.",
 		"search": "Поиск",
 		"searching": "Поиск...",
diff --git a/src/assets/i18n/simplified-chinese.json b/src/assets/i18n/simplified-chinese.json
index b6914008..b85ee57e 100644
--- a/src/assets/i18n/simplified-chinese.json
+++ b/src/assets/i18n/simplified-chinese.json
@@ -377,14 +377,33 @@
 		"zoom": "放大"
 	},
 	"trade": {
+		"action": {
+			"finished": "谢谢，再见",
+			"interested": "还感兴趣吗？",
+			"invite": "邀请",
+			"item-gone": "物品不见了",
+			"item-highlight": "高亮显示藏匿物品",
+			"resend": "重新发送报价",
+			"trade": "贸易",
+			"wait": "等待？",
+			"whisper": "耳语"
+		},
 		"analyzing": "正在分析数据...",
 		"empty": "没有结果。在浏览器中打开？",
+		"enabled": "启用",
 		"error": "发生错误。",
 		"errors": {
 			"http": "无法与GGG贸易网站通信。\n请确保该网站可访问。",
 			"rate": "已达到限制。请稍后再试。\n如果这种情况持续发生，请尝试减少获取的物品数。"
 		},
 		"fetching": "找到 {{total}}。正在获取 {{count}} 个条目...",
+		"message": {
+			"item-gone": "物品消失的消息",
+			"still-interested": "仍然感兴趣的消息",
+			"thanks": "谢谢留言",
+			"wait": "等待讯息"
+		},
+		"name": "贸易",
 		"not-found": "没有找到数据。",
 		"search": "搜索",
 		"searching": "搜索...",
diff --git a/src/assets/i18n/spanish.json b/src/assets/i18n/spanish.json
index 52de303f..b41769fd 100644
--- a/src/assets/i18n/spanish.json
+++ b/src/assets/i18n/spanish.json
@@ -377,14 +377,33 @@
 		"zoom": "Enfocar"
 	},
 	"trade": {
+		"action": {
+			"finished": "Gracias y adiós",
+			"interested": "¿Aún interesado?",
+			"invite": "invitación",
+			"item-gone": "Artículo desaparecido",
+			"item-highlight": "Destacar artículo en alijo",
+			"resend": "Reenviar oferta",
+			"trade": "Comercio",
+			"wait": "¿Espere?",
+			"whisper": "Susurro"
+		},
 		"analyzing": "Analizando datos ...",
 		"empty": "No hay resultados. ¿Abierta en el navegador?",
+		"enabled": "Habilitado",
 		"error": "Ocurrió un error.",
 		"errors": {
 			"http": "No se pudo comunicar con el sitio web comercial de GGG.\nAsegúrese de que se pueda acceder al sitio web.",
 			"rate": "Límite alcanzado. Por favor, inténtelo de nuevo más tarde.\nSi esto sigue sucediendo, intente reducir el recuento de elementos recuperados."
 		},
 		"fetching": "Encontrado {{total}}. Obteniendo {{count}} entradas ...",
+		"message": {
+			"item-gone": "Mensaje de artículo desaparecido",
+			"still-interested": "Mensaje aún interesado",
+			"thanks": "Mensaje de agradecimiento",
+			"wait": "Mensaje de espera"
+		},
+		"name": "Comercio",
 		"not-found": "Datos no encontrados.",
 		"search": "Buscar",
 		"searching": "Buscando...",
diff --git a/src/assets/i18n/thai.json b/src/assets/i18n/thai.json
index 035a7b21..56b75b9f 100644
--- a/src/assets/i18n/thai.json
+++ b/src/assets/i18n/thai.json
@@ -377,14 +377,33 @@
 		"zoom": "ซูม"
 	},
 	"trade": {
+		"action": {
+			"finished": "ขอบคุณและลาก่อน",
+			"interested": "ยังสนใจอยู่เหรอ?",
+			"invite": "เชิญ",
+			"item-gone": "รายการหายไป",
+			"item-highlight": "เน้นรายการใน Stash",
+			"resend": "ส่งข้อเสนออีกครั้ง",
+			"trade": "ค่า",
+			"wait": "รอ?",
+			"whisper": "กระซิบ"
+		},
 		"analyzing": "กำลังวิเคราะห์ข้อมูล ...",
 		"empty": "ไม่มีผลลัพธ์. เปิดในเบราว์เซอร์?",
+		"enabled": "เปิดการใช้งาน",
 		"error": "เกิดข้อผิดพลาด.",
 		"errors": {
 			"http": "ไม่สามารถสื่อสารกับเว็บไซต์การค้า GGG\nโปรดตรวจสอบให้แน่ใจว่าสามารถเข้าถึงเว็บไซต์ได้",
 			"rate": "ถึงขีด จำกัด. โปรดลองอีกครั้งในภายหลัง.\nหากสิ่งนี้ยังคงเกิดขึ้นโปรดลองลดจำนวนรายการที่ดึงมา"
 		},
 		"fetching": "พบ {{total}}กำลังดึงรายการ {{count}} ...",
+		"message": {
+			"item-gone": "รายการข้อความหายไป",
+			"still-interested": "ข้อความที่สนใจยังคง",
+			"thanks": "ข้อความขอบคุณ",
+			"wait": "รอข้อความ"
+		},
+		"name": "ค่า",
 		"not-found": "ไม่พบข้อมูล.",
 		"search": "ค้นหา",
 		"searching": "ค้นหา ...",
diff --git a/src/assets/i18n/traditional-chinese.json b/src/assets/i18n/traditional-chinese.json
index da61565d..3d1ff962 100644
--- a/src/assets/i18n/traditional-chinese.json
+++ b/src/assets/i18n/traditional-chinese.json
@@ -377,14 +377,33 @@
 		"zoom": "放大"
 	},
 	"trade": {
+		"action": {
+			"finished": "謝謝，再見",
+			"interested": "還感興趣嗎？",
+			"invite": "邀請",
+			"item-gone": "物品不見了",
+			"item-highlight": "高亮顯示藏匿物品",
+			"resend": "重新發送報價",
+			"trade": "貿易",
+			"wait": "等待？",
+			"whisper": "耳語"
+		},
 		"analyzing": "正在分析數據...",
 		"empty": "查無結果。是否瀏覽器中打開？",
+		"enabled": "啟用",
 		"error": "發生錯誤。",
 		"errors": {
 			"http": "無法連上GGG交易網站。\n請確保該網站可訪問。",
 			"rate": "已達到限制。請稍後再試。\n如果這種情況持續發生，請嘗試減少獲取的物品數。"
 		},
 		"fetching": "已找到 {{total}}。正在獲取 {{count}} 個條目...",
+		"message": {
+			"item-gone": "物品消失的消息",
+			"still-interested": "仍然感興趣的消息",
+			"thanks": "謝謝留言",
+			"wait": "等待訊息"
+		},
+		"name": "貿易",
 		"not-found": "沒有找到數據。",
 		"search": "搜尋",
 		"searching": "搜尋...",