diff --git a/EAPMethods/locale/EAPMethods.pot b/EAPMethods/locale/EAPMethods.pot
index 81775a1..becf9e1 100644
--- a/EAPMethods/locale/EAPMethods.pot
+++ b/EAPMethods/locale/EAPMethods.pot
@@ -2,590 +2,725 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2016-11-07 12:40+0100\n"
+"POT-Creation-Date: 2016-11-08 11:55+0100\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.10\n"
-"X-Poedit-Basepath: ../..\n"
+"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-Basepath: ../../..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-3: lib/PAP_UI\n"
-"X-Poedit-SearchPath-4: lib/TLS_UI\n"
-"X-Poedit-SearchPath-5: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-6: EAPMethods\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/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-3: master/lib/PAP_UI\n"
+"X-Poedit-SearchPath-4: master/lib/TLS_UI\n"
+"X-Poedit-SearchPath-5: master/lib/TTLS_UI\n"
+"X-Poedit-SearchPath-6: master/EAPMethods\n"
+"X-Poedit-SearchPath-7: ver1.0/lib/EAPBase_UI\n"
+"X-Poedit-SearchPath-8: ver1.0/lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-9: ver1.0/lib/PAP_UI\n"
+"X-Poedit-SearchPath-10: ver1.0/lib/TLS_UI\n"
+"X-Poedit-SearchPath-11: ver1.0/lib/TTLS_UI\n"
+"X-Poedit-SearchPath-12: ver1.0/EAPMethods\n"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:37
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:38
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 msgid "Adds new provider"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:42
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:42
 msgid "-"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:43
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 msgid "Removes selected provider"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:47
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:47
 msgid "Advanced..."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:48
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:48
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:48
 msgid "Opens dialog with provider settings"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:665
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:665
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
 #, c-format
 msgid "%s User Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:240
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:244
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:244
 msgid "Use credentials from Credential &Manager:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: ver1.0/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 ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:253
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:260
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:261
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:265
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:292
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:265
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:266
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:293
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:266
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Use credentials from &profile configuration:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:277
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid "Select this option if you would like to store credentials as a part of  profile configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:285
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:335
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:345
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:355
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:360
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:364
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:400
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:411
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid "Describe your organization to customize user prompts.  When organization is introduced, end-users find program messages easier to understand and act."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:418
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:427
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:437
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:447
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:454
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:458
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:465
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:469
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:476
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:504
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:515
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid "Assign your organization a unique ID to allow sharing the same credential set across different network profiles."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:522
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:526
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:526
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:543
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:568
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:579
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid "Your configuration can be locked to prevent accidental modification by end-users. Users will only be allowed to enter credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:586
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid "&Lock this configuration and prevent any further modification via user interface."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:589
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:99
 #, c-format
 msgid "%s Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:173
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:174
 msgid "your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:193
 msgid "Open the default web browser"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:204
 msgid "Open your e-mail program"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:215
 msgid "Dial the phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:235
 #, c-format
 msgid "%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:236
 msgid "Your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:257
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:258
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:259
 msgid "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:260
 msgid "Previous attempt to connect failed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:261
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:250
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:282
 #, c-format
 msgid "The %s version installed on this computer logs credentials in visible and easy to read way."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
+#: master/lib/EAPBase_UI/src/EAP_UI.cpp:251
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:283
 msgid "Please, reconsider necessity to enter your credentials."
 msgstr ""
 
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
+#: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:17
 msgid "Inner EAP Method"
 msgstr ""
 
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
+#: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:28
 msgid "Select and configure inner EAP method"
 msgstr ""
 
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
+#: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:40
 msgid "&Settings"
 msgstr ""
 
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
+#: master/lib/EapHost_UI/src/EapHost_UI.cpp:59
 #, c-format
 msgid "Enumerating EAP methods failed (error %u, %s, %s)."
 msgstr ""
 
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
+#: master/lib/EapHost_UI/src/EapHost_UI.cpp:61
 #, c-format
 msgid "Enumerating EAP methods failed (error %u)."
 msgstr ""
 
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
+#: master/lib/EapHost_UI/src/EapHost_UI.cpp:136
 #, c-format
 msgid "Configuring EAP method failed (error %u, %s, %s)."
 msgstr ""
 
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
+#: master/lib/EapHost_UI/src/EapHost_UI.cpp:138
 #, c-format
 msgid "Configuring EAP method failed (error %u)."
 msgstr ""
 
-#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
+#: master/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
+#: ver1.0/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr ""
 
-#: lib/PAP_UI/src/PAP_UI.cpp:33
+#: master/lib/PAP_UI/src/PAP_UI.cpp:33 ver1.0/lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:17
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:17 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:28
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:28 ver1.0/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 ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:35
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:35 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:40
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:40 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:40
 msgid "Server's certificate must be issued by one of certificate authorities listed here"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:47
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:47 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:47
 msgid "Add CA from Store..."
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:48
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:48 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:48
 msgid "Adds a new certificate authority from the certificate store to the list"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:52
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:52 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:52
 msgid "Add CA from File..."
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:53
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:53 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:53
 msgid "Adds a new certificate authority from the file to the list"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:57
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:57 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:57
 msgid "&Remove CA"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid "A semicolon delimited list of acceptable server FQDN names; blank to skip name check; Unicode characters allowed"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:325
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:119 master/lib/TLS_UI/src/TLS_UI.cpp:325
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:317
 msgid "User Certificate"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid "Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:61 lib/EAPBase_UI/include/EAP_UI.h:861
-#: lib/EAPBase_UI/include/EAP_UI.h:870
+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: master/lib/EAPBase_UI/include/EAP_UI.h:861
+#: master/lib/EAPBase_UI/include/EAP_UI.h:870
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:803
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:812
 msgid "<empty>"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:252
+#: master/lib/TLS_UI/src/TLS_UI.cpp:252 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:246
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:253
+#: master/lib/TLS_UI/src/TLS_UI.cpp:253 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:247
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:254
+#: master/lib/TLS_UI/src/TLS_UI.cpp:254 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:248
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:255
+#: master/lib/TLS_UI/src/TLS_UI.cpp:255 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:249
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: master/lib/TLS_UI/src/TLS_UI.cpp:256 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:250
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:270
+#: master/lib/TLS_UI/src/TLS_UI.cpp:270 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:264
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:270
+#: master/lib/TLS_UI/src/TLS_UI.cpp:270 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:264
 msgid "Error"
 msgstr ""
 
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:17
 msgid "Outer Identity"
 msgstr ""
 
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:28
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:35
 msgid "&True identity"
 msgstr ""
 
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:36
 msgid "Use my true user name"
 msgstr ""
 
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:40
 msgid "Use &empty outer identity (RFC 4822)"
 msgstr ""
 
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""
 
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
 msgid "&Custom outer identity:"
 msgstr ""
 
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:49
 msgid "Specify custom outer identity"
 msgstr ""
 
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+#: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+#: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:54
 msgid "Custom outer identity to use"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:262 lib/TTLS_UI/src/Module.cpp:318
-#: lib/EAPBase_UI/include/EAP_UI.h:784
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:318
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: master/lib/EAPBase_UI/include/EAP_UI.h:784
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
 #, c-format
 msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:264 lib/TTLS_UI/src/Module.cpp:320
-#: lib/EAPBase_UI/include/EAP_UI.h:787
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:320
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: master/lib/EAPBase_UI/include/EAP_UI.h:787
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
 msgid "Writing credentials failed."
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:355
+#: master/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:357
+#: master/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:117
+#: master/lib/TTLS_UI/src/TTLS_UI.cpp:117 ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:36
+#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:182
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:123
+#: master/lib/TTLS_UI/src/TTLS_UI.cpp:123
+#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:188
 msgid "Select inner authentication method from the list"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:125
+#: master/lib/TTLS_UI/src/TTLS_UI.cpp:125
+#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:190
 msgid "PAP"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: master/lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:192
 msgid "MSCHAPv2"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: master/lib/TTLS_UI/src/TTLS_UI.cpp:129
 msgid "EAP-MSCHAPv2"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:132
+#: master/lib/TTLS_UI/src/TTLS_UI.cpp:132
 msgid "Other EAP methods..."
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:138
+#: master/lib/TTLS_UI/src/TTLS_UI.cpp:138 ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:61
+#: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:197
 msgid "Outer Authentication"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:284
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:362
+#: 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
+msgid "EAP Credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:284
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:302
 #, c-format
 msgid "Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:284
+#: master/lib/EAPBase_UI/include/EAP_UI.h:284
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:302
 msgid "Warning"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119
-msgid "EAP Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:632
+#: master/lib/EAPBase_UI/include/EAP_UI.h:632
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
 msgid "Provider Settings"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:807
+#: master/lib/EAPBase_UI/include/EAP_UI.h:807
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:846
+#: master/lib/EAPBase_UI/include/EAP_UI.h:846
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
 #, c-format
 msgid "<error %u>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:850
+#: master/lib/EAPBase_UI/include/EAP_UI.h:850
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
 msgid "<error>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:861 lib/EAPBase_UI/include/EAP_UI.h:870
+#: master/lib/EAPBase_UI/include/EAP_UI.h:861
+#: master/lib/EAPBase_UI/include/EAP_UI.h:870
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:803
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:812
 msgid "<blank ID>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:910
+#: master/lib/EAPBase_UI/include/EAP_UI.h:910
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
 msgid "&Remember"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:911
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
 msgid "Check if you would like to save credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1069
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1069
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
 msgid "<Your Organization>"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:69
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.h:69
 msgid "EAP Connection Configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:312
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:312
 msgid "EAP Identity Provider"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
-#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
-#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
-#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "TTLS"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
-#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
-#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
-#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: ver1.0/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 cbd1227..279d794 100644
--- a/EventMonitor/locale/EventMonitor.pot
+++ b/EventMonitor/locale/EventMonitor.pot
@@ -2,225 +2,269 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2016-11-04 14:10+0100\n"
+"POT-Creation-Date: 2016-11-08 11:55+0100\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.10\n"
-"X-Poedit-Basepath: ..\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-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPath-0: master/EventMonitor\n"
+"X-Poedit-SearchPath-1: ver1.0/EventMonitor\n"
 
-#: App.cpp:61 Frame.h:75 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
-#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
+#: master/EventMonitor/Frame.h:75 ver1.0/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
 msgid "Event Monitor"
 msgstr ""
 
-#: ETWLog.cpp:83
+#: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
-#: ETWLog.cpp:171
+#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
 msgid "Time"
 msgstr ""
 
-#: ETWLog.cpp:172
+#: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
 msgid "PID"
 msgstr ""
 
-#: ETWLog.cpp:173
+#: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
 msgid "TID"
 msgstr ""
 
-#: ETWLog.cpp:174
+#: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
 msgid "Source"
 msgstr ""
 
-#: ETWLog.cpp:175
+#: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
 msgid "Event"
 msgstr ""
 
-#: ETWLog.cpp:232
+#: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/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 ""
 
-#: ETWLog.cpp:235
+#: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""
 
-#: ETWLog.cpp:239
+#: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
 
-#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
+#: 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
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
 
-#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
+#: 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
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""
 
-#: Frame.cpp:65
+#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
 msgid "E&xit"
 msgstr ""
 
-#: Frame.cpp:65
+#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
 msgid "Quits this program"
 msgstr ""
 
-#: Frame.cpp:69
+#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
 msgid "&Program"
 msgstr ""
 
-#: Frame.cpp:73
+#: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
 msgid "&Copy"
 msgstr ""
 
-#: Frame.cpp:73 Frame.cpp:154
+#: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
+#: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""
 
-#: Frame.cpp:78
+#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""
 
-#: Frame.cpp:78 Frame.cpp:156
+#: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
+#: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""
 
-#: Frame.cpp:83 Frame.cpp:158
+#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
+#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
 msgid "Clear"
 msgstr ""
 
-#: Frame.cpp:83 Frame.cpp:158
+#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
+#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""
 
-#: Frame.cpp:90
+#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
 msgid "Select &All"
 msgstr ""
 
-#: Frame.cpp:90
+#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""
 
-#: Frame.cpp:94
+#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
 msgid "Select &None"
 msgstr ""
 
-#: Frame.cpp:94
+#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""
 
-#: Frame.cpp:97 Frame.cpp:142
+#: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
+#: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
 msgid "&Edit"
 msgstr ""
 
-#: Frame.cpp:101
+#: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr ""
 
-#: Frame.cpp:101 Frame.cpp:164
+#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
+#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""
 
-#: Frame.cpp:123 Frame.cpp:176
+#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
+#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
 msgid "Verbose"
 msgstr ""
 
-#: Frame.cpp:123 Frame.cpp:176
+#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
+#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""
 
-#: Frame.cpp:127 Frame.cpp:178
+#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
+#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
 msgid "Informational"
 msgstr ""
 
-#: Frame.cpp:127 Frame.cpp:178
+#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
+#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""
 
-#: Frame.cpp:131 Frame.cpp:180
+#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
+#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
 msgid "Warning"
 msgstr ""
 
-#: Frame.cpp:131 Frame.cpp:180
+#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
+#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""
 
-#: Frame.cpp:135 Frame.cpp:182
+#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
+#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
 msgid "Error"
 msgstr ""
 
-#: Frame.cpp:135 Frame.cpp:182
+#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
+#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""
 
-#: Frame.cpp:142 Frame.cpp:146
+#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
+#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""
 
-#: Frame.cpp:142 Frame.cpp:146
+#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
+#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
 
-#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
+#: 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
 msgid "View"
 msgstr ""
 
-#: Frame.cpp:146 Frame.cpp:149
+#: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
+#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
 msgid "&View"
 msgstr ""
 
-#: Frame.cpp:154
+#: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
 msgid "Copy"
 msgstr ""
 
-#: Frame.cpp:156
+#: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
 msgid "Copy All"
 msgstr ""
 
-#: Frame.cpp:161
+#: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
 msgid "Edit"
 msgstr ""
 
-#: Frame.cpp:164
+#: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""
 
-#: Frame.cpp:189
+#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
 msgid "Trace Log"
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.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.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: 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
 msgid "Real-time display of internal events"
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: 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
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""
diff --git a/MSI/Base/locale/MSIBase.pot b/MSI/Base/locale/MSIBase.pot
index f09c421..0078670 100644
--- a/MSI/Base/locale/MSIBase.pot
+++ b/MSI/Base/locale/MSIBase.pot
@@ -2,36 +2,59 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2016-11-04 14:10+0100\n"
+"POT-Creation-Date: 2016-11-08 11:55+0100\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.10\n"
-"X-Poedit-Basepath: ../Main\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-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPath-0: master/MSI/Base/Main\n"
+"X-Poedit-SearchPath-1: ver1.0/MSI/Base/Main\n"
 
-#: en_US.Win32.Debug.LaunchCondition-2.idtx:4
-#: en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: en_US.x64.Debug.LaunchCondition-2.idtx:4
-#: en_US.x64.Release.LaunchCondition-2.idtx:4
+#: 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
 msgid "[ProductName] requires Windows Vista or later version of Windows."
 msgstr ""
 
-#: en_US.Win32.Debug.Property-2.idtx:4 en_US.Win32.Debug.Property-2.idtx:5
-#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5
-#: en_US.x64.Debug.Property-2.idtx:4 en_US.x64.Debug.Property-2.idtx:5
-#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5
+#: 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
 msgid "http://www.geant.org/"
 msgstr ""
 
-#: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6
-#: en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
+#: 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
 msgid "https://github.com/Amebis/GEANTLink/releases"
 msgstr ""
diff --git a/WLANManager/locale/WLANManager.pot b/WLANManager/locale/WLANManager.pot
index f883a94..356900a 100644
--- a/WLANManager/locale/WLANManager.pot
+++ b/WLANManager/locale/WLANManager.pot
@@ -2,20 +2,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: WLANManager\n"
-"POT-Creation-Date: 2016-09-19 11:22+0200\n"
+"POT-Creation-Date: 2016-11-08 11:51+0100\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.9\n"
-"X-Poedit-Basepath: ..\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-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPath-0: master/WLANManager\n"
+"X-Poedit-SearchPath-1: ver1.0/WLANManager\n"
 
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4