diff --git a/locale/messages_ar.po b/locale/messages_ar.po
index eab6473c7..03d8239f0 100644
--- a/locale/messages_ar.po
+++ b/locale/messages_ar.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-19 12:53+0000\n"
-"PO-Revision-Date: 2019-10-02 09:00+0000\n"
-"Last-Translator: Ramy Raoof <ramy.raoof@gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/otf/I2P/language/ar/)\n"
+"POT-Creation-Date: 2022-02-01 12:39+0000\n"
+"PO-Revision-Date: 2015-01-11 19:37+0000\n"
+"Last-Translator: abidin toumi <abidin24@tutanota.com>, 2018\n"
+"Language-Team: Arabic (http://app.transifex.com/otf/I2P/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,197 +28,201 @@ msgid ""
 msgstr ""
 
 #: src/net/i2p/itoopie/gui/AboutTab.java:43
-#: src/net/i2p/itoopie/gui/OverviewTab.java:74
+#: src/net/i2p/itoopie/gui/OverviewTab.java:77
 msgid "Version:"
 msgstr "الإصدار:"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:30
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:33
 msgid "New remote host detected"
 msgstr "تم اكتشاف مضيف بعيد جديد"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:31
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:34
 #, java-format
 msgid ""
 "Would you like permanently trust the certificate from the remote host {0}?"
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:44
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:87
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:47
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:90
 msgid "Certificate info"
 msgstr "معلومات الشهادة"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:45
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:88
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:48
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:91
 msgid "Name: "
 msgstr "الإسم"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:46
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:89
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:49
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:92
 msgid "Algorithm: "
 msgstr "الخوارزمية"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:47
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:90
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:50
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:93
 msgid "Serial: "
 msgstr "المتسلسل"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:48
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:91
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:51
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:94
 msgid "SHA-1 ID-hash: "
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:72
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:75
 msgid "Warning, new remote host detected"
 msgstr "تحذير, تم اكتشاف مضيف بعيد جديد"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:73
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:76
 #, java-format
 msgid "The certificate of {0} has changed!"
 msgstr "شهادة {0} تم تعديلها"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:74
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:77
 msgid ""
 "Are you sure you want to permanently trust the new certificate from the "
 "remote host?"
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:105
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:108
 msgid "Are you sure that you trust the new certificate?"
 msgstr "هل بإمكانك الوثوق بهذه الشهادة ؟"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:106
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:109
 msgid "Is that your final answer?"
 msgstr "هل ذلك جوابك النهائي"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:46
-msgid "Settings read from I2P router."
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:48
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:60
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:49
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:65
 msgid "Settings aren't valid, not saving."
 msgstr "الاعدادات غير صالحة. لن تحفظ"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:49
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:61
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:50
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:66
 msgid "I2P router rejected settings."
 msgstr "موجه I2P رفض الاعدادات"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:50
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:51
 msgid "Not connected, unable to save."
 msgstr "غير متصل ,لم يقدر على الحفظ"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:51
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:62
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:52
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:67
 msgid "Saved settings on I2P router."
 msgstr "حفظ الاعدادات على موجه I2P"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:52
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:63
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:53
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:68
 msgid "Saved settings on I2P router. I2P router needs to be restarted."
 msgstr "حفظ الاعدادات على موجه I2P. I2P يحتاج اعادة التشغيل"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:96
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:170
+#. This is confusing and probably isn't supported on the i2pcontrol side,
+#. certainly not with the webapp.
+#. JSeparator separator = new JSeparator(SwingConstants.HORIZONTAL);
+#. separator.setBounds((96)/2, 108, (getWidth()-96), 2);
+#. add(separator);
+#. JPanel newChangePanel = new JPanel();
+#. newChangePanel.setLayout(null);
+#. newChangePanel.setOpaque(false);
+#. newChangePanel.setBounds(0, 110, 426, 135);
+#. add(newChangePanel);
+#. setupChangePanel(newChangePanel);
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:97
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:139
 msgid "Apply"
 msgstr "طبق"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:132
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:133
 msgid "Bandwidth:"
 msgstr "عرض النطاق:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:137
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:138
 msgid "Download:"
 msgstr "التحميل:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:146
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:160
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:148
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:163
 msgid "KB/s"
 msgstr "كب/ثا"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:151
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:153
 msgid "Upload:"
 msgstr "الرفع:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:165
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:170
 msgid "Share:"
 msgstr "المشاركة:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:184
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:190
 msgid "Network:"
 msgstr "الشبكة:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:189
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:195
 msgid "TCP port:"
 msgstr "منفذ TCP:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:199
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:206
 msgid "UDP port:"
 msgstr "منفذ UDP :"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:209
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:217
 msgid "UPNP:"
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:211
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:219
 msgid "Enable UPNP"
 msgstr "تمكين UPNP"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:285
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:302
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:414
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:535
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:304
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:321
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:383
 #, java-format
 msgid "\"{0}\" cannot be interpreted as a port."
 msgstr "\"{0}\" لا يمكن اعتباره كمنفذ"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:286
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:303
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:415
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:536
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:305
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:322
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:384
 msgid "Port must be a number in the range 1-65535."
 msgstr "يجب ان يكون المنفذ محصورا بين 1-65535"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:287
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:304
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:416
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:537
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:306
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:323
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:385
 msgid "Invalid port."
 msgstr "منفذ غير صالح"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:319
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:336
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:338
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:355
 #, java-format
 msgid "\"{0}\" cannot be interpreted as a speed."
 msgstr "\"{0}\" لايمكن اعتباره كسرعة"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:320
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:337
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:339
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:356
 msgid "Speed must be a number larger than 0."
 msgstr "السرعة يجب ان تكون رقما اكبر من 0"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:321
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:340
 msgid "Invalid download speed."
 msgstr "سرعة تحميل غير صالحة"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:338
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:357
 msgid "Invalid upload speed."
 msgstr "سرعة رفع غير صالحة"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:353
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:372
 #, java-format
 msgid "\"{0}\" cannot be interpreted as a percentage."
 msgstr "\"{0}\" لا يمكن اعتبارها كنسبة مئوية"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:354
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:373
 msgid "Percentage must be a number in the range 0-100."
 msgstr "النسبة الئوية يجب ان تكةن محصورة بين 0-100 "
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:355
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:374
 msgid "Invalid share percentage."
 msgstr "نسبة مشاركة غير صالحة"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:397
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:416
 msgid ""
 "The new settings have been applied,\n"
 "but the I2P router needs to be restarted for some to take effect.\n"
@@ -226,142 +230,100 @@ msgid ""
 "Would you like to restart the I2P router now?"
 msgstr "تم تطبييق الاعدادات الجديدة\nلكن بعض الاعدادات تحتاج اعادة تشغيل موجه I2P\n\nهل تريد اعادة تشغيل I2P الآن ؟"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:400
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:419
 msgid "Restart needed for new settings."
 msgstr "الاعدادت الجديدة تتطلب اعادة التشغيل."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:408
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:427
 msgid "Restarting I2P node"
 msgstr "اعادة تشغيل عقدة I2P"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:410
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:412
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:429
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:431
 msgid "Restart failed"
 msgstr "اعادة التشغيل فشلت"
 
-#: src/net/i2p/itoopie/gui/Main.java:85
+#: src/net/i2p/itoopie/gui/Main.java:114
 msgid "Overview"
 msgstr "نظرة عامة"
 
-#: src/net/i2p/itoopie/gui/Main.java:90
-msgid "Configuration"
-msgstr "تم حفظ تغيرات الاعدادات"
+#: src/net/i2p/itoopie/gui/Main.java:120
+msgid "I2P Control"
+msgstr ""
 
-#: src/net/i2p/itoopie/gui/Main.java:95
-msgid "About"
-msgstr "حول"
-
-#: src/net/i2p/itoopie/gui/Main.java:115
+#: src/net/i2p/itoopie/gui/Main.java:126
 msgid "Settings"
 msgstr "الإعدادات"
 
-#: src/net/i2p/itoopie/gui/OverviewTab.java:88
+#: src/net/i2p/itoopie/gui/Main.java:132
+msgid "About"
+msgstr "حول"
+
+#: src/net/i2p/itoopie/gui/OverviewTab.java:93
 msgid "Uptime:"
 msgstr "مدة الاتصال:"
 
-#: src/net/i2p/itoopie/gui/OverviewTab.java:101
+#: src/net/i2p/itoopie/gui/OverviewTab.java:108
 msgid "Status:"
 msgstr "الحالة:"
 
-#: src/net/i2p/itoopie/gui/OverviewTab.java:113
+#: src/net/i2p/itoopie/gui/OverviewTab.java:123
 msgid "Net Status:"
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:64
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:69
 msgid "No changes found, settings not saved."
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:179
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:148
 msgid "Settings saved."
 msgstr " تم حفظ  الإعدادات  "
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:183
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:152
 msgid "Settings not saved, no changes found."
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:189
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:192
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:195
-msgid "New remote address"
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:202
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:205
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:208
-msgid "New remote port"
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:215
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:218
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:221
-msgid "New remote password"
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:236
-msgid "Discard"
-msgstr "تجاهل"
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:253
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:213
 msgid "Connect to I2P node"
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:259
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:219
 msgid "IP address:"
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:269
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:229
 msgid "Port:"
 msgstr "البوابة:"
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:279
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:239
 msgid "Password:"
 msgstr "كلمة السر:"
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:291
-msgid "Change I2PControl"
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:297
-msgid "Change address:"
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:307
-msgid "Change port:"
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:317
-msgid "New password:"
-msgstr "كلمة سر جديدة:"
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:328
-msgid "Repeat password:"
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:398
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:367
 #, java-format
 msgid "\"{0}\" cannot be interpreted as an ip address."
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:399
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:368
 msgid "Try entering the ip address of the machine running i2p."
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:400
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:369
 msgid "Invalid ip address."
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:431
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:402
 msgid ""
 "The password was not accepted as valid by the specified host.\n"
 "\n"
 "(the default password is \"itoopie\")"
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:433
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:404
 msgid "Rejected password."
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:443
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:414
 msgid ""
 "The remote host at the ip and port did not respond.\n"
 "\n"
@@ -369,26 +331,10 @@ msgid ""
 "maybe the I2P router is not started."
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:446
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:417
 msgid "Connection failed."
 msgstr "فشل الاتصال."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:479
-msgid "The new password and the repeated new password do not match."
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:480
-msgid "Mistyped password."
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:489
-msgid "The new password is the same as the old password."
-msgstr ""
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:490
-msgid "No new password."
-msgstr ""
-
 #: src/net/i2p/itoopie/gui/StatusHandler.java:13
 msgid "Connected to I2P router."
 msgstr ""
@@ -401,7 +347,7 @@ msgstr ""
 msgid "I2P router rejected password."
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/TrayManager.java:87
+#: src/net/i2p/itoopie/gui/TrayManager.java:106
 msgid "Exit itoopie"
 msgstr ""
 
@@ -413,72 +359,67 @@ msgstr ""
 msgid "Bandwidth Out [KB/s]"
 msgstr ""
 
-#: src/net/i2p/itoopie/gui/component/BandwidthChart.java:70
-#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:58
-msgid "Time"
-msgstr "الوقت"
-
-#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:48
+#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:49
 msgid "Number of tunnels we are participating in."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:30
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:29
 msgid "Ok."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:31
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:30
 msgid "Testing."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:32
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:31
 msgid "Firewalled."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:33
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:32
 msgid "Hidden."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:34
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:33
 msgid "Warning, firewalled and fast."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:35
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:34
 msgid "Warning, firewalled and floodfill."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:36
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:35
 msgid "Warning, firewalled with inbound TCP enabled."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:37
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:36
 msgid "Warning, firewalled with UDP disabled."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:38
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:37
 msgid "Error, I2CP issue. Check logs."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:39
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:38
 msgid "Error, clock skew. Try setting system clock."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:40
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:39
 msgid "Error, private TCP address."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:41
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:40
 msgid "Error, behind symmetric NAT. Can't recieve connections."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:42
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:41
 msgid "Error, UDP port already in use."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:43
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:42
 msgid "Error, no active peers. Check connection and firewall."
 msgstr ""
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:44
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:43
 msgid "Error, UDP disabled and TCP unset."
 msgstr ""
 
@@ -490,7 +431,7 @@ msgstr ""
 msgid "any host (0.0.0.0)"
 msgstr ""
 
-#: src/net/i2p/itoopie/security/CertificateHelper.java:78
+#: src/net/i2p/itoopie/security/CertificateHelper.java:73
 msgid "Unable to create hash of the given cert, "
 msgstr ""
 
@@ -549,7 +490,7 @@ msgstr[5] ""
 #. >1000 days
 #: src/net/i2p/itoopie/util/DataHelper.java:37
 msgid "n/a"
-msgstr ""
+msgstr "غير معلوم"
 
 #. days
 #: src/net/i2p/itoopie/util/DataHelper.java:40
diff --git a/locale/messages_cs.po b/locale/messages_cs.po
index f12be797d..ee9ef84ab 100644
--- a/locale/messages_cs.po
+++ b/locale/messages_cs.po
@@ -4,7 +4,7 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
-# slrslr, 2022
+# slrslr, 2022-2023
 # slrslr, 2021
 msgid ""
 msgstr ""
@@ -12,8 +12,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-01 12:39+0000\n"
 "PO-Revision-Date: 2015-01-11 19:37+0000\n"
-"Last-Translator: slrslr, 2022\n"
-"Language-Team: Czech (http://www.transifex.com/otf/I2P/language/cs/)\n"
+"Last-Translator: slrslr, 2022-2023\n"
+"Language-Team: Czech (http://app.transifex.com/otf/I2P/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -374,7 +374,7 @@ msgstr "Testování."
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:31
 msgid "Firewalled."
-msgstr "Neprůchodné."
+msgstr "Firewalled."
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:32
 msgid "Hidden."
@@ -445,40 +445,40 @@ msgstr "Není možné vytvořit hash daného certifikátu,"
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "1 ms"
+msgstr[1] "{0,number,####} ms"
+msgstr[2] "{0,number,####} ms"
+msgstr[3] "{0,number,####} ms"
 
 #. seconds
 #: src/net/i2p/itoopie/util/DataHelper.java:28
 #, java-format
 msgid "1 second"
 msgid_plural "{0} seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "1 sekunda"
+msgstr[1] "{0} sekundy"
+msgstr[2] "{0} sekund"
+msgstr[3] "{0} sekund"
 
 #. minutes
 #: src/net/i2p/itoopie/util/DataHelper.java:31
 #, java-format
 msgid "1 minute"
 msgid_plural "{0} minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "1 minuta"
+msgstr[1] "{0} minuty"
+msgstr[2] "{0} minut"
+msgstr[3] "{0} minut"
 
 #. hours
 #: src/net/i2p/itoopie/util/DataHelper.java:34
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "1 hodina"
+msgstr[1] "{0} hodiny"
+msgstr[2] "{0} hodin"
+msgstr[3] "{0} hodin"
 
 #. >1000 days
 #: src/net/i2p/itoopie/util/DataHelper.java:37
@@ -490,7 +490,7 @@ msgstr "neaplikovatelné"
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "1 den"
+msgstr[1] "{0} dny"
+msgstr[2] "{0} dnů"
+msgstr[3] "{0} dnů"
diff --git a/locale/messages_es_AR.po b/locale/messages_es_AR.po
index 9b5f7beb2..29acdcedf 100644
--- a/locale/messages_es_AR.po
+++ b/locale/messages_es_AR.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2022-02-01 12:39+0000\n"
 "PO-Revision-Date: 2015-01-11 19:37+0000\n"
 "Last-Translator: hottuna <dev@robertfoss.se>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/I2P/language/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (http://app.transifex.com/otf/I2P/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -443,36 +443,36 @@ msgstr "No se pudo crear un hash (identificador criptográfico) del certificado
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 ms"
+msgstr[1] "{0,number,####} ms"
+msgstr[2] "{0,number,####} ms"
 
 #. seconds
 #: src/net/i2p/itoopie/util/DataHelper.java:28
 #, java-format
 msgid "1 second"
 msgid_plural "{0} seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 segundo"
+msgstr[1] "{0} segundos"
+msgstr[2] "{0} segundos"
 
 #. minutes
 #: src/net/i2p/itoopie/util/DataHelper.java:31
 #, java-format
 msgid "1 minute"
 msgid_plural "{0} minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 minuto"
+msgstr[1] "{0} minutos"
+msgstr[2] "{0} minutos"
 
 #. hours
 #: src/net/i2p/itoopie/util/DataHelper.java:34
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 hora"
+msgstr[1] "{0} horas"
+msgstr[2] "{0} horas"
 
 #. >1000 days
 #: src/net/i2p/itoopie/util/DataHelper.java:37
@@ -484,6 +484,6 @@ msgstr "n/d"
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 día"
+msgstr[1] "{0} días"
+msgstr[2] "{0} días"
diff --git a/locale/messages_pt.po b/locale/messages_pt.po
index da9286099..ca8a97739 100644
--- a/locale/messages_pt.po
+++ b/locale/messages_pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "POT-Creation-Date: 2022-02-01 12:39+0000\n"
 "PO-Revision-Date: 2015-01-11 19:37+0000\n"
 "Last-Translator: Manuela Silva <mmsrs@sky.com>, 2017-2018\n"
-"Language-Team: Portuguese (http://www.transifex.com/otf/I2P/language/pt/)\n"
+"Language-Team: Portuguese (http://app.transifex.com/otf/I2P/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -250,7 +250,7 @@ msgstr "Sinopse"
 
 #: src/net/i2p/itoopie/gui/Main.java:120
 msgid "I2P Control"
-msgstr ""
+msgstr "Controle I2P"
 
 #: src/net/i2p/itoopie/gui/Main.java:126
 msgid "Settings"
@@ -354,11 +354,11 @@ msgstr "Sair do itoopie"
 
 #: src/net/i2p/itoopie/gui/component/BandwidthChart.java:52
 msgid "Bandwidth In [KB/s]"
-msgstr ""
+msgstr "Largura de banda em [KB/s]"
 
 #: src/net/i2p/itoopie/gui/component/BandwidthChart.java:61
 msgid "Bandwidth Out [KB/s]"
-msgstr ""
+msgstr "Saída de largura de banda [KB/s]"
 
 #: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:49
 msgid "Number of tunnels we are participating in."
@@ -445,9 +445,9 @@ msgstr "Não foi possível criar hash do certificado fornecido, "
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "1 ms"
+msgstr[1] "{0,number,####} ms"
+msgstr[2] "{0,number,####} ms"
 
 #. seconds
 #: src/net/i2p/itoopie/util/DataHelper.java:28
diff --git a/locale/messages_pt_BR.po b/locale/messages_pt_BR.po
index afb0bc849..fab1515db 100644
--- a/locale/messages_pt_BR.po
+++ b/locale/messages_pt_BR.po
@@ -4,6 +4,7 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
+# Cauan Henrique Zorzenon <cauanzorzenon@gmail.com>, 2023
 # Eduardo Rodrigues, 2020-2021
 # L., 2016
 msgid ""
@@ -12,8 +13,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-01 12:39+0000\n"
 "PO-Revision-Date: 2015-01-11 19:37+0000\n"
-"Last-Translator: Eduardo Rodrigues, 2020-2021\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/I2P/language/pt_BR/)\n"
+"Last-Translator: Cauan Henrique Zorzenon <cauanzorzenon@gmail.com>, 2023\n"
+"Language-Team: Portuguese (Brazil) (http://app.transifex.com/otf/I2P/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -250,7 +251,7 @@ msgstr "Visão geral"
 
 #: src/net/i2p/itoopie/gui/Main.java:120
 msgid "I2P Control"
-msgstr ""
+msgstr "Controle I2P"
 
 #: src/net/i2p/itoopie/gui/Main.java:126
 msgid "Settings"
@@ -354,11 +355,11 @@ msgstr "Sair do itoopie"
 
 #: src/net/i2p/itoopie/gui/component/BandwidthChart.java:52
 msgid "Bandwidth In [KB/s]"
-msgstr ""
+msgstr "Largura de banda em [KB/s]"
 
 #: src/net/i2p/itoopie/gui/component/BandwidthChart.java:61
 msgid "Bandwidth Out [KB/s]"
-msgstr ""
+msgstr "Saída de largura de banda [KB/s]"
 
 #: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:49
 msgid "Number of tunnels we are participating in."
diff --git a/locale/messages_ru.po b/locale/messages_ru.po
index a971fc353..bb881e859 100644
--- a/locale/messages_ru.po
+++ b/locale/messages_ru.po
@@ -9,14 +9,15 @@
 # Tabula Rasa I2P <uiamaedr@10minutesmail.com>, 2015
 # yume, 2015
 # Алексей Коломенцев, 2022
+# Темак, 2023
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-01 12:39+0000\n"
 "PO-Revision-Date: 2015-01-11 19:37+0000\n"
-"Last-Translator: Алексей Коломенцев, 2022\n"
-"Language-Team: Russian (Russia) (http://www.transifex.com/otf/I2P/language/ru_RU/)\n"
+"Last-Translator: Темак, 2023\n"
+"Language-Team: Russian (Russia) (http://app.transifex.com/otf/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +30,7 @@ msgid ""
 "Development began during the summer of 2011 and the first alpha was launched in July.\n"
 "\n"
 "I'd like to thank Jan-Erik Fiske and Peter Sunde for actively helping privacy and anonymity online."
-msgstr "itoopie и I2PControl были проспонсированы Relakks и Ipredator.\nРазработка началась летом 2011, и первая альфа версия вышла в июле. \n\nХотелось бы поблагодарить Jan-Erik Fiske и Peter Sunde за активную помощь приватности и анонимности в Сети."
+msgstr "itoopie и I2PControl были проспонсированы Relakks и Ipredator.\nРазработка началась летом 2011, и первая альфа версия вышла в июле. \n\nХотелось бы поблагодарить Jan-Erik Fiske и Peter Sunde за постоянную помощь приватности и анонимности в сети."
 
 #: src/net/i2p/itoopie/gui/AboutTab.java:43
 #: src/net/i2p/itoopie/gui/OverviewTab.java:77
@@ -38,18 +39,18 @@ msgstr "Версия:"
 
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:33
 msgid "New remote host detected"
-msgstr "Обнаружен новый удаленный хост"
+msgstr "Обнаружен новый удалённый хост"
 
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:34
 #, java-format
 msgid ""
 "Would you like permanently trust the certificate from the remote host {0}?"
-msgstr "Вы хотите установить постоянное доверие к сертификату удаленного хоста {0}?"
+msgstr "Вы хотите установить постоянное доверие к сертификату удалённого хоста {0}?"
 
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:47
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:90
 msgid "Certificate info"
-msgstr "Информация о сертификате"
+msgstr "Сведения о сертификате"
 
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:48
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:91
@@ -73,7 +74,7 @@ msgstr "SHA-1 ID-хэш"
 
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:75
 msgid "Warning, new remote host detected"
-msgstr "Внимание, обнаружен новый удаленный хост"
+msgstr "Внимание, обнаружен новый удалённый хост"
 
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:76
 #, java-format
@@ -180,7 +181,7 @@ msgstr "Включить UPNP"
 #: src/net/i2p/itoopie/gui/SettingsFrame.java:383
 #, java-format
 msgid "\"{0}\" cannot be interpreted as a port."
-msgstr "\"{0}\" невозможно интерпретировать как порт"
+msgstr "«{0}» невозможно интерпретировать как порт"
 
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:305
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:322
@@ -198,7 +199,7 @@ msgstr "Недопустимый порт."
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:355
 #, java-format
 msgid "\"{0}\" cannot be interpreted as a speed."
-msgstr "\"{0}\" невозможно интерпретировать как скорость."
+msgstr "«{0}» невозможно интерпретировать как скорость."
 
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:339
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:356
@@ -216,7 +217,7 @@ msgstr "Недопустимая скорость отдачи."
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:372
 #, java-format
 msgid "\"{0}\" cannot be interpreted as a percentage."
-msgstr "\"{0}\" невозможно интерпретировать как проценты."
+msgstr "«{0}» невозможно интерпретировать как проценты."
 
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:373
 msgid "Percentage must be a number in the range 0-100."
@@ -269,11 +270,11 @@ msgstr "Время работы:"
 
 #: src/net/i2p/itoopie/gui/OverviewTab.java:108
 msgid "Status:"
-msgstr "Статус:"
+msgstr "Состояние:"
 
 #: src/net/i2p/itoopie/gui/OverviewTab.java:123
 msgid "Net Status:"
-msgstr "Статус сети:"
+msgstr "Состояние сети:"
 
 #: src/net/i2p/itoopie/gui/SettingsFrame.java:69
 msgid "No changes found, settings not saved."
@@ -321,7 +322,7 @@ msgid ""
 "The password was not accepted as valid by the specified host.\n"
 "\n"
 "(the default password is \"itoopie\")"
-msgstr "Пароль не принят указанным хостом.\n\n(пароль по умолчанию - \"itoopie\")"
+msgstr "Пароль не принят указанным хостом.\n\n(пароль по умолчанию — «itoopie»)"
 
 #: src/net/i2p/itoopie/gui/SettingsFrame.java:404
 msgid "Rejected password."
@@ -341,7 +342,7 @@ msgstr "Сбой соединения."
 
 #: src/net/i2p/itoopie/gui/StatusHandler.java:13
 msgid "Connected to I2P router."
-msgstr "Маршрутизатор I2P подключен."
+msgstr "Маршрутизатор I2P подключён."
 
 #: src/net/i2p/itoopie/gui/StatusHandler.java:14
 msgid "Unable to connect to I2P router."
@@ -369,7 +370,7 @@ msgstr "Туннели, в которых мы принимаем участие
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:29
 msgid "Ok."
-msgstr "Ok."
+msgstr "Ладно"
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:30
 msgid "Testing."
@@ -393,11 +394,11 @@ msgstr "Предупреждение: заблокирован извне, flood
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:35
 msgid "Warning, firewalled with inbound TCP enabled."
-msgstr "Предупреждение: заблокирован извне при включенных входящих TCP-соединениях"
+msgstr "Предупреждение: заблокирован извне при включённых входящих TCP-соединениях"
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:36
 msgid "Warning, firewalled with UDP disabled."
-msgstr "Предупреждение: заблокирован извне при отключенном UDP"
+msgstr "Предупреждение: заблокирован извне при отключённом UDP"
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:37
 msgid "Error, I2CP issue. Check logs."
@@ -405,7 +406,7 @@ msgstr "Ошибка: проблема I2CP. Проверьте логи."
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:38
 msgid "Error, clock skew. Try setting system clock."
-msgstr "Ошибка: часы сбиты. Попробуйте настроить системные часы."
+msgstr "Ошибка: часы сбиты. Попытайтесь настроить системные часы."
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:39
 msgid "Error, private TCP address."
@@ -425,7 +426,7 @@ msgstr "Ошибка: нет активных пиров. Проверьте И
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:43
 msgid "Error, UDP disabled and TCP unset."
-msgstr "Ошибка: UDP отключен и TCP не настроен."
+msgstr "Ошибка: UDP отключён и TCP не настроен."
 
 #: src/net/i2p/itoopie/i2pcontrol/methods/I2PControl.java:39
 msgid "local host (127.0.0.1)"
diff --git a/locale/messages_sv.po b/locale/messages_sv.po
index 05cd92007..0775f92dd 100644
--- a/locale/messages_sv.po
+++ b/locale/messages_sv.po
@@ -7,16 +7,16 @@
 # Anders Nilsson <anders@devode.se>, 2015
 # cacapo <handelsehorisont@gmail.com>, 2015
 # hottuna <dev@robertfoss.se>, 2011
-# Jonatan Nyberg <jonatan@autistici.org>, 2017,2021
+# Jonatan Nyberg, 2017,2021-2022
 # efef6ec5b435a041fce803c7f8af77d2_2341d43, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-19 12:53+0000\n"
-"PO-Revision-Date: 2021-11-29 20:18+0000\n"
-"Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/otf/I2P/language/sv_SE/)\n"
+"POT-Creation-Date: 2022-02-01 12:39+0000\n"
+"PO-Revision-Date: 2015-01-11 19:37+0000\n"
+"Last-Translator: Jonatan Nyberg, 2017,2021-2022\n"
+"Language-Team: Swedish (Sweden) (http://app.transifex.com/otf/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,197 +32,201 @@ msgid ""
 msgstr "itoopie och I2PControl sponsrades av Relakks & Ipredator.\nUtveckling påbörjades under sommaren 2011 och den första alfan lanserades i Juli.\n\nJag skulle vilja tacka Jan-Erik Fiske och Peter Sunde för att dom aktivt hjälper och stödjer integritet och anonymitet online."
 
 #: src/net/i2p/itoopie/gui/AboutTab.java:43
-#: src/net/i2p/itoopie/gui/OverviewTab.java:74
+#: src/net/i2p/itoopie/gui/OverviewTab.java:77
 msgid "Version:"
 msgstr "Version:"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:30
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:33
 msgid "New remote host detected"
 msgstr "Ny fjärrvärd upptäckt"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:31
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:34
 #, java-format
 msgid ""
 "Would you like permanently trust the certificate from the remote host {0}?"
 msgstr "Vill du permanent lita på certifikatet från fjärrvärden {0}?"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:44
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:87
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:47
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:90
 msgid "Certificate info"
 msgstr "Certifikat info"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:45
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:88
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:48
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:91
 msgid "Name: "
 msgstr "Namn: "
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:46
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:89
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:49
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:92
 msgid "Algorithm: "
 msgstr "Algoritm: "
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:47
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:90
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:50
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:93
 msgid "Serial: "
 msgstr "Serienummer: "
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:48
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:91
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:51
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:94
 msgid "SHA-1 ID-hash: "
 msgstr "SHA-1 hash:"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:72
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:75
 msgid "Warning, new remote host detected"
 msgstr "Varning, ny fjärrvärd funnen"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:73
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:76
 #, java-format
 msgid "The certificate of {0} has changed!"
 msgstr "Certifikatet från {0} har ändrats!"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:74
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:77
 msgid ""
 "Are you sure you want to permanently trust the new certificate from the "
 "remote host?"
 msgstr "Vill du permanent lite på certifikatet från fjärrvärden "
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:105
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:108
 msgid "Are you sure that you trust the new certificate?"
 msgstr "Är du säker på att du vill lite på det nya certifkatet?"
 
-#: src/net/i2p/itoopie/gui/CertificateGUI.java:106
+#: src/net/i2p/itoopie/gui/CertificateGUI.java:109
 msgid "Is that your final answer?"
 msgstr "Är detta ditt slutgiltiga svar?"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:46
-msgid "Settings read from I2P router."
-msgstr "Inställningar lästa från I2P routern."
-
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:48
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:60
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:49
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:65
 msgid "Settings aren't valid, not saving."
 msgstr "Inställningarna är inte giltiga, sparar inte."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:49
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:61
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:50
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:66
 msgid "I2P router rejected settings."
 msgstr "I2P routern avvisade inställningar."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:50
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:51
 msgid "Not connected, unable to save."
 msgstr "Inte ansluten, kan inte spara."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:51
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:62
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:52
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:67
 msgid "Saved settings on I2P router."
 msgstr "Inställningar sparades till I2P router."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:52
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:63
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:53
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:68
 msgid "Saved settings on I2P router. I2P router needs to be restarted."
 msgstr "Sparade inställningar på I2P routern. I2P routern behöver startas om."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:96
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:170
+#. This is confusing and probably isn't supported on the i2pcontrol side,
+#. certainly not with the webapp.
+#. JSeparator separator = new JSeparator(SwingConstants.HORIZONTAL);
+#. separator.setBounds((96)/2, 108, (getWidth()-96), 2);
+#. add(separator);
+#. JPanel newChangePanel = new JPanel();
+#. newChangePanel.setLayout(null);
+#. newChangePanel.setOpaque(false);
+#. newChangePanel.setBounds(0, 110, 426, 135);
+#. add(newChangePanel);
+#. setupChangePanel(newChangePanel);
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:97
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:139
 msgid "Apply"
 msgstr "Verkställ"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:132
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:133
 msgid "Bandwidth:"
 msgstr "Bandbredd:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:137
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:138
 msgid "Download:"
 msgstr "Nerladdning:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:146
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:160
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:148
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:163
 msgid "KB/s"
 msgstr "KB/s"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:151
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:153
 msgid "Upload:"
 msgstr "Uppladdning:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:165
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:170
 msgid "Share:"
 msgstr "Utdelning:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:184
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:190
 msgid "Network:"
 msgstr "Nätverk:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:189
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:195
 msgid "TCP port:"
 msgstr "TCP-port:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:199
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:206
 msgid "UDP port:"
 msgstr "UDP-port:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:209
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:217
 msgid "UPNP:"
 msgstr "UPNP:"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:211
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:219
 msgid "Enable UPNP"
 msgstr "Slå på UPNP"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:285
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:302
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:414
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:535
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:304
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:321
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:383
 #, java-format
 msgid "\"{0}\" cannot be interpreted as a port."
 msgstr "\"{0}\" kan inte tolkas som en port."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:286
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:303
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:415
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:536
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:305
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:322
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:384
 msgid "Port must be a number in the range 1-65535."
 msgstr "Port måste vara ett nummer i intervallet 1-65535."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:287
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:304
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:416
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:537
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:306
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:323
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:385
 msgid "Invalid port."
 msgstr "Ogiltig port."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:319
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:336
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:338
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:355
 #, java-format
 msgid "\"{0}\" cannot be interpreted as a speed."
 msgstr "\"{0}\" kan inte tolkas som en hastighet."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:320
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:337
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:339
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:356
 msgid "Speed must be a number larger than 0."
 msgstr "Hastighet måste vara ett nummer stärre än 0."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:321
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:340
 msgid "Invalid download speed."
 msgstr "Ogiltig nerladdningshastighet."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:338
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:357
 msgid "Invalid upload speed."
 msgstr "Ogiltig uppladdningshastighet."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:353
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:372
 #, java-format
 msgid "\"{0}\" cannot be interpreted as a percentage."
 msgstr "\"{0}\" kan inte tolkas som ett procenttal."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:354
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:373
 msgid "Percentage must be a number in the range 0-100."
 msgstr "Procenttalet måste vara ett nummer i intervallet 0-100."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:355
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:374
 msgid "Invalid share percentage."
 msgstr "Ogiltig utdelningsprocent."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:397
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:416
 msgid ""
 "The new settings have been applied,\n"
 "but the I2P router needs to be restarted for some to take effect.\n"
@@ -230,142 +234,100 @@ msgid ""
 "Would you like to restart the I2P router now?"
 msgstr "De nya inställningarna har sparats,\nmen I2P routern måste startas om för att verkställa.\n\nVill du starta om I2P routern nu?"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:400
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:419
 msgid "Restart needed for new settings."
 msgstr "Omstart krävs för nya inställningar."
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:408
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:427
 msgid "Restarting I2P node"
 msgstr "Startar om I2P nod"
 
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:410
-#: src/net/i2p/itoopie/gui/ConfigurationTab.java:412
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:429
+#: src/net/i2p/itoopie/gui/ConfigurationTab.java:431
 msgid "Restart failed"
 msgstr "Omstart misslyckades"
 
-#: src/net/i2p/itoopie/gui/Main.java:85
+#: src/net/i2p/itoopie/gui/Main.java:114
 msgid "Overview"
 msgstr "Översikt"
 
-#: src/net/i2p/itoopie/gui/Main.java:90
-msgid "Configuration"
-msgstr "Konfiguration"
+#: src/net/i2p/itoopie/gui/Main.java:120
+msgid "I2P Control"
+msgstr ""
 
-#: src/net/i2p/itoopie/gui/Main.java:95
-msgid "About"
-msgstr "Om"
-
-#: src/net/i2p/itoopie/gui/Main.java:115
+#: src/net/i2p/itoopie/gui/Main.java:126
 msgid "Settings"
 msgstr "Inställningar."
 
-#: src/net/i2p/itoopie/gui/OverviewTab.java:88
+#: src/net/i2p/itoopie/gui/Main.java:132
+msgid "About"
+msgstr "Om"
+
+#: src/net/i2p/itoopie/gui/OverviewTab.java:93
 msgid "Uptime:"
 msgstr "Uptid:"
 
-#: src/net/i2p/itoopie/gui/OverviewTab.java:101
+#: src/net/i2p/itoopie/gui/OverviewTab.java:108
 msgid "Status:"
 msgstr "Status:"
 
-#: src/net/i2p/itoopie/gui/OverviewTab.java:113
+#: src/net/i2p/itoopie/gui/OverviewTab.java:123
 msgid "Net Status:"
 msgstr "Nätstatus:"
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:64
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:69
 msgid "No changes found, settings not saved."
 msgstr "Inga ändringar hittades, inställningarna sparas inte."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:179
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:148
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:183
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:152
 msgid "Settings not saved, no changes found."
 msgstr "Inställningar sparas inte, inga ändringar hittades."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:189
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:192
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:195
-msgid "New remote address"
-msgstr "Nytt fjärrlösen"
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:202
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:205
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:208
-msgid "New remote port"
-msgstr "Ny fjärrport"
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:215
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:218
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:221
-msgid "New remote password"
-msgstr "Nytt fjärrlösen"
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:236
-msgid "Discard"
-msgstr "Avbryt"
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:253
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:213
 msgid "Connect to I2P node"
 msgstr "Ansluten till I2P router."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:259
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:219
 msgid "IP address:"
 msgstr "Ipadress."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:269
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:229
 msgid "Port:"
 msgstr "Port:"
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:279
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:239
 msgid "Password:"
 msgstr "Lösen:"
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:291
-msgid "Change I2PControl"
-msgstr "Ändra I2PControl"
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:297
-msgid "Change address:"
-msgstr "Ipadress."
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:307
-msgid "Change port:"
-msgstr "Ändra port:"
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:317
-msgid "New password:"
-msgstr "Nytt lösen:"
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:328
-msgid "Repeat password:"
-msgstr "Lösen avvisat."
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:398
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:367
 #, java-format
 msgid "\"{0}\" cannot be interpreted as an ip address."
 msgstr "\"{0}\" kan inte tolkas som en ip adress."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:399
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:368
 msgid "Try entering the ip address of the machine running i2p."
 msgstr " kan inte tolkas som en ipadress.\n\nFörsök använda maskinen som kör I2Ps ipadress."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:400
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:369
 msgid "Invalid ip address."
-msgstr "Ogiltig ipadress."
+msgstr "Ogiltig IP-adress."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:431
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:402
 msgid ""
 "The password was not accepted as valid by the specified host.\n"
 "\n"
 "(the default password is \"itoopie\")"
 msgstr "Lösenordet accepterades inte av den angivna värden.\n\n(standarlösenordet är \"itoopie\")"
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:433
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:404
 msgid "Rejected password."
 msgstr "Lösen avvisat."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:443
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:414
 msgid ""
 "The remote host at the ip and port did not respond.\n"
 "\n"
@@ -373,26 +335,10 @@ msgid ""
 "maybe the I2P router is not started."
 msgstr "Fjärrvärden vid angiven ip och port svarade inte.\nI2PControl kanske inte körs på I2P routern, \nI2P routern kanske inte är startad."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:446
+#: src/net/i2p/itoopie/gui/SettingsFrame.java:417
 msgid "Connection failed."
 msgstr "Anslutning misslyckades."
 
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:479
-msgid "The new password and the repeated new password do not match."
-msgstr "Det nya lösenordet och det upprepade lösenordert överensstämmer inte."
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:480
-msgid "Mistyped password."
-msgstr "Felskrivet lösenord."
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:489
-msgid "The new password is the same as the old password."
-msgstr "Det nya lösenordet är samma som det gamla lösenorder."
-
-#: src/net/i2p/itoopie/gui/SettingsFrame.java:490
-msgid "No new password."
-msgstr "Inget nytt lösenord."
-
 #: src/net/i2p/itoopie/gui/StatusHandler.java:13
 msgid "Connected to I2P router."
 msgstr "Ansluten till I2P router."
@@ -405,7 +351,7 @@ msgstr "Det går inte att ansluta till I2P-routern."
 msgid "I2P router rejected password."
 msgstr "I2P routern avvisade lösenord."
 
-#: src/net/i2p/itoopie/gui/TrayManager.java:87
+#: src/net/i2p/itoopie/gui/TrayManager.java:106
 msgid "Exit itoopie"
 msgstr "Avsluta itoopie"
 
@@ -417,72 +363,67 @@ msgstr "Bandbredd in [KB/s]:"
 msgid "Bandwidth Out [KB/s]"
 msgstr "Bandbredd ut [KB/s]:"
 
-#: src/net/i2p/itoopie/gui/component/BandwidthChart.java:70
-#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:58
-msgid "Time"
-msgstr "Tid"
-
-#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:48
+#: src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java:49
 msgid "Number of tunnels we are participating in."
 msgstr "Antalet I2P tunnlar vi deltar i."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:30
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:29
 msgid "Ok."
 msgstr "Ok."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:31
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:30
 msgid "Testing."
 msgstr "Testar."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:32
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:31
 msgid "Firewalled."
 msgstr "Bakom brandvägg."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:33
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:32
 msgid "Hidden."
 msgstr "Gömd."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:34
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:33
 msgid "Warning, firewalled and fast."
 msgstr "Varning, bakom brandvägg och snabb."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:35
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:34
 msgid "Warning, firewalled and floodfill."
 msgstr "Varning, bakom brandvägg och 'floodfill'."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:36
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:35
 msgid "Warning, firewalled with inbound TCP enabled."
 msgstr "Varning, bakom brandvägg med TCP påslaget."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:37
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:36
 msgid "Warning, firewalled with UDP disabled."
 msgstr "Varning, bakom brandvägg med UDP avslaget."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:38
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:37
 msgid "Error, I2CP issue. Check logs."
 msgstr "Fel, I2CP problem. Kontrollera loggar."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:39
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:38
 msgid "Error, clock skew. Try setting system clock."
 msgstr "Fel, klockvridning. Testa ställa systemklockan."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:40
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:39
 msgid "Error, private TCP address."
 msgstr "Fel, private TCP adress."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:41
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:40
 msgid "Error, behind symmetric NAT. Can't recieve connections."
 msgstr "Fel, bakom symmetrisk NAT. Kan inte ta emot anslutningar."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:42
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:41
 msgid "Error, UDP port already in use."
 msgstr "Fel, UDP-porten används redan."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:43
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:42
 msgid "Error, no active peers. Check connection and firewall."
 msgstr "Fel, inga aktiva jämlikar. Kontrollera anslutning och brandvägg."
 
-#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:44
+#: src/net/i2p/itoopie/i2pcontrol/methods/GetRouterInfo.java:43
 msgid "Error, UDP disabled and TCP unset."
 msgstr "Fel, UDP inaktiverad och TCP är inte inställd."
 
@@ -494,7 +435,7 @@ msgstr "local host (127.0.0.1)"
 msgid "any host (0.0.0.0)"
 msgstr "vilken värddator som helst (0.0.0.0)"
 
-#: src/net/i2p/itoopie/security/CertificateHelper.java:78
+#: src/net/i2p/itoopie/security/CertificateHelper.java:73
 msgid "Unable to create hash of the given cert, "
 msgstr "Det går inte att skapa hash av den givna cert, "
 
diff --git a/locale/messages_zh_TW.po b/locale/messages_zh_TW.po
index 8945f4791..853e9908c 100644
--- a/locale/messages_zh_TW.po
+++ b/locale/messages_zh_TW.po
@@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2022-02-01 12:39+0000\n"
 "PO-Revision-Date: 2015-01-11 19:37+0000\n"
 "Last-Translator: 0a744893951e0d1706ff74a7afccf561, 2019\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/I2P/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://app.transifex.com/otf/I2P/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -444,28 +444,28 @@ msgstr "无法创建指定证书的哈希值，"
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] ""
+msgstr[0] "{0,number,####} 毫秒"
 
 #. seconds
 #: src/net/i2p/itoopie/util/DataHelper.java:28
 #, java-format
 msgid "1 second"
 msgid_plural "{0} seconds"
-msgstr[0] ""
+msgstr[0] "{0} 秒"
 
 #. minutes
 #: src/net/i2p/itoopie/util/DataHelper.java:31
 #, java-format
 msgid "1 minute"
 msgid_plural "{0} minutes"
-msgstr[0] ""
+msgstr[0] "{0} 分钟"
 
 #. hours
 #: src/net/i2p/itoopie/util/DataHelper.java:34
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
-msgstr[0] ""
+msgstr[0] "{0} 小时"
 
 #. >1000 days
 #: src/net/i2p/itoopie/util/DataHelper.java:37
@@ -477,4 +477,4 @@ msgstr "不可用"
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
-msgstr[0] ""
+msgstr[0] "{0} 天"