diff --git a/EAPMethods/locale/EAPMethods.pot b/EAPMethods/locale/EAPMethods.pot
index b2ba629..a3f1646 100644
--- a/EAPMethods/locale/EAPMethods.pot
+++ b/EAPMethods/locale/EAPMethods.pot
@@ -2,933 +2,650 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2019-08-12 14:04+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.8\n"
-"X-Poedit-Basepath: ../../..\n"
+"X-Generator: Poedit 2.2.3\n"
+"X-Poedit-Basepath: ../..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: master/lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: master/lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: master/lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: master/lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: master/lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: master/lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: master/EAPMethods\n"
-"X-Poedit-SearchPath-8: ver1.1/lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
-"X-Poedit-SearchPath-10: ver1.1/lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-11: ver1.1/lib/PAP_UI\n"
-"X-Poedit-SearchPath-12: ver1.1/lib/TLS_UI\n"
-"X-Poedit-SearchPath-13: ver1.1/lib/TTLS_UI\n"
-"X-Poedit-SearchPath-14: ver1.1/EAPMethods\n"
-"X-Poedit-SearchPath-15: ver1.0/lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-16: ver1.0/lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-17: ver1.0/lib/PAP_UI\n"
-"X-Poedit-SearchPath-18: ver1.0/lib/TLS_UI\n"
-"X-Poedit-SearchPath-19: ver1.0/lib/TTLS_UI\n"
-"X-Poedit-SearchPath-20: ver1.0/EAPMethods\n"
+"X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
+"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
+"X-Poedit-SearchPath-2: lib/GTC_UI\n"
+"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-4: lib/PAP_UI\n"
+"X-Poedit-SearchPath-5: lib/TLS_UI\n"
+"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-7: EAPMethods\n"
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:285
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:302
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:284
+#: lib/EAPBase_UI/include/EAP_UI.h:285
 #, c-format
 msgid "Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:285
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:302
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:284
+#: lib/EAPBase_UI/include/EAP_UI.h:285
 msgid "Warning"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:371
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:119
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:367
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:377
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.h:119
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:370
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+#: lib/EAPBase_UI/include/EAP_UI.h:371 lib/EAPBase_UI/res/wxEAP_UI.h:117
 msgid "EAP Credentials"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:641
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:640
+#: lib/EAPBase_UI/include/EAP_UI.h:641
 msgid "Provider Settings"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:674
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:673
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:674 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
 #, c-format
 msgid "%s User Credentials"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:793
-#: master/lib/TTLS_UI/src/Module.cpp:285 master/lib/TTLS_UI/src/Module.cpp:357
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
-#: ver1.0/lib/TTLS_UI/src/Module.cpp:275 ver1.0/lib/TTLS_UI/src/Module.cpp:285
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:792
-#: ver1.1/lib/TTLS_UI/src/Module.cpp:263 ver1.1/lib/TTLS_UI/src/Module.cpp:319
+#: lib/EAPBase_UI/include/EAP_UI.h:793 lib/TTLS_UI/src/Module.cpp:285
+#: lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:796
-#: master/lib/TTLS_UI/src/Module.cpp:287 master/lib/TTLS_UI/src/Module.cpp:359
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
-#: ver1.0/lib/TTLS_UI/src/Module.cpp:277 ver1.0/lib/TTLS_UI/src/Module.cpp:287
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:795
-#: ver1.1/lib/TTLS_UI/src/Module.cpp:265 ver1.1/lib/TTLS_UI/src/Module.cpp:321
+#: lib/EAPBase_UI/include/EAP_UI.h:796 lib/TTLS_UI/src/Module.cpp:287
+#: lib/TTLS_UI/src/Module.cpp:359
 msgid "Writing credentials failed."
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:816
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:815
+#: lib/EAPBase_UI/include/EAP_UI.h:816
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:855
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:854
+#: lib/EAPBase_UI/include/EAP_UI.h:855
 #, c-format
 msgid "(error %u)"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:859
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:858
+#: lib/EAPBase_UI/include/EAP_UI.h:859
 msgid "(error)"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:870
-#: master/lib/EAPBase_UI/include/EAP_UI.h:879
-#: master/lib/TLS_UI/src/TLS_UI.cpp:61
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:803
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:812
-#: ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:869
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:878
-#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: lib/EAPBase_UI/include/EAP_UI.h:870 lib/EAPBase_UI/include/EAP_UI.h:879
+#: lib/TLS_UI/src/TLS_UI.cpp:61
 msgid "(empty)"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:870
-#: master/lib/EAPBase_UI/include/EAP_UI.h:879
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:803
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:812
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:869
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:878
+#: lib/EAPBase_UI/include/EAP_UI.h:870 lib/EAPBase_UI/include/EAP_UI.h:879
 msgid "(blank ID)"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:919
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:918
+#: lib/EAPBase_UI/include/EAP_UI.h:919
 msgid "&Remember"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:920
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:919
+#: lib/EAPBase_UI/include/EAP_UI.h:920
 msgid "Check if you would like to save credentials"
 msgstr ""
 
-#: master/lib/EAPBase_UI/include/EAP_UI.h:1131
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1077
+#: lib/EAPBase_UI/include/EAP_UI.h:1131
 msgid "(Your Organization)"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:37
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:37
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:37
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:38
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:38
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:38
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 msgid "Adds new provider"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:42
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:42
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:42
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
 msgid "-"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:43
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:43
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:43
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 msgid "Removes selected provider"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:47
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:47
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:47
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
 msgid "Advanced..."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:48
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:48
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:48
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:48
 msgid "Opens dialog with provider settings"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:240
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:240
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:240
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:244
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
 msgid "Use credentials from Credential &Manager"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:245
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:245
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid "Select this option if you would like to use credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:255
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:255
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:255
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:299
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
 msgid "Identity:"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:262
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:262
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
 msgid "&Clear Credentials"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:273
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:273
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:277
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:316
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:277
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:316
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:277
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
 msgid "&Set Credentials..."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:278
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:317
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:278
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:317
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:278
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
 msgid "Click here to set or modify your credentials"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:288
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
 msgid "Use credentials from &profile configuration"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:289
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:289
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
 msgid "Select this option if you would like to store credentials as a part of  profile configuration"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:306
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:306
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
 msgid "Profile configuration credentials"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:359
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:359
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
 msgid "User ID and Password"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:369
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:369
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Please provide your user ID and password."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:379
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:443
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:379
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:379
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
 msgid "User ID:"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:384
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:448
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:384
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:384
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:388
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:388
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
 msgid "Password:"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:393
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:393
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
 msgid "Enter your password here"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid "User ID"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
 msgid "Please provide your user ID."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:473
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:424
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:424
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
 msgid "Your Organization"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:484
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:435
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:435
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
 msgid "Describe your organization to customize user prompts.  When organization is introduced, end-users find program messages easier to understand and act."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:491
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:442
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:442
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
 msgid "Your organization &name:"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:496
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:447
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:447
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
 msgid "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:500
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:451
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:451
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:510
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:461
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:461
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:471
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:471
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
 msgid "¶"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:527
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:478
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:478
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:482
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:482
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
 msgid "*"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:538
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:489
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:489
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:493
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:493
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
 msgid ")"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:549
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:500
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:577
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:528
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:528
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:588
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:539
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:539
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
 msgid "Assign your organization a unique ID to allow sharing the same credential set across different network profiles."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:595
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:546
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:546
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
 msgid "&Namespace:"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:599
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:550
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:550
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
 msgid "urn:RFC4282:realm"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:599
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:550
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:550
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
 msgid "urn:uuid"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:611
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:562
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:562
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:616
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:567
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:567
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:641
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:592
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:592
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
 msgid "Configuration Lock"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:652
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:603
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:603
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
 msgid "Your configuration can be locked to prevent accidental modification by end-users. Users will only be allowed to enter credentials."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:659
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:610
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:610
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
 msgid "&Lock this configuration and prevent any further modification via user interface."
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:662
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:613
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:613
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:69
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.h:69
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:69
+#: lib/EAPBase_UI/res/wxEAP_UI.h:67
 msgid "EAP Connection Configuration"
 msgstr ""
 
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+#: lib/EAPBase_UI/res/wxEAP_UI.h:334
 msgid "EAP Identity Provider"
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:103
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:99
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:103
 #, c-format
 msgid "%s Credentials"
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:139
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:173
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:139
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:140
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:174
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:140
 msgid "your provider"
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:159
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:193
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:159
 msgid "Open the default web browser"
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:170
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:204
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:170
 msgid "Open your e-mail program"
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:181
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:215
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:181
 msgid "Dial the phone number"
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:203
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:235
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:203
 #, c-format
 msgid "%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:204
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:236
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:204
 msgid "Your provider"
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:225
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:257
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:225
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:226
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:258
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:226
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:227
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:259
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 msgid "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:228
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:260
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Previous attempt to connect failed."
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:229
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:261
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:229
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:250
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:282
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:250
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 #, c-format
 msgid "The %s version installed on this computer logs credentials in visible and easy to read way."
 msgstr ""
 
-#: master/lib/EAPBase_UI/src/EAP_UI.cpp:251
-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:283
-#: ver1.1/lib/EAPBase_UI/src/EAP_UI.cpp:251
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid "Please, reconsider necessity to enter your credentials."
 msgstr ""
 
-#: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-#: ver1.1/lib/EapHost_UI/res/wxEapHost_UI.cpp:17
+#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
 msgid "Inner EAP Method"
 msgstr ""
 
-#: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-#: ver1.1/lib/EapHost_UI/res/wxEapHost_UI.cpp:28
+#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
 msgid "Select and configure inner EAP method"
 msgstr ""
 
-#: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-#: ver1.1/lib/EapHost_UI/res/wxEapHost_UI.cpp:40
+#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
 msgid "&Settings"
 msgstr ""
 
-#: master/lib/EapHost_UI/src/EapHost_UI.cpp:59
-#: ver1.1/lib/EapHost_UI/src/EapHost_UI.cpp:59
+#: lib/EapHost_UI/src/EapHost_UI.cpp:59
 #, c-format
 msgid "Enumerating EAP methods failed (error %u, %s, %s)."
 msgstr ""
 
-#: master/lib/EapHost_UI/src/EapHost_UI.cpp:61
-#: ver1.1/lib/EapHost_UI/src/EapHost_UI.cpp:61
+#: lib/EapHost_UI/src/EapHost_UI.cpp:61
 #, c-format
 msgid "Enumerating EAP methods failed (error %u)."
 msgstr ""
 
-#: master/lib/EapHost_UI/src/EapHost_UI.cpp:136
-#: ver1.1/lib/EapHost_UI/src/EapHost_UI.cpp:136
+#: lib/EapHost_UI/src/EapHost_UI.cpp:136
 #, c-format
 msgid "Configuring EAP method failed (error %u, %s, %s)."
 msgstr ""
 
-#: master/lib/EapHost_UI/src/EapHost_UI.cpp:138
-#: ver1.1/lib/EapHost_UI/src/EapHost_UI.cpp:138
+#: lib/EapHost_UI/src/EapHost_UI.cpp:138
 #, c-format
 msgid "Configuring EAP method failed (error %u)."
 msgstr ""
 
-#: master/lib/GTC_UI/include/GTC_UI.h:111 master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: lib/GTC_UI/include/GTC_UI.h:111 lib/GTC_UI/res/wxGTC_UI.cpp:16
 msgid "GTC Challenge"
 msgstr ""
 
-#: master/lib/GTC_UI/res/wxGTC_UI.cpp:26
+#: lib/GTC_UI/res/wxGTC_UI.cpp:26
 msgid "Please provide your response."
 msgstr ""
 
-#: master/lib/GTC_UI/res/wxGTC_UI.cpp:38
+#: lib/GTC_UI/res/wxGTC_UI.cpp:38
 msgid "Server challenge"
 msgstr ""
 
-#: master/lib/GTC_UI/res/wxGTC_UI.cpp:43
+#: lib/GTC_UI/res/wxGTC_UI.cpp:43
 msgid "Enter your response here"
 msgstr ""
 
-#: master/lib/GTC_UI/res/wxGTC_UI.cpp:70
+#: lib/GTC_UI/res/wxGTC_UI.cpp:70
 msgid "EAP-GTC authentication &mode:"
 msgstr ""
 
-#: master/lib/GTC_UI/res/wxGTC_UI.cpp:75
+#: lib/GTC_UI/res/wxGTC_UI.cpp:75
 msgid "Select EAP-GTC authentication mode from the list"
 msgstr ""
 
-#: master/lib/GTC_UI/src/GTC_UI.cpp:39
+#: lib/GTC_UI/src/GTC_UI.cpp:39
 msgid "Challenge/Response"
 msgstr ""
 
-#: master/lib/GTC_UI/src/GTC_UI.cpp:41
+#: lib/GTC_UI/src/GTC_UI.cpp:41
 msgid "Password"
 msgstr ""
 
-#: master/lib/GTC_UI/src/GTC_UI.cpp:119
+#: lib/GTC_UI/src/GTC_UI.cpp:119
 #, c-format
 msgid "%s Challenge"
 msgstr ""
 
-#: master/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
-#: ver1.0/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
-#: ver1.1/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
+#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr ""
 
-#: master/lib/PAP_UI/src/PAP_UI.cpp:33 ver1.0/lib/PAP_UI/src/PAP_UI.cpp:33
-#: ver1.1/lib/PAP_UI/src/PAP_UI.cpp:33
+#: lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:17 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:17
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:17
+#: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:28 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:28
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:28
+#: lib/TLS_UI/res/wxTLS_UI.cpp:28
 msgid "Describe the servers you trust to prevent credential interception in case of man-in-the-middle attacks."
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:35 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:35
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:35
+#: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:40 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:40
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:40
+#: lib/TLS_UI/res/wxTLS_UI.cpp:40
 msgid "Server's certificate must be issued by one of certificate authorities listed here"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:47 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:47
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:47
+#: lib/TLS_UI/res/wxTLS_UI.cpp:47
 msgid "Add CA from Store..."
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:48 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:48
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:48
+#: lib/TLS_UI/res/wxTLS_UI.cpp:48
 msgid "Adds a new certificate authority from the certificate store to the list"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:52 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:52
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:52
+#: lib/TLS_UI/res/wxTLS_UI.cpp:52
 msgid "Add CA from File..."
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:53 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:53
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:53
+#: lib/TLS_UI/res/wxTLS_UI.cpp:53
 msgid "Adds a new certificate authority from the file to the list"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:57 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:57
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:57
+#: lib/TLS_UI/res/wxTLS_UI.cpp:57
 msgid "&Remove CA"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:58 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:58
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:58
 msgid "Removes selected certificate authorities from the list"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:71 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:71
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:71
 msgid "Acceptable server &names:"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:76 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:76
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:76
 msgid "A semicolon delimited list of acceptable server FQDN names; blank to skip name check; Unicode characters allowed"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:80 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:80
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:80
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:118 master/lib/TLS_UI/src/TLS_UI.cpp:325
-#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:118 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:317
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:118 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
+#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:128
-#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:128
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:128
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:135
-#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:135
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:135
 msgid "Client certificate to use for authentication"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:142
-#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:142
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:142
 msgid "Custom &identity:"
 msgstr ""
 
-#: master/lib/TLS_UI/res/wxTLS_UI.cpp:147
-#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:147
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:147
 msgid "Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate"
 msgstr ""
 
-#: master/lib/TLS_UI/src/TLS_UI.cpp:252 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:246
-#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:252
+#: lib/TLS_UI/src/TLS_UI.cpp:252
 msgid "Add Certificate"
 msgstr ""
 
-#: master/lib/TLS_UI/src/TLS_UI.cpp:253 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:247
-#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:253
+#: lib/TLS_UI/src/TLS_UI.cpp:253
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: master/lib/TLS_UI/src/TLS_UI.cpp:254 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:248
-#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:254
+#: lib/TLS_UI/src/TLS_UI.cpp:254
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""
 
-#: master/lib/TLS_UI/src/TLS_UI.cpp:255 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:249
-#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:255
+#: lib/TLS_UI/src/TLS_UI.cpp:255
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: master/lib/TLS_UI/src/TLS_UI.cpp:256 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:250
-#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:256
 msgid "All Files (*.*)"
 msgstr ""
 
-#: master/lib/TLS_UI/src/TLS_UI.cpp:270 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:264
-#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:270
+#: lib/TLS_UI/src/TLS_UI.cpp:270
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""
 
-#: master/lib/TLS_UI/src/TLS_UI.cpp:270 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:264
-#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:270
+#: lib/TLS_UI/src/TLS_UI.cpp:270
 msgid "Error"
 msgstr ""
 
-#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:17
-#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:17
-#: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
 msgid "Outer Identity"
 msgstr ""
 
-#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:28
-#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:28
-#: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:35
-#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:35
-#: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
 msgid "&True identity"
 msgstr ""
 
-#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:36
-#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:36
-#: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
 msgid "Use my true user name"
 msgstr ""
 
-#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:40
-#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:40
-#: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
 msgid "Use &empty outer identity"
 msgstr ""
 
-#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-#: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 msgid "Omit my user name and use @mydomain.org only"
 msgstr ""
 
-#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
-#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
-#: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
 msgid "&Custom outer identity:"
 msgstr ""
 
-#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:49
-#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:49
-#: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
 msgid "Specify custom outer identity"
 msgstr ""
 
-#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:54
-#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:54
-#: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
 msgid "Custom outer identity to use"
 msgstr ""
 
-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: lib/TTLS_UI/src/Module.cpp:395
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""
 
-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: lib/TTLS_UI/src/Module.cpp:397
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""
 
-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: lib/TTLS_UI/src/Module.cpp:533
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""
 
-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: lib/TTLS_UI/src/Module.cpp:536
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
 
-#: master/lib/TTLS_UI/src/TTLS_UI.cpp:118 ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:36
-#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:182
-#: ver1.1/lib/TTLS_UI/src/TTLS_UI.cpp:117
+#: lib/TTLS_UI/src/TTLS_UI.cpp:118
 msgid "Inner Authentication"
 msgstr ""
 
-#: master/lib/TTLS_UI/src/TTLS_UI.cpp:124
-#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:188
-#: ver1.1/lib/TTLS_UI/src/TTLS_UI.cpp:123
+#: lib/TTLS_UI/src/TTLS_UI.cpp:124
 msgid "Select inner authentication method from the list"
 msgstr ""
 
-#: master/lib/TTLS_UI/src/TTLS_UI.cpp:126
-#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:190
-#: ver1.1/lib/TTLS_UI/src/TTLS_UI.cpp:125
+#: lib/TTLS_UI/src/TTLS_UI.cpp:126
 msgid "PAP"
 msgstr ""
 
-#: master/lib/TTLS_UI/src/TTLS_UI.cpp:128
-#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:192
-#: ver1.1/lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:128
 msgid "MSCHAPv2"
 msgstr ""
 
-#: master/lib/TTLS_UI/src/TTLS_UI.cpp:130
-#: ver1.1/lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:130
 msgid "EAP-MSCHAPv2"
 msgstr ""
 
-#: master/lib/TTLS_UI/src/TTLS_UI.cpp:132
+#: lib/TTLS_UI/src/TTLS_UI.cpp:132
 msgid "EAP-GTC"
 msgstr ""
 
-#: master/lib/TTLS_UI/src/TTLS_UI.cpp:135
-#: ver1.1/lib/TTLS_UI/src/TTLS_UI.cpp:132
+#: lib/TTLS_UI/src/TTLS_UI.cpp:135
 msgid "Other EAP methods..."
 msgstr ""
 
-#: master/lib/TTLS_UI/src/TTLS_UI.cpp:141 ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:61
-#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:197
-#: ver1.1/lib/TTLS_UI/src/TTLS_UI.cpp:138
+#: lib/TTLS_UI/src/TTLS_UI.cpp:141
 msgid "Outer Authentication"
 msgstr ""
 
-#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr ""
 
-#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr ""
 
-#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
-#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
-#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
-#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
-#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
-#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "TTLS"
 msgstr ""
 
-#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
-#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
-#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
-#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
-#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
-#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "Tunneled Transport Layer Security"
 msgstr ""
diff --git a/EventMonitor/locale/EventMonitor.pot b/EventMonitor/locale/EventMonitor.pot
index 9845a09..00f535c 100644
--- a/EventMonitor/locale/EventMonitor.pot
+++ b/EventMonitor/locale/EventMonitor.pot
@@ -2,335 +2,219 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
+"POT-Creation-Date: 2019-08-12 14:04+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
-"X-Poedit-Basepath: ../../..\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: en_US\n"
+"X-Generator: Poedit 2.2.3\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/EventMonitor\n"
-"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
-"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
+"X-Poedit-SearchPath-0: .\n"
 
-#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:75 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
+#: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
+#: ETWLog.cpp:171
 msgid "Time"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
+#: ETWLog.cpp:172
 msgid "PID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
+#: ETWLog.cpp:173
 msgid "TID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
+#: ETWLog.cpp:174
 msgid "Source"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
+#: ETWLog.cpp:175
 msgid "Event"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
+#: ETWLog.cpp:232
 msgid "Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
+#: ETWLog.cpp:235
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
+#: ETWLog.cpp:239
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
-#: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
-#: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
+#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
-#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
-#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
-#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
-#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
+#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "E&xit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "Quits this program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
+#: Frame.cpp:69
 msgid "&Program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
+#: Frame.cpp:73
 msgid "&Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
-#: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
+#: Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
-#: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Select &All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Select &None"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
+#: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
+#: Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
-#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
+#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
+#: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:154
 msgid "Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:156
 msgid "Copy All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
+#: Frame.cpp:161
 msgid "Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
+#: Frame.cpp:189
 msgid "Trace Log"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Real-time display of internal events"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""
diff --git a/MSI/Base/locale/MSIBase.pot b/MSI/Base/locale/MSIBase.pot
index a5d5467..d83a018 100644
--- a/MSI/Base/locale/MSIBase.pot
+++ b/MSI/Base/locale/MSIBase.pot
@@ -2,76 +2,36 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
+"POT-Creation-Date: 2019-08-12 14:04+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
-"X-Poedit-Basepath: ../../../..\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: en_US\n"
+"X-Generator: Poedit 2.2.3\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/MSI/Base/Main\n"
-"X-Poedit-SearchPath-1: ver1.1/MSI/Base/Main\n"
-"X-Poedit-SearchPath-2: ver1.0/MSI/Base/Main\n"
+"X-Poedit-SearchPath-0: Main\n"
 
-#: master/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
-#: master/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: master/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
-#: master/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
+#: Main/en_US.ARM64.Release.LaunchCondition-2.idtx:4
+#: Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
+#: Main/en_US.x64.Release.LaunchCondition-2.idtx:4
 msgid "[ProductName] requires Windows Vista or later version of Windows."
 msgstr ""
 
-#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
-#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
-#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
-#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
-#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
-#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
-#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
-#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
-#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
-#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
-#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
-#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
+#: Main/en_US.ARM64.Release.Property-2.idtx:4
+#: Main/en_US.ARM64.Release.Property-2.idtx:5
+#: Main/en_US.Win32.Release.Property-2.idtx:4
+#: Main/en_US.Win32.Release.Property-2.idtx:5
+#: Main/en_US.x64.Release.Property-2.idtx:4
+#: Main/en_US.x64.Release.Property-2.idtx:5
 msgid "http://www.geant.org/"
 msgstr ""
 
-#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
-#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
-#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
-#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
-#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
-#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
-#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
-#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
+#: Main/en_US.ARM64.Release.Property-2.idtx:6
+#: Main/en_US.Win32.Release.Property-2.idtx:6
+#: Main/en_US.x64.Release.Property-2.idtx:6
 msgid "https://github.com/Amebis/GEANTLink/releases"
 msgstr ""
diff --git a/MSI/MSIBuild b/MSI/MSIBuild
index 332709b..320f7e9 160000
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
@@ -1 +1 @@
-Subproject commit 332709b1d0349ec52255725c5da8f78c08296cca
+Subproject commit 320f7e9ee5b96610579639a8096b29158b8b2efd
diff --git a/WLANManager/MSIBuild/build_all.bat b/WLANManager/MSIBuild/build_all.bat
new file mode 100644
index 0000000..5f0d02f
--- /dev/null
+++ b/WLANManager/MSIBuild/build_all.bat
@@ -0,0 +1,7 @@
+@echo off
+nmake.exe /ls All LANG=en_US CFG=Debug   PLAT=Win32
+nmake.exe /ls All LANG=en_US CFG=Debug   PLAT=x64
+nmake.exe /ls All LANG=en_US CFG=Debug   PLAT=ARM64
+nmake.exe /ls All LANG=en_US CFG=Release PLAT=Win32
+nmake.exe /ls All LANG=en_US CFG=Release PLAT=x64
+nmake.exe /ls All LANG=en_US CFG=Release PLAT=ARM64
diff --git a/WLANManager/MSIBuild/clean_all.bat b/WLANManager/MSIBuild/clean_all.bat
new file mode 100644
index 0000000..a9ea07b
--- /dev/null
+++ b/WLANManager/MSIBuild/clean_all.bat
@@ -0,0 +1,7 @@
+@echo off
+nmake.exe /ls Clean LANG=en_US CFG=Debug   PLAT=Win32
+nmake.exe /ls Clean LANG=en_US CFG=Debug   PLAT=x64
+nmake.exe /ls Clean LANG=en_US CFG=Debug   PLAT=ARM64
+nmake.exe /ls Clean LANG=en_US CFG=Release PLAT=Win32
+nmake.exe /ls Clean LANG=en_US CFG=Release PLAT=x64
+nmake.exe /ls Clean LANG=en_US CFG=Release PLAT=ARM64
diff --git a/WLANManager/locale/WLANManager.pot b/WLANManager/locale/WLANManager.pot
index 3cfc918..c66b677 100644
--- a/WLANManager/locale/WLANManager.pot
+++ b/WLANManager/locale/WLANManager.pot
@@ -2,23 +2,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: WLANManager\n"
-"POT-Creation-Date: 2016-11-08 11:51+0100\n"
+"POT-Creation-Date: 2019-08-12 14:09+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
-"X-Poedit-Basepath: ../../..\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: en_US\n"
+"X-Generator: Poedit 2.2.3\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/WLANManager\n"
-"X-Poedit-SearchPath-1: ver1.1/WLANManager\n"
-"X-Poedit-SearchPath-2: ver1.0/WLANManager\n"
+"X-Poedit-SearchPath-0: .\n"
 
+#: MSIBuild/en_US.ARM64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
@@ -26,6 +24,8 @@ msgstr ""
 msgid "WLAN Manager"
 msgstr ""
 
+#: MSIBuild/en_US.ARM64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
diff --git a/lib/wxExtend b/lib/wxExtend
index 306e91b..bfa2377 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit 306e91b3f617f3d755185ff0b5b391988a3817a7
+Subproject commit bfa23771d9532a479210d81c75420cd15a0b3c97