Set version to 1.1d

Translation update
Update wxExtend module
2017-12-05 09:39:31 +01:00 · 2017-12-05 09:38:25 +01:00 · 2017-12-05 09:37:49 +01:00 · 2017-12-05 09:37:34 +01:00 · 2017-12-05 09:36:39 +01:00 · 2017-11-20 12:07:18 +01:00
167 changed files with 6737 additions and 12548 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
-/.vs
+/*.opensdf
+/*.suo
+/*.sdf
 /doc
+/ipch
--- a/CredWrite/CredWrite.rc
+++ b/CredWrite/CredWrite.rc
--- a/CredWrite/CredWrite.vcxproj
+++ b/CredWrite/CredWrite.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -30,102 +22,66 @@
    <ProjectGuid>{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>CredWrite</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="CredWrite.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="CredWrite.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="CredWrite.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="CredWrite.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="CredWrite.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="CredWrite.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -135,9 +91,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -156,7 +110,7 @@
    <ProjectReference Include="..\lib\TLS\build\TLS.vcxproj">
      <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/1
+++ b/1
@@ -794,7 +794,6 @@ EXCLUDE                = \
 	EventMonitor\res \
 	lib\EAPBase_UI\res \
 	lib\EapHost_UI\res \
-	lib\GTC_UI\res \
 	lib\TLS_UI\res \
 	lib\TTLS_UI\res \
 	lib\WinStd \
--- a/EAPMethods/EAPTTLS/EAPTTLS.rc
+++ b/EAPMethods/EAPTTLS/EAPTTLS.rc
--- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
+++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{331B6077-E3E2-4867-B93E-9D3F57280DE7}</ProjectGuid>
    <RootNamespace>EAPTTLS</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Debug.props" />
    <Import Project="EAPTTLS.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
-    <Import Project="EAPTTLS.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Debug.props" />
    <Import Project="EAPTTLS.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Release.props" />
    <Import Project="EAPTTLS.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
-    <Import Project="EAPTTLS.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Release.props" />
    <Import Project="EAPTTLS.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -129,9 +87,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -147,9 +103,6 @@
    <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\GTC\build\GTC.vcxproj">
-      <Project>{114a70bb-8698-4a0c-8c90-58f22edd8129}</Project>
-    </ProjectReference>
    <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
      <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
    </ProjectReference>
@@ -162,7 +115,7 @@
    <ProjectReference Include="..\..\lib\TTLS\build\TTLS.vcxproj">
      <Project>{ee0ef0d9-a475-4038-8637-5754724f65b0}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{DD7A97CA-F18E-43B7-95C4-D06E6A291624}</ProjectGuid>
    <RootNamespace>EAPTTLSUI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Debug.props" />
    <Import Project="EAPTTLSUI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
-    <Import Project="EAPTTLSUI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Debug.props" />
    <Import Project="EAPTTLSUI.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Release.props" />
    <Import Project="EAPTTLSUI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
-    <Import Project="EAPTTLSUI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\$(Platform).props" />
-    <Import Project="..\..\include\$(Configuration).props" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Release.props" />
    <Import Project="EAPTTLSUI.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -129,9 +87,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -153,12 +109,6 @@
    <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\GTC\build\GTC.vcxproj">
-      <Project>{114a70bb-8698-4a0c-8c90-58f22edd8129}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\lib\GTC_UI\build\GTC_UI.vcxproj">
-      <Project>{34680813-3a52-46fb-b5a8-1e4bbf770855}</Project>
-    </ProjectReference>
    <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
      <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
    </ProjectReference>
@@ -183,10 +133,10 @@
    <ProjectReference Include="..\..\lib\TTLS_UI\build\TTLS_UI.vcxproj">
      <Project>{42f0f0f4-c928-4860-a4e4-94991c2c3d90}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj">
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/EAPMethods/MSIBuild/Makefile
+++ b/EAPMethods/MSIBuild/Makefile
--- a/EAPMethods/locale/EAPMethods.pot
+++ b/EAPMethods/locale/EAPMethods.pot
--- a/EAPMethods/locale/bg_BG.po
+++ b/EAPMethods/locale/bg_BG.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,130 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Сигурни ли сте, че искате да изтриете за постоянно %s доставчика от "
-"конфигурацията?"
-
-#: 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
-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
-msgid "EAP Credentials"
-msgstr "EAP удостоверения за самоличност"
-
-#: 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
-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
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s Удостоверения за самолочност на потребителя"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Грешка при запис на удостоверения за самоличност в Credential Manager: %hs "
-"(error %u)"
-
-#: 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
-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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr ""
-"Изтриването на удостоверенията за самоличност е неуспешно (грешка %u)."
-
-#: 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
-#, c-format
-msgid "(error %u)"
-msgstr "(грешка %u)"
-
-#: 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
-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
-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
-msgid "(blank ID)"
-msgstr "(непопълнен ID)"
-
-#: 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
-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
-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
-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
@@ -198,6 +74,16 @@ msgstr "За напреднали ..."
 msgid "Opens dialog with provider settings"
 msgstr "Отваряне на диалог за настройки на доставчика"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Удостоверения за самолочност на потребителя"
+
 #: 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
@@ -509,17 +395,6 @@ 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
-msgid "EAP Connection Configuration"
-msgstr "Конфигуриране на EAP свързване"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -668,8 +543,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -773,18 +648,18 @@ msgstr "Добавяне към списъка на нов certificate authority
 msgid "&Remove CA"
 msgstr "&Премахнете CA"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Премахване на избраните certificate authorities от списъка"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -793,38 +668,38 @@ 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Например: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -832,6 +707,17 @@ msgstr ""
 "Вашата самоличност (username@domain) да препокрие един от сертификатите; или"
 " оставете непопълнено, за да използвате една от предоставените в сертификата"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -922,22 +808,43 @@ msgstr "Специфицирай клиентска външна самолич
 msgid "Custom outer identity to use"
 msgstr "Клиентска външна самоличност да се използва"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Грешка при запис на удостоверения за самоличност в Credential Manager: %hs "
+"(error %u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Записването на удостоверенията за самоличност е неуспешно "
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -988,6 +895,98 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr "Външна аутентикация"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP удостоверения за самоличност"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Сигурни ли сте, че искате да изтриете за постоянно %s доставчика от "
+"конфигурацията?"
+
+#: 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
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Настройки на доставчика"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+"Изтриването на удостоверенията за самоличност е неуспешно (грешка %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<грешка %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<грешка>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<непопълнен ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Запомнете"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr "Отметнете, ако желаете да запазите удостоверенията за замоличност"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr "Конфигуриране на EAP свързване"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/ca_ES.po
+++ b/EAPMethods/locale/ca_ES.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: eduki <ecercos@xtec.cat>, 2016\n"
 "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,128 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Segur que voleu esborrar permanentment el proveidor %s de la configuració?"
-
-#: 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
-msgid "Warning"
-msgstr "Alerta"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "Credencials EAP"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Ajustos del proveidor"
-
-#: 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
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s Credencials d'usuari"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Error escrivint les credencial a l'Administrador de credencials: %hs (error "
-"%u)"
-
-#: 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
-msgid "Writing credentials failed."
-msgstr "Ha fallat l'escriptura de les credencials."
-
-#: 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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Ha fallat l'esborrat de credencials (error %u)."
-
-#: 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
-#, 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
-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
-msgid "(empty)"
-msgstr "(buit)"
-
-#: 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
-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
-msgid "&Remember"
-msgstr "&Recordar"
-
-#: 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
-msgid "Check if you would like to save credentials"
-msgstr "Marqueu si voleu desar les credencials"
-
-#: 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
-msgid "(Your Organization)"
-msgstr "(La vostra organització)"
-
 #: 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
@@ -196,6 +74,16 @@ msgstr "Avançat..."
 msgid "Opens dialog with provider settings"
 msgstr "Obre formulari de configuració de proveidor"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Credencials d'usuari"
+
 #: 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
@@ -499,17 +387,6 @@ msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Alerta: un cop bloquejada, no ho podeu revertir des d'aquesta finestra!)"

-#: 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
-msgid "EAP Connection Configuration"
-msgstr "Configuració de la connexió EAP"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr "Proveïdor d'Identitat EAP"
-
 #: 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
@@ -657,8 +534,8 @@ msgstr "Ha fallat la configuració dels mètodes EAP (error %u, %s, %s)."
 msgid "Configuring EAP method failed (error %u)."
 msgstr "Ha fallat la configuració dels mètodes EAP (error %u)."

-#: master/lib/GTC_UI/include/GTC_UI.h:111
 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr "Repte GTC"

@@ -761,18 +638,18 @@ msgstr "Afegeix una nova autoritat de certificació des de d'un arxiu"
 msgid "&Remove CA"
 msgstr "&Eliminar CA"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Elimina les autoritats de certificació seleccionades"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "&Noms de servidors acceptats:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -780,38 +657,38 @@ msgstr ""
 "Llista de noms de servidors acceptats, separats per ;, en blanc per no "
 "comprovar noms. S'admeten caracters Unicode"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Per exemple: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr "Certificat d'usuari"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Sisplau escolliu el vostre &certificat per a l'autenticació."

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Certificat de client per a l'autenticació"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Personalitzar la &identitat:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -819,6 +696,17 @@ msgstr ""
 "La vostra identitat (identificador@domini) per substituir la indicada en el "
 "certificat; o en blanc per fer servir la continguda en el mateix"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<buit>"
+
 #: 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
 msgid "Add Certificate"
@@ -910,23 +798,44 @@ msgstr "Especifiqueu la identitat externa personalitzada"
 msgid "Custom outer identity to use"
 msgstr "Identitat externa a utilitzar"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Error escrivint les credencial a l'Administrador de credencials: %hs (error "
+"%u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Ha fallat l'escriptura de les credencials."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""
 "Ha fallat la interfície d'usuari de la identitat EAP  (error %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr "Ha fallat la interfície d'usuari de la identitat EAP  (error %u)."

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr "Ha fallat la interfície d'usuari interactiva EAP  (error %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Ha fallat la interfície d'usuari interactiva EAP  (error %u)."
@@ -977,6 +886,96 @@ msgstr "Altres mètodes EAP..."
 msgid "Outer Authentication"
 msgstr "Autenticació externa"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Credencials EAP"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Segur que voleu esborrar permanentment el proveidor %s de la configuració?"
+
+#: 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
+msgid "Warning"
+msgstr "Alerta"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Ajustos del proveidor"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Ha fallat l'esborrat de credencials (error %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<error %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<error>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<blank ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Recordar"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr "Marqueu si voleu desar les credencials"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<La vostra organització>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr "Configuració de la connexió EAP"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+msgstr "Proveïdor d'Identitat EAP"
+
 #: 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
--- a/EAPMethods/locale/cs_CZ.po
+++ b/EAPMethods/locale/cs_CZ.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Petr Adamec <p.b.adamec@gmail.com>, 2017\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/eduroam_devel/teams/11799/cs_CZ/)\n"
@@ -11,8 +11,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
-"X-Generator: Poedit 2.0.8\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/cy_UK.po
+++ b/EAPMethods/locale/cy_UK.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Welsh (https://www.transifex.com/eduroam_devel/teams/11799/cy/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/de_DE.po
+++ b/EAPMethods/locale/de_DE.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,129 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Sind Sie sicher, dass Sie den Identitätsprovider %s aus der Konfiguration "
-"löschen möchten?"
-
-#: 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
-msgid "Warning"
-msgstr "Warnung"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "EAP Nutzerdaten"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Identitätsprovider Einstellungen"
-
-#: 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
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s Benutzername"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Fehler beim Speichern der Nutzerdaten in der Anmeldeinformationsverwaltung: "
-"%hs (Fehler %u)"
-
-#: 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
-msgid "Writing credentials failed."
-msgstr "Speichern der Nutzerdaten fehlgeschlagen."
-
-#: 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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Löschen der Nutzerdaten fehlgeschlagen (Fehler %u)."
-
-#: 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
-#, c-format
-msgid "(error %u)"
-msgstr "(Fehler %u)"
-
-#: 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
-msgid "(error)"
-msgstr "(Fehler)"
-
-#: 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
-msgid "(empty)"
-msgstr "(leer)"
-
-#: 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
-msgid "(blank ID)"
-msgstr "(leere ID)"
-
-#: 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
-msgid "&Remember"
-msgstr "&Speichern"
-
-#: 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
-msgid "Check if you would like to save credentials"
-msgstr "Klicken Sie hier um ihre Anmeldedaten zu speichern"
-
-#: 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
-msgid "(Your Organization)"
-msgstr "(Ihre Organisation)"
-
 #: 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
@@ -197,6 +74,16 @@ msgstr "Fortgeschritten..."
 msgid "Opens dialog with provider settings"
 msgstr "Öffnet den Dialog mit den Einstellungen für den Anbieter"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Benutzername"
+
 #: 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
@@ -502,17 +389,6 @@ msgstr ""
 "(Warnung: sobald die Konfiguration gesperrt ist, können Sie sie hier nicht "
 "mehr verändern!)"

-#: 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
-msgid "EAP Connection Configuration"
-msgstr "EAP Verbindungseinstellungen"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr "EAP Identitätsprovider"
-
 #: 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
@@ -661,8 +537,8 @@ msgstr "Konfigurieren der EAP Methode fehlgeschlagen (Fehler %u, %s, %s)."
 msgid "Configuring EAP method failed (error %u)."
 msgstr "Konfigurieren der EAP Methode fehlgeschlagen (Fehler %u)."

-#: master/lib/GTC_UI/include/GTC_UI.h:111
 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -766,18 +642,18 @@ msgstr "Fügt eine Zertifizierungsstelle aus einer Datei zur Liste hinzu"
 msgid "&Remove CA"
 msgstr "&CA entfernen"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Entfernt die ausgewählte Zertifizierungsstelle aus der Liste"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "&Akzeptable Servernamen:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -785,38 +661,38 @@ msgstr ""
 "Eine durch Semikola getrennte Liste der akzeptablen Servernamen; wenn leer, "
 "wird die Namensüberprüfung übersrungen; Unicode Buchstaben sind erlaubt"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Beispiel: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr "Benutzerzertifikat"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Bitte wählen Sie ihr Benutzer&zertifikat für die Identifizierung aus"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Nutzerzertifikat für Anmeldung"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Ab&weichender Nutzername:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -825,6 +701,17 @@ msgstr ""
 "Benutzerzertifikat; oder leer lassen um den Namen im Benutzerzertifikat zu "
 "verwenden"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<leer>"
+
 #: 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
 msgid "Add Certificate"
@@ -919,23 +806,44 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr "Zu verwendender Nutzername"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Fehler beim Speichern der Nutzerdaten in der Anmeldeinformationsverwaltung: "
+"%hs (Fehler %u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Speichern der Nutzerdaten fehlgeschlagen."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""
 "Anzeigen des Dialogs für EAP Identität fehlgeschlagen (Fehler %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr "Anzeigen des Dialogs für EAP Identität fehlgeschlagen (Fehler %u)."

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -987,6 +895,97 @@ msgstr "Andere EAP Methoden..."
 msgid "Outer Authentication"
 msgstr "Unverschlüsselte Anmeldungsphase"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP Nutzerdaten"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Sind Sie sicher, dass Sie den Identitätsprovider %s aus der Konfiguration "
+"löschen möchten?"
+
+#: 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
+msgid "Warning"
+msgstr "Warnung"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Identitätsprovider Einstellungen"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Löschen der Nutzerdaten fehlgeschlagen (Fehler %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<Fehler %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<Fehler>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<leere ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Speichern"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr "Klicken Sie hier um ihre Anmeldedaten zu speichern"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<Ihre Organisation>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr "EAP Verbindungseinstellungen"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+msgstr "EAP Identitätsprovider"
+
 #: 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
--- a/EAPMethods/locale/el_GR.po
+++ b/EAPMethods/locale/el_GR.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Vicky Kons <vickyk@admin.grnet.gr>, 2017\n"
 "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,129 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %s από τη "
-"διαμόρφωση;"
-
-#: 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
-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
-msgid "EAP Credentials"
-msgstr "Διαπιστευτήρια EAP"
-
-#: 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
-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
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s Διαπιστευτήρια Χρήστη"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Σφάλμα κατά την εγγραφή των διαπιστευτηρίων στο Credential Manager: %hs "
-"(σφάλμα %u)"
-
-#: 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
-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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Η διαγραφή των διαπιστευτηρίων απέτυχε (σφάλμα %u)."
-
-#: 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
-#, c-format
-msgid "(error %u)"
-msgstr "(σφάλμα %u)"
-
-#: 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
-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
-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
-msgid "(blank ID)"
-msgstr "(κενό ID)"
-
-#: 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
-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
-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
-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
@@ -197,6 +74,16 @@ msgstr "Προχωρημένο..."
 msgid "Opens dialog with provider settings"
 msgstr "Ανοίγει ένα παράθυρο διαλόγου με τις ρυθμίσεις του παρόχου"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Διαπιστευτήρια Χρήστη"
+
 #: 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
@@ -503,17 +390,6 @@ 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
-msgid "EAP Connection Configuration"
-msgstr "Διαμόρφωση σύνδεσης EAP"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr "Πάροχος υπηρεσιών EAP"
-
 #: 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
@@ -665,8 +541,8 @@ msgstr "Απέτυχε η διαμόρφωση της μεθόδου EAP (σφά
 msgid "Configuring EAP method failed (error %u)."
 msgstr "Απέτυχε η διαμόρφωση της μεθόδου EAP (σφάλμα %u)."

-#: master/lib/GTC_UI/include/GTC_UI.h:111
 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr "GTC Challenge"

@@ -770,18 +646,18 @@ msgstr "Προσθέτει μια νέα αρχή πιστοποιητικού
 msgid "&Remove CA"
 msgstr "&Αφαιρέστε CA"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Αποδεκτά &ονόματα server:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -790,41 +666,41 @@ msgstr ""
 "εξυπηρετητών· αφήστε κενό για να παρακάμψετε την επιλογή ονόματος· "
 "επιτρέπονται οι χαρακτήρες unicode"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Παράδειγμα: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -832,6 +708,17 @@ msgstr ""
 "Η ταυτότητά σας (username@domain) για να παρακάμψετε ένα πιστοποιητικό· ή "
 "κενό για να χρησιμοποιήσετε όποια ταυτότητα παρέχεται από πιστοποιητικό"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -925,23 +812,44 @@ msgstr "Καθορίστε τη διαμόρφωση της εξωτερικής
 msgid "Custom outer identity to use"
 msgstr "Προσαρμόστε την εξωτερική ταυτότητα για να την χρησιμοποιήσετε"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Σφάλμα κατά την εγγραφή των διαπιστευτηρίων στο Credential Manager: %hs "
+"(σφάλμα %u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Η εγγραφή των διαπιστευτηρίων απέτυχε."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr "Απέτυχη η επίκληση της EAP UI ταυτότητας (σφάλμα %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr "Απέτυχη η επίκληση της EAP UI ταυτότητας (σφάλμα %u)."

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""
 "Η επίκληση της διαδραστικότητας του EAP UI απέτυχε (error %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Η επίκληση της διαδραστικότητας του EAP UI απέτυχε (error %u)."
@@ -992,6 +900,97 @@ msgstr "Άλλοι μέθοδοι EAP..."
 msgid "Outer Authentication"
 msgstr "Ταυτοποίηση εξωτερικής ταυτότητας"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Διαπιστευτήρια EAP"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %s από τη "
+"διαμόρφωση;"
+
+#: 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
+msgid "Warning"
+msgstr "Προειδοποίηση"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Ρυθμίσεις παρόχων"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Η διαγραφή των διαπιστευτηρίων απέτυχε (σφάλμα %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<σφάλμα %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<σφάλμα>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<κενό ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Υπενθύμιση"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr "Ελέγξτε αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr "Διαμόρφωση σύνδεσης EAP"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+msgstr "Πάροχος υπηρεσιών EAP"
+
 #: 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
--- a/EAPMethods/locale/es_ES.po
+++ b/EAPMethods/locale/es_ES.po
@@ -3,16 +3,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Alberto Martínez Setién, 2017\n"
+"Last-Translator: Alberto Martínez <alberto_martinez@deusto.es>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,128 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"¿está seguro de que quiere borrar permanentemente la configuración del "
-"proveedor %s?"
-
-#: 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
-msgid "Warning"
-msgstr "Advertencia"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "Credenciales EAP"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Configuración del proveedor"
-
-#: 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
-#, c-format
-msgid "%s User Credentials"
-msgstr "Credenciales %s de usuario"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Error escribiendo credenciales en el Gestor de Credenciales: %hs (error %u)"
-
-#: 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
-msgid "Writing credentials failed."
-msgstr "Fallo escribiendo credenciales."
-
-#: 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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Fallo al borrar credenciales (error %u)."
-
-#: 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
-#, c-format
-msgid "(error %u)"
-msgstr "(error %u)"
-
-#: 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
-msgid "(error)"
-msgstr "(error)"
-
-#: 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
-msgid "(empty)"
-msgstr "(vació)"
-
-#: 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
-msgid "(blank ID)"
-msgstr "(ID en blanco)"
-
-#: 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
-msgid "&Remember"
-msgstr "&Recordar"
-
-#: 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
-msgid "Check if you would like to save credentials"
-msgstr "Marca si quieres guardar las credenciales"
-
-#: 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
-msgid "(Your Organization)"
-msgstr "(Su organización)"
-
 #: 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
@@ -196,6 +74,16 @@ msgstr "Avanzado..."
 msgid "Opens dialog with provider settings"
 msgstr "Abrir diálogo configuración de proveedores"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+msgstr "Credenciales %s de usuario"
+
 #: 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
@@ -503,17 +391,6 @@ msgstr ""
 "(Advertencia: ¡Una vez bloqueada, no podrá volver atrás usando este "
 "diálogo!)"

-#: 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
-msgid "EAP Connection Configuration"
-msgstr "Configuración de conexiones EAP"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr "Proveedor de identidad EAP"
-
 #: 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
@@ -663,8 +540,8 @@ msgstr "Fallo al configurar el método EAP (error %u, %s, %s)."
 msgid "Configuring EAP method failed (error %u)."
 msgstr "Fallo al configurar el método EAP (error %u)."

-#: master/lib/GTC_UI/include/GTC_UI.h:111
 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr "Reto GTC"

@@ -769,18 +646,18 @@ msgstr ""
 msgid "&Remove CA"
 msgstr "&Borrar una CA"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Borrar las autoridades de certificación de la lista"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Nombres de servidor &aceptables:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -788,38 +665,38 @@ msgstr ""
 "Una lista separada por punto y coma de nombres de servidor FQDN aceptables; "
 "blanco para evitar comprobación de nombre; se admiten caracteres Unicode"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Ejemplo: foo.bar.com;servidor2.bar.com)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr "Certificado de usuario"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Por favor seleccione su &certificado a usar para la autenticación."

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Certificado de cliente a utilizar para autenticación"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "&Identidad personalizada:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -827,6 +704,17 @@ msgstr ""
 "Su identidad (usuario@dominio) que sobreescribirá la del certificado; o en "
 "blanco para usar la proporcionada en el certificado"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<vació>"
+
 #: 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
 msgid "Add Certificate"
@@ -919,24 +807,44 @@ msgstr "Especificar identidad externa personalizada"
 msgid "Custom outer identity to use"
 msgstr "Identidad externa personalizada a usar"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Error escribiendo credenciales en el Gestor de Credenciales: %hs (error %u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Fallo escribiendo credenciales."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""
 "Fallo al lanzar la interfaz de usuario de identidad EAP (error %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr "Fallo al lanzar la interfaz de usuario de identidad EAP (error %u)."

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""
 "Fallo al lanzar la interfaz de usuario interactiva EAP (error %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Fallo al lanzar la interfaz de usuario interactiva EAP (error %u)."
@@ -987,6 +895,97 @@ msgstr "Otros métodos EAP..."
 msgid "Outer Authentication"
 msgstr "Autenticación externa"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Credenciales EAP"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"¿está seguro de que quiere borrar permanentemente la configuración del "
+"proveedor %s?"
+
+#: 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
+msgid "Warning"
+msgstr "Advertencia"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Configuración del proveedor"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Fallo al borrar credenciales (error %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<error %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<error>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<ID en blanco>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Recordar"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr "Marca si quieres guardar las credenciales"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<Su organización>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr "Configuración de conexiones EAP"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+msgstr "Proveedor de identidad EAP"
+
 #: 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
--- a/EAPMethods/locale/eu_ES.po
+++ b/EAPMethods/locale/eu_ES.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Basque (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/eu_ES/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/fi_FI.po
+++ b/EAPMethods/locale/fi_FI.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/eduroam_devel/teams/11799/fi_FI/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/fr_CA.po
+++ b/EAPMethods/locale/fr_CA.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: French (Canada) (https://www.transifex.com/eduroam_devel/teams/11799/fr_CA/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/fr_FR.po
+++ b/EAPMethods/locale/fr_FR.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: French (France) (https://www.transifex.com/eduroam_devel/teams/11799/fr_FR/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr_FR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/gl_ES.po
+++ b/EAPMethods/locale/gl_ES.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Galician (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/gl_ES/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/hr_HR.po
+++ b/EAPMethods/locale/hr_HR.po
@@ -3,16 +3,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Dubravko Penezic <dpenezic@gmail.com>, 2016\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/eduroam_devel/teams/11799/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr_HR\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,129 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Da li ste sigurni da želite za stalno opbrisati davatelja usluge %s iz "
-"konfiguracije ? "
-
-#: 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
-msgid "Warning"
-msgstr "Upozorenje"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "EAP korisničke oznake"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Postavke davatelja usluge"
-
-#: 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
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s korisničke vjerodajnice"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Greška pri zapisivanju podataka o identitetu u Credential Manager: %hs "
-"(error %u)"
-
-#: 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
-msgid "Writing credentials failed."
-msgstr "Zapisivanje podataka o identitetu nije uspijelo."
-
-#: 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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Brisanje podataka o identitetu nije uspijelo (error %u)."
-
-#: 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
-#, c-format
-msgid "(error %u)"
-msgstr "(greška %u)"
-
-#: 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
-msgid "(error)"
-msgstr "(greška)"
-
-#: 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
-msgid "(empty)"
-msgstr "(prazno)"
-
-#: 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
-msgid "(blank ID)"
-msgstr "(prazni ID)"
-
-#: 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
-msgid "&Remember"
-msgstr "&Podsjeti"
-
-#: 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
-msgid "Check if you would like to save credentials"
-msgstr "Provjerite želite li spremiti vjerodajnice"
-
-#: 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
-msgid "(Your Organization)"
-msgstr "(Vaša organizacija)"
-
 #: 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
@@ -197,18 +74,27 @@ msgstr "Napredno..."
 msgid "Opens dialog with provider settings"
 msgstr "Otvaranje dialoga s postavkama davatelja usluge"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
-"Odaberite izvor na kojem su pohranjene vaše vjerodajnice za povezivanje."

 #: 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
 msgid "Use credentials from Credential &Manager"
-msgstr "Upotrijebite vjerodajnice iz &Credential i upravitelja"
+msgstr ""

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:245
@@ -217,8 +103,6 @@ msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
 msgstr ""
-"Odaberite ovu opciju ako želite koristiti vjerodajnice pohranjene u Windows "
-"Credential Manager-u"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:255
 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:299
@@ -227,19 +111,19 @@ msgstr ""
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:255
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:299
 msgid "Identity:"
-msgstr "Identitet"
+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
 msgid "Your present credentials stored in Windows Credential Manager"
-msgstr "Vaše vjerodajnice pohranjene u sustavu 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
 msgid "&Clear Credentials"
-msgstr "&Izbriši vjerodajnice"
+msgstr "&Obriši korisničke podatke"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:273
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:273
@@ -273,7 +157,7 @@ msgstr "Odaberi ako je potrebno postaviti korisničke podatke"
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:288
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:288
 msgid "Use credentials from &profile configuration"
-msgstr "Upotrijebite vjerodajnice iz konfiguracije &profila"
+msgstr ""

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:289
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:289
@@ -282,20 +166,18 @@ msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
-"Odaberite ovu opciju ako želite pohraniti vjerodajnice kao dio konfiguracije"
-" profila"

 #: 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
 msgid "Profile configuration credentials"
-msgstr "Potvrde o konfiguraciji profila"
+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
 msgid "User ID and Password"
-msgstr "Korisnički ID i lozinka"
+msgstr ""

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:369
@@ -335,7 +217,7 @@ msgstr "Korisnička oznaka"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:433
 msgid "Please provide your user ID."
-msgstr "Unesite korisničko ime i zaporku."
+msgstr ""

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:473
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:424
@@ -493,17 +375,6 @@ msgstr ""
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr "(Upozorenje: Jednom zaključano, nemože se otključati ovim dijalogom!)"

-#: 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
-msgid "EAP Connection Configuration"
-msgstr "Parametri EAP konekcije"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr "Davatelj EAP identiteta"
-
 #: 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
@@ -602,107 +473,105 @@ msgid ""
 "The %s version installed on this computer logs credentials in visible and "
 "easy to read way."
 msgstr ""
-"%s verzija instalirana na ovom računalu prijavljuje vjerodajnice na vidljiv "
-"i jednostavan način za čitanje."

 #: 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
 msgid "Please, reconsider necessity to enter your credentials."
-msgstr "Molimo, ponovno razmotrite potrebu za unos vjerodajnica."
+msgstr ""

 #: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:17
 #: ver1.1/lib/EapHost_UI/res/wxEapHost_UI.cpp:17
 msgid "Inner EAP Method"
-msgstr "Unutarnja EAP metoda"
+msgstr ""

 #: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:28
 #: ver1.1/lib/EapHost_UI/res/wxEapHost_UI.cpp:28
 msgid "Select and configure inner EAP method"
-msgstr "Odaberite i konfigurirajte unutarnju EAP metodu"
+msgstr ""

 #: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:40
 #: ver1.1/lib/EapHost_UI/res/wxEapHost_UI.cpp:40
 msgid "&Settings"
-msgstr "&Postavke"
+msgstr ""

 #: master/lib/EapHost_UI/src/EapHost_UI.cpp:59
 #: ver1.1/lib/EapHost_UI/src/EapHost_UI.cpp:59
 #, c-format
 msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Nije uspjelo nabrajanje metoda EAP (pogreška% u,% s,% s)."
+msgstr ""

 #: master/lib/EapHost_UI/src/EapHost_UI.cpp:61
 #: ver1.1/lib/EapHost_UI/src/EapHost_UI.cpp:61
 #, c-format
 msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Nije uspjelo nabrajanje metoda EAP (pogreška% u)."
+msgstr ""

 #: master/lib/EapHost_UI/src/EapHost_UI.cpp:136
 #: ver1.1/lib/EapHost_UI/src/EapHost_UI.cpp:136
 #, c-format
 msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Nije uspjela konfiguracija EAP metode (pogreška% u,% s,% s)."
+msgstr ""

 #: master/lib/EapHost_UI/src/EapHost_UI.cpp:138
 #: ver1.1/lib/EapHost_UI/src/EapHost_UI.cpp:138
 #, c-format
 msgid "Configuring EAP method failed (error %u)."
-msgstr "Nije uspjela konfiguracija EAP metode (pogreška% u)."
+msgstr ""

-#: master/lib/GTC_UI/include/GTC_UI.h:111
 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
-msgstr "GTC izazov"
+msgstr ""

 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:26
 msgid "Please provide your response."
-msgstr "Navedite odgovor."
+msgstr ""

 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:38
 msgid "Server challenge"
-msgstr "Izazov poslužitelja"
+msgstr ""

 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:43
 msgid "Enter your response here"
-msgstr "Unesite svoj odgovor ovdje"
+msgstr ""

 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:70
 msgid "EAP-GTC authentication &mode:"
-msgstr "EAP-GTC autentifikacija i &način rada:"
+msgstr ""

 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:75
 msgid "Select EAP-GTC authentication mode from the list"
-msgstr "Na popisu odaberite način provjere autentikacije EAP-GTC"
+msgstr ""

 #: master/lib/GTC_UI/src/GTC_UI.cpp:39
 msgid "Challenge/Response"
-msgstr "Izazov / Odgovor"
+msgstr ""

 #: master/lib/GTC_UI/src/GTC_UI.cpp:41
 msgid "Password"
-msgstr "Lozinka"
+msgstr ""

 #: master/lib/GTC_UI/src/GTC_UI.cpp:119
 #, c-format
 msgid "%s Challenge"
-msgstr "$s Izazov"
+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
 msgid "MSCHAPv2 User ID and Password"
-msgstr "Korisnički ID i lozinka MSCHAPv2"
+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
 msgid "PAP User ID and Password"
-msgstr "PAP User ID i Lozinka"
+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
 msgid "Server Trust"
-msgstr "Povjerenje poslužitelja"
+msgstr "Server Trust"

 #: 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
@@ -722,7 +591,7 @@ msgstr "Prihvatljivi certifikat autoriteti: "
 msgid ""
 "Server's certificate must be issued by one of certificate authorities listed"
 " here"
-msgstr "Certifikat poslužitelja mora izdati ovlašteni izdavatelj certifikata"
+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
@@ -750,18 +619,18 @@ msgstr "Dodavanje novog certifikat autoriteta na listu"
 msgid "&Remove CA"
 msgstr "&Micanje CA"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "MIcanje odabranih certifikat autoriteta s liste"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Prihvatljiv &naziv poslužitelja "

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -769,38 +638,38 @@ msgstr ""
 "Točka-zarez odvaja listu FQDN naziva, prazno polje ne provjerava naziv; "
 "moguće korištenje Unicode znakova"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Primjer: pero.hr;freeradius.primjer.hr)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
-msgstr "Korisnički certifikat"
+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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
-msgstr "Odaberite &certifikat koji ćete koristiti za autentikaciju."
+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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Klijentski certifikat za autentikaciju"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
-msgstr "Samostalno odabrani &identitet:"
+msgstr "Samostalno odabrani &identitet"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -808,6 +677,17 @@ msgstr ""
 "Vaš korisnički podatak (pero@pero.hr) će se koristiti umjesto podataka iz "
 "certifikata ili ostavite prazno kako bi se koristili podaci iz certifikata"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<prazno>"
+
 #: 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
 msgid "Add Certificate"
@@ -889,7 +769,7 @@ msgstr ""
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
 msgid "&Custom outer identity:"
-msgstr "&Samostalno odabrani vanjski identitet:"
+msgstr "&Samostalno odabrani vanjski identitet"

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:49
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:49
@@ -903,25 +783,46 @@ msgstr "Specijalni vanjski identitet"
 msgid "Custom outer identity to use"
 msgstr "Samostalno odabrani vanjski identitet koji će se koristiti"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Greška pri zapisivanju podataka o identitetu u Credential Manager: %hs "
+"(error %u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Zapisivanje podataka o identitetu nije uspijelo."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
-msgstr "Neuspjelo otvaranje korisničkog sučelja EAP identiteta."
+msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "Otvaranje korisničkog sučelja za identitet EAP nije uspjelo"
+msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
-msgstr "Neuspješno pokretanje interaktivnog korisničkog sučelja EAP."
+msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr "Pokretanje EAP interaktivnog korisničkog sučelja nije uspjelo."
+msgstr ""

 #: master/lib/TTLS_UI/src/TTLS_UI.cpp:118
 #: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:36
@@ -960,7 +861,7 @@ msgstr "EAP-GTC"
 #: master/lib/TTLS_UI/src/TTLS_UI.cpp:135
 #: ver1.1/lib/TTLS_UI/src/TTLS_UI.cpp:132
 msgid "Other EAP methods..."
-msgstr "Ostale EAP metode..."
+msgstr ""

 #: master/lib/TTLS_UI/src/TTLS_UI.cpp:141
 #: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:61
@@ -969,6 +870,97 @@ msgstr "Ostale EAP metode..."
 msgid "Outer Authentication"
 msgstr "Vanjska autentikacija"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP korisničke oznake"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Da li ste sigurni da želite za stalno opbrisati davatelja usluge %s iz "
+"konfiguracije ? "
+
+#: 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
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Postavke davatelja usluge"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Brisanje podataka o identitetu nije uspijelo (error %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<greška %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<greška>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<prazni ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Podsjeti"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<Vasa organizacija>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr "Parametri EAP konekcije"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/hu_HU.po
+++ b/EAPMethods/locale/hu_HU.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/eduroam_devel/teams/11799/hu/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/is_IS.po
+++ b/EAPMethods/locale/is_IS.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Icelandic (https://www.transifex.com/eduroam_devel/teams/11799/is/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/it_IT.po
+++ b/EAPMethods/locale/it_IT.po
--- a/EAPMethods/locale/ko_KR.po
+++ b/EAPMethods/locale/ko_KR.po
@@ -439,7 +439,7 @@ msgid "Use my true user name"
 msgstr ""

 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
-msgid "Use &empty outer identity"
+msgid "Use &empty outer identity (RFC 4822)"
 msgstr ""

 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
@@ -510,23 +510,23 @@ msgstr ""

 #: lib/EAPBase_UI/include/EAP_UI.h:739
 #, c-format
-msgid "(error %u)"
+msgid "<error %u>"
 msgstr ""

 #: lib/EAPBase_UI/include/EAP_UI.h:743
-msgid "(error)"
+msgid "<error>"
 msgstr ""

 #: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764
-msgid "(empty)"
+msgid "<empty>"
 msgstr ""

 #: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764
-msgid "(blank ID)"
+msgid "<blank ID>"
 msgstr ""

 #: lib/EAPBase_UI/include/EAP_UI.h:964
-msgid "(Your Organization)"
+msgid "<Your Organization>"
 msgstr ""

 #: lib/EAPBase_UI/res/wxEAP_UI.h:69
--- a/EAPMethods/locale/lt_LT.po
+++ b/EAPMethods/locale/lt_LT.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Lithuanian (https://www.transifex.com/eduroam_devel/teams/11799/lt/)\n"
@@ -11,8 +11,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
-"X-Generator: Poedit 2.0.8\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,126 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Ar tikrai norite visam laikui pašalinti teikėją „%s“ iš konfigūracijos?"
-
-#: 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
-msgid "Warning"
-msgstr "Įspėjimas"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "EAP kredencialai"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Teikėjo parametrai"
-
-#: 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
-#, 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr "Klaida įrašant kredencialus į Kredencialų tvarkytuvą: %hs (klaida %u)"
-
-#: 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
-msgid "Writing credentials failed."
-msgstr "Kredencialų įrašyti nepavyko."
-
-#: 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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Kredencialų pašalinti nepavyko (klaida %u)."
-
-#: 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
-#, 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
-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
-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
-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
-msgid "&Remember"
-msgstr "Įsi&minti"
-
-#: 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
-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
-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
@@ -194,6 +74,16 @@ msgstr "Išsamiau…"
 msgid "Opens dialog with provider settings"
 msgstr "Atverti teikėjo parametrų langą"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -490,17 +380,6 @@ msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Įspėjimas: užrakinę konfigūraciją, jos atrakinti šiame lange nebegalėsite!)"

-#: 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
-msgid "EAP Connection Configuration"
-msgstr "EAP ryšio konfigūracija"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -649,8 +528,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -751,18 +630,18 @@ msgstr "Įtraukti į sąrašą naują sertifikavimo tarnybą iš failo"
 msgid "&Remove CA"
 msgstr "&Šalinti ST"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Pašalinti pažymėtą sertifikavimo tarnybą iš sąrašo"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Patikimi serverio &vardai:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -770,38 +649,38 @@ msgstr ""
 "Kabliataškiais atskirtų patikimų serverių FQDN vardų sąrašas. Palikite "
 "tuščią, jei norite praleisti šį patikrinimą. Unikodo rašmenys leidžiami"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Pvz.: vienas.įstaiga.lt;du.įstaiga.lt)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Kliento sertifikatas autentifikavimui"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "&Tinkinta tapatybė:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -809,6 +688,17 @@ msgstr ""
 "Jūsų tapatybė (vartotojas@domenas), naudotina vietoje nurodytos sertifikate."
 " Palikite lauką tuščią sertifikate nurodytai tapatybei naudoti"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<tuščias>"
+
 #: 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
 msgid "Add Certificate"
@@ -901,22 +791,41 @@ msgstr "Nurodykite tinkintą išorinę tapatybę"
 msgid "Custom outer identity to use"
 msgstr "Naudotina tinkinta išorinė tapatybė"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr "Klaida įrašant kredencialus į Kredencialų tvarkytuvą: %hs (klaida %u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Kredencialų įrašyti nepavyko."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -967,6 +876,96 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr "Išorinis autentifikavimas"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP kredencialai"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Ar tikrai norite visam laikui pašalinti teikėją „%s“ iš konfigūracijos?"
+
+#: 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
+msgid "Warning"
+msgstr "Įspėjimas"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Teikėjo parametrai"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Kredencialų pašalinti nepavyko (klaida %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<klaida %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<klaida>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<tuščias ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "Įsi&minti"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<Jūsų organizacija>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr "EAP ryšio konfigūracija"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/nb_NO.po
+++ b/EAPMethods/locale/nb_NO.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Tom Ivar Myren <tom.myren@uninett.no>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,128 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Er du sikker på at du vil fjerne tilbyder %s permanent fra konfigurasjonen?"
-
-#: 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
-msgid "Warning"
-msgstr "Advarsel"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "EAP brukeropplysninger"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Tilbyder innstillinger"
-
-#: 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
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s Påloggingsinformasjon"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Feil under skriving av brukeropplysninger til Credential Manager: %hs (feil "
-"%u)"
-
-#: 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
-msgid "Writing credentials failed."
-msgstr "Skriving av brukeropplysninger feilet."
-
-#: 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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Sletting av brukeropplysninger feilet (feil %u)"
-
-#: 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
-#, c-format
-msgid "(error %u)"
-msgstr "(feil %u)"
-
-#: 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
-msgid "(error)"
-msgstr "(feil)"
-
-#: 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
-msgid "(empty)"
-msgstr "(tom)"
-
-#: 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
-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
-msgid "&Remember"
-msgstr "&Husk"
-
-#: 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
-msgid "Check if you would like to save credentials"
-msgstr "Huk av om du vil lagre brukeropplysninger "
-
-#: 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
-msgid "(Your Organization)"
-msgstr "(Din organisasjon)"
-
 #: 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
@@ -196,6 +74,16 @@ msgstr "Avansert..."
 msgid "Opens dialog with provider settings"
 msgstr "Åpner dialog med tilbyder innstillinger"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Påloggingsinformasjon"
+
 #: 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
@@ -493,17 +381,6 @@ msgstr ""
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr "(Advarsel: Når låst, kan du ikke gå tilbake til denne dialogen!)"

-#: 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
-msgid "EAP Connection Configuration"
-msgstr "Konfigurasjon av EAP forbindelse"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr "EAP Identitetstilbyder"
-
 #: 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
@@ -651,8 +528,8 @@ msgstr "Konfigurasjon av EAP metode feilet (feil %u, %s, %s)."
 msgid "Configuring EAP method failed (error %u)."
 msgstr "Konfigurasjon av EAP metode feilet (feil %u)."

-#: master/lib/GTC_UI/include/GTC_UI.h:111
 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr "GTC Challenge"

@@ -754,18 +631,18 @@ msgstr "Legger til en ny CA fra filen til listen"
 msgid "&Remove CA"
 msgstr "&Fjern CA"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Fjerner valgte CA fra listen"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Aksepterte tjener&navn:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -773,38 +650,38 @@ msgstr ""
 "En semikolon separert liste med aksepterte tjener FQDN navn; blank for å "
 "hoppe over navne sjekk; Unicode tegn er tillatt"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Eksempel: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr "Bruker sertifikat"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Vennligst velg ditt &sertifikat for autentisering."

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Klientsertifikat for autentisering "

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Tilpasset &identitet:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -812,6 +689,17 @@ msgstr ""
 "Din identitet (brukernavn@domene) for overskriving av sertifikat; eller tomt"
 " for å bruke den fra sertifikatet. "

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<tom>"
+
 #: 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
 msgid "Add Certificate"
@@ -903,22 +791,43 @@ msgstr "Spesifiser tilpasset ytre identitet"
 msgid "Custom outer identity to use"
 msgstr "Tilpasset ytre identitet som brukes"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Feil under skriving av brukeropplysninger til Credential Manager: %hs (feil "
+"%u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Skriving av brukeropplysninger feilet."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr "Kall av EAP identitet UI feilet (feil %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr "Kall av EAP identitet UI feilet (feil %u)."

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr "Kall av EAP interaktivt UI feilet (feil %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Kall av EAP interaktivt UI feilet (feil %u)."
@@ -969,6 +878,96 @@ msgstr "Andre EAP metoder..."
 msgid "Outer Authentication"
 msgstr "Ytre autentisering"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP brukeropplysninger"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Er du sikker på at du vil fjerne tilbyder %s permanent fra konfigurasjonen?"
+
+#: 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
+msgid "Warning"
+msgstr "Advarsel"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Tilbyder innstillinger"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Sletting av brukeropplysninger feilet (feil %u)"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<feil %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<feil>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<blank ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Husk"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr "Huk av om du vil lagre brukeropplysninger "
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<Din organisasjon>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr "Konfigurasjon av EAP forbindelse"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+msgstr "EAP Identitetstilbyder"
+
 #: 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
--- a/EAPMethods/locale/nl_NL.po
+++ b/EAPMethods/locale/nl_NL.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/eduroam_devel/teams/11799/nl/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/pl_PL.po
+++ b/EAPMethods/locale/pl_PL.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Polish (Poland) (https://www.transifex.com/eduroam_devel/teams/11799/pl_PL/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_PL\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,126 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Czy jesteś pewny, że chcesz usunąć konfigurację dostawcy tożsamości %s?"
-
-#: 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
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "Poświadczenia EAP"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Ustawienia dostawcy tożsamości"
-
-#: 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
-#, c-format
-msgid "%s User Credentials"
-msgstr "Poświadczenia użytkownika %s"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr "Błąd przy zapisie poświadczeń w Menadżerze poświadczeń: %hs (błąd %u)"
-
-#: 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
-msgid "Writing credentials failed."
-msgstr "Nie udało się zapisać poświadczeń."
-
-#: 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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Błąd przy usuwaniu poświadczeń (błąd %u)."
-
-#: 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
-#, c-format
-msgid "(error %u)"
-msgstr "(błąd %u)"
-
-#: 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
-msgid "(error)"
-msgstr "(błąd)"
-
-#: 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
-msgid "(empty)"
-msgstr "(pusty)"
-
-#: 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
-msgid "(blank ID)"
-msgstr "(puste ID)"
-
-#: 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
-msgid "&Remember"
-msgstr "&Zapamiętaj"
-
-#: 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
-msgid "Check if you would like to save credentials"
-msgstr "Zaznacz, jeżeli chcesz zachować swoje poświadczenia"
-
-#: 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
-msgid "(Your Organization)"
-msgstr "(Twoja Instytucja)"
-
 #: 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
@@ -194,6 +74,16 @@ msgstr "Zaawansowane..."
 msgid "Opens dialog with provider settings"
 msgstr "Otwiera okno z ustawieniami dostawcy tożsamości"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+msgstr "Poświadczenia użytkownika %s"
+
 #: 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
@@ -497,17 +387,6 @@ msgstr ""
 "(Uwaga: Po zablokowaniu nie będziesz mógł tego wycofać przy pomocy tego "
 "interfejsu!)"

-#: 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
-msgid "EAP Connection Configuration"
-msgstr "Konfiguracja Połączenia EAP"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr "Dostawca tożsamości EAP"
-
 #: 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
@@ -658,8 +537,8 @@ msgstr "Błąd przy konfigurowaniu metody EAP (błąd %u, %s, %s)."
 msgid "Configuring EAP method failed (error %u)."
 msgstr "Błąd przy konfigurowaniu metody EAP (błąd %u)."

-#: master/lib/GTC_UI/include/GTC_UI.h:111
 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -761,18 +640,18 @@ msgstr "Dodaje do listy nowy Urząd Certyfikacji z pliku"
 msgid "&Remove CA"
 msgstr "&Usuń Urząd"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Usuwa z listy wybrane urzędy certyfikacji"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Dopuszczalne &nazwy serwerów:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -780,40 +659,40 @@ msgstr ""
 "Lista nazw domenowych serwerów rozdzielana średnikami; pusta lista oznacza "
 "brak sprawdzenia nazw; dozwolone są znaki Unicode"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Przykład: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr "Certyfikat użytkownika"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
 "Wybierz certyfikat klienta, który ma być używany przy Twoim "
 "uwierzytelnieniu."

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Certyfikat klienta używany do uwierzytelnienia"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Niestandardowy &identyfikator:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -821,6 +700,17 @@ msgstr ""
 "Twój identyfikator (użytkownik@domena), który ma być użyty zamiast podanego "
 "w certyfikacie; pusty wpis spowoduje użycie identyfikatora z certyfikatu"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<pusty>"
+
 #: 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
 msgid "Add Certificate"
@@ -913,23 +803,42 @@ msgstr "Podaj niestandardowy identyfikator zewnętrzny"
 msgid "Custom outer identity to use"
 msgstr "Niestandardowy identyfikator zewnętrzny"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr "Błąd przy zapisie poświadczeń w Menadżerze poświadczeń: %hs (błąd %u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Nie udało się zapisać poświadczeń."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""
 "Błąd przy uruchomieniu interfejsu użytkownika dla EAP (błąd %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr "Błąd przy uruchomieniu interfejsu użytkownika dla EAP (błąd %u)."

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -980,6 +889,96 @@ msgstr "Inne metody EAP ..."
 msgid "Outer Authentication"
 msgstr "Uwierzytelnienie "

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Poświadczenia EAP"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Czy jesteś pewny, że chcesz usunąć konfigurację dostawcy tożsamości %s?"
+
+#: 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
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Ustawienia dostawcy tożsamości"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Błąd przy usuwaniu poświadczeń (błąd %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<błąd %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<błąd>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<puste ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Zapamiętaj"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr "Zaznacz, jeżeli chcesz zachować swoje poświadczenia"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<Twoja Instytucja>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr "Konfiguracja Połączenia EAP"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+msgstr "Dostawca tożsamości EAP"
+
 #: 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
--- a/EAPMethods/locale/pt_PT.po
+++ b/EAPMethods/locale/pt_PT.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Pedro Simões <psimoes@fccn.pt>, 2017\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-msgid "Warning"
-msgstr "Alerta"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "Credenciais EAP"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Definições do Fornecedor"
-
-#: 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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-msgid "&Remember"
-msgstr "&Memorizar"
-
-#: 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
-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
-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
@@ -193,6 +74,16 @@ msgstr "Avançadas..."
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 msgid "&Remove CA"
 msgstr "&Remover CA"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr "Certificado do Utilizador"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<vazio>"
+
 #: 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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Credenciais EAP"
+
+#: 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
+#, 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
+msgid "Warning"
+msgstr "Alerta"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Definições do Fornecedor"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<erro %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<erro>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<ID vazio>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Memorizar"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<A sua Organização>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/ru_RU.po
+++ b/EAPMethods/locale/ru_RU.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Russian (Russia) (https://www.transifex.com/eduroam_devel/teams/11799/ru_RU/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/sk_SK.po
+++ b/EAPMethods/locale/sk_SK.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Slovak (Slovakia) (https://www.transifex.com/eduroam_devel/teams/11799/sk_SK/)\n"
@@ -11,8 +11,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
-"X-Generator: Poedit 2.0.8\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/sl_SI.po
+++ b/EAPMethods/locale/sl_SI.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl_SI\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,128 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Ali ste prepričani, da želite trajno izbrisati ponudnika %s iz "
-"konfiguracije?"
-
-#: 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
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "Poverilnice EAP"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Nastavitve ponudnika"
-
-#: 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
-#, c-format
-msgid "%s User Credentials"
-msgstr "Uporabnikove poverilnice za %s"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Napaka pri zapisovanju poverilnic v upravitelja poverilnic: %hs (napaka %u)"
-
-#: 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
-msgid "Writing credentials failed."
-msgstr "Zapisovanje poverilnic ni uspelo."
-
-#: 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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Izbris poverilnic ni uspel (napaka %u)."
-
-#: 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
-#, c-format
-msgid "(error %u)"
-msgstr "(napaka %u)"
-
-#: 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
-msgid "(error)"
-msgstr "(napaka)"
-
-#: 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
-msgid "(empty)"
-msgstr "(prazno)"
-
-#: 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
-msgid "(blank ID)"
-msgstr "(prazen ID)"
-
-#: 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
-msgid "&Remember"
-msgstr "Za&pomni si"
-
-#: 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
-msgid "Check if you would like to save credentials"
-msgstr "Odkljukajte, če želite shraniti poverilnice"
-
-#: 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
-msgid "(Your Organization)"
-msgstr "(vaša organizacija)"
-
 #: 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
@@ -196,6 +74,16 @@ msgstr "Napredno ..."
 msgid "Opens dialog with provider settings"
 msgstr "Odpre dialog z nastavitvami ponudnika"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+msgstr "Uporabnikove poverilnice za %s"
+
 #: 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
@@ -495,17 +383,6 @@ msgstr ""
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr "(Pozor: Ko zaklenete, vrnitev ne bo več možna preko tega dialoga!)"

-#: 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
-msgid "EAP Connection Configuration"
-msgstr "Konfiguracija povezave EAP"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr "Ponudnik identitete EAP"
-
 #: 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
@@ -650,8 +527,8 @@ msgstr "Nastavljanje metode EAP ni uspelo (napaka %u, %s, %s)."
 msgid "Configuring EAP method failed (error %u)."
 msgstr "Nastavljanje metode EAP ni uspelo (napaka %u)."

-#: master/lib/GTC_UI/include/GTC_UI.h:111
 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr "Vprašanje GTC"

@@ -753,18 +630,18 @@ msgstr "Doda novega izdajatelja potrdil iz datoteke na seznam"
 msgid "&Remove CA"
 msgstr "Odst&rani CA"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Odstrani izbrane izdajatelje potrdil s seznama"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Sprejemljiva ime&na strežnika:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -772,38 +649,38 @@ msgstr ""
 "S podpičji ločen seznam sprejemljivih strežnikovih imen FQDN; prazno, da "
 "izpusti preverjanje imena; znaki Unicode dovoljeni"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Primer: vzo.rec.si;streznik2.rec.si)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr "Uporabnikovo potrdilo"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Izberite svoje potrdilo za uporabo med overovljanjem."

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Odjemalčevo potrdilo za overovljanje"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "&Identiteta po meri:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -811,6 +688,17 @@ msgstr ""
 "Vaša identiteta (up. ime@domena), ki bo nadomestila tisto s potrdila; ali "
 "prazno, če želite uporabiti tisto s potrdila"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<prazno>"
+
 #: 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
 msgid "Add Certificate"
@@ -901,22 +789,42 @@ msgstr "Navedite zunanjo identiteto po meri"
 msgid "Custom outer identity to use"
 msgstr "Zunanja identiteta po meri za uporabo"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Napaka pri zapisovanju poverilnic v upravitelja poverilnic: %hs (napaka %u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Zapisovanje poverilnic ni uspelo."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr "Zagon up. vmesnika za identiteto EAP ni uspel (napaka %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr "Zagon up. vmesnika za identiteto EAP ni uspel (napaka %u)."

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr "Zagon interaktivnega up. vmesnika EAP ni uspel (napaka %u, %s, %s)."

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Zagon interaktivnega up. vmesnika EAP ni uspel (napaka %u)."
@@ -967,6 +875,97 @@ msgstr "Druge metode EAP ..."
 msgid "Outer Authentication"
 msgstr "Zunanje overovljanje"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Poverilnice EAP"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Ali ste prepričani, da želite trajno izbrisati ponudnika %s iz "
+"konfiguracije?"
+
+#: 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
+msgid "Warning"
+msgstr "Opozorilo"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Nastavitve ponudnika"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Izbris poverilnic ni uspel (napaka %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<napaka %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<napaka>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<prazen ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "Za&pomni si"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr "Odkljukajte, če želite shraniti poverilnice"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<vaša organizacija>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr "Konfiguracija povezave EAP"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+msgstr "Ponudnik identitete EAP"
+
 #: 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
--- a/EAPMethods/locale/sr_RS.po
+++ b/EAPMethods/locale/sr_RS.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Marko Eremija <marko.eremija@amres.ac.rs>, 2017\n"
 "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,128 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Da li ste sigurni da želite da trajno uklonite %s provajdera iz "
-"konfiguracije?"
-
-#: 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
-msgid "Warning"
-msgstr "Upozorenje"
-
-#: 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
-msgid "EAP Credentials"
-msgstr "EAP kredencijali"
-
-#: 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
-msgid "Provider Settings"
-msgstr "Podešavanja provajdera"
-
-#: 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
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s korisnikovi kredencijali"
-
-#: 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
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Greška prilikom upisa kredencijala u Menadžera kredencijala: %hs (greška %u)"
-
-#: 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
-msgid "Writing credentials failed."
-msgstr "Upis kredencijala je neuspešan."
-
-#: 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
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Brisanje kredencijala neuspešno (greška %u)."
-
-#: 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
-#, c-format
-msgid "(error %u)"
-msgstr "(greška %u)"
-
-#: 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
-msgid "(error)"
-msgstr "(greška)"
-
-#: 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
-msgid "(empty)"
-msgstr "(prazno)"
-
-#: 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
-msgid "(blank ID)"
-msgstr "(prazan ID)"
-
-#: 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
-msgid "&Remember"
-msgstr "&Zapamti"
-
-#: 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
-msgid "Check if you would like to save credentials"
-msgstr "Označite ako želite da sačuvate kredencijale"
-
-#: 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
-msgid "(Your Organization)"
-msgstr "(Vaša organizacija)"
-
 #: 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
@@ -196,6 +74,16 @@ msgstr "Napredno..."
 msgid "Opens dialog with provider settings"
 msgstr "Otvara dijalog sa podešavanjima za provajdera"

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s korisnikovi kredencijali"
+
 #: 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
@@ -500,17 +388,6 @@ msgstr ""
 "(Upozorenje: Kada se jednom zaključa, ne možete se vratiti na početna "
 "podešavanja!)"

-#: 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
-msgid "EAP Connection Configuration"
-msgstr "Podešavanja za EAP povezivanje"
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr "EAP davalac identiteta"
-
 #: 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
@@ -660,8 +537,8 @@ msgstr "Konfigurisanje EAP metoda nije uspešno (greška %u, %s, %s). "
 msgid "Configuring EAP method failed (error %u)."
 msgstr "Konfigurisanje EAP metoda nije uspešno (greška %u). "

-#: master/lib/GTC_UI/include/GTC_UI.h:111
 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:16
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr "GTC Challenge"

@@ -763,18 +640,18 @@ msgstr "Dodaje novo sertifikaciono telo iz fajla u listu"
 msgid "&Remove CA"
 msgstr "&Remove CA"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Uklanja odabrano sertifikaciono telo sa liste"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Prihvatljiva &names servera"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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"
@@ -783,38 +660,38 @@ msgstr ""
 "prazno ukoliko nije potrebna provera imena servera; dozvoljeno je korišćenje"
 " <i>unicode</i> karaktera"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(npr: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr "Korisnički sertifikat"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Izaberite vaš &certificate koji ćete koristiti za autentifikaciju."

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Klijentski sertifikat koji se koristi za autentifikaciju"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Proizvoljan &identity:"

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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"
@@ -823,6 +700,17 @@ msgstr ""
 "ime iz sertifikata; ili prazno kako biste koristili ono koje se nalazi u "
 "sertifikatu"

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+msgstr "<prazno>"
+
 #: 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
 msgid "Add Certificate"
@@ -914,28 +802,48 @@ msgstr "Unesite proizvoljan spoljni identitet"
 msgid "Custom outer identity to use"
 msgstr "Koristi proizvoljan spoljni identitet"

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Greška prilikom upisa kredencijala u Menadžera kredencijala: %hs (greška %u)"
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr "Upis kredencijala je neuspešan."
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""
 "Aktiviranje korisničkog interfejsa za EAP identitet je neuspešno (greška %u,"
 " %s, %s). "

-#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""
 "Aktiviranje korisničkog interfejsa za EAP identitet je neuspešno (greška "
 "%u). "

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""
 "Aktiviranje interaktivnog korisničkog interfejsa za EAP je neuspešno (greška"
 " %u, %s, %s). "

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -988,6 +896,97 @@ msgstr "Drugi EAP metodi..."
 msgid "Outer Authentication"
 msgstr "Spoljna autentifikacija"

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP kredencijali"
+
+#: 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
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Da li ste sigurni da želite da trajno uklonite %s provajdera iz "
+"konfiguracije?"
+
+#: 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
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr "Podešavanja provajdera"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Brisanje kredencijala neuspešno (greška %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<greška %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<greška>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<prazan ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr "&Zapamti"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr "Označite ako želite da sačuvate kredencijale"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<Vaša organizacija>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr "Podešavanja za EAP povezivanje"
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+msgstr "EAP davalac identiteta"
+
 #: 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
--- a/EAPMethods/locale/sv_SE.po
+++ b/EAPMethods/locale/sv_SE.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/eduroam_devel/teams/11799/sv/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/tr_TR.po
+++ b/EAPMethods/locale/tr_TR.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Gokhan Eryol <gokhaneryol@gmail.com>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/eduroam_devel/teams/11799/tr/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr "Gelişmiş..."
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -474,17 +365,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -623,8 +503,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -722,60 +602,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -866,22 +757,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -932,6 +842,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr "<error %u>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr "<error>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr "<blank ID>"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+msgstr "<Your Organization>"
+
+#: 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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/locale/vi_VN.po
+++ b/EAPMethods/locale/vi_VN.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"POT-Creation-Date: 2017-02-09 13:15+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Vietnamese (https://www.transifex.com/eduroam_devel/teams/11799/vi/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,125 +38,6 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\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
-#, 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
-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
-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
-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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-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
-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
-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
-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
-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
@@ -193,6 +74,16 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: master/lib/EAPBase_UI/include/EAP_UI.h:666
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:665
+#, c-format
+msgid "%s User Credentials"
+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
@@ -473,17 +364,6 @@ msgstr ""
 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
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-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
@@ -622,8 +502,8 @@ msgstr ""
 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
+#: master/lib/GTC_UI/include/GTC_UI.h:103
 msgid "GTC Challenge"
 msgstr ""

@@ -721,60 +601,71 @@ msgstr ""
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:59 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:59
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:72 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:72
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:72
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:77 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:77
+#: ver1.1/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 ""

-#: 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
 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
+#: 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
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:119 ver1.1/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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:129
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:129
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:136
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:136
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:143
+#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:143
 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
+#: master/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:148
+#: ver1.1/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 ""

+#: master/lib/TLS_UI/src/TLS_UI.cpp:61 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<empty>"
+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
 msgid "Add Certificate"
@@ -865,22 +756,41 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
+#: master/lib/TTLS_UI/src/Module.cpp:262 master/lib/TTLS_UI/src/Module.cpp:330
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:274 ver1.0/lib/TTLS_UI/src/Module.cpp:284
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:262 ver1.1/lib/TTLS_UI/src/Module.cpp:318
+#: master/lib/EAPBase_UI/include/EAP_UI.h:785
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:784
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:264 master/lib/TTLS_UI/src/Module.cpp:332
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:276 ver1.0/lib/TTLS_UI/src/Module.cpp:286
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:264 ver1.1/lib/TTLS_UI/src/Module.cpp:320
+#: master/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:787
+msgid "Writing credentials failed."
+msgstr ""
+
+#: master/lib/TTLS_UI/src/Module.cpp:367 ver1.1/lib/TTLS_UI/src/Module.cpp:355
 #, 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
+#: master/lib/TTLS_UI/src/Module.cpp:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:532
+#: master/lib/TTLS_UI/src/Module.cpp:496
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:535
+#: master/lib/TTLS_UI/src/Module.cpp:499
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -931,6 +841,95 @@ msgstr ""
 msgid "Outer Authentication"
 msgstr ""

+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: master/lib/EAPBase_UI/include/EAP_UI.h:363
+#: 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.1/lib/EAPBase_UI/include/EAP_UI.h:362
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+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
+#, 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
+msgid "Warning"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:633
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
+msgid "Provider Settings"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:808
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:847
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:851
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
+msgid "<error>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:862
+#: master/lib/EAPBase_UI/include/EAP_UI.h:871
+#: 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:861
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
+msgid "<blank ID>"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:911
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
+msgid "&Remember"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:912
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
+msgid "<Your Organization>"
+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
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
+msgid "EAP Identity Provider"
+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
--- a/EAPMethods/src/Main_UI.cpp
+++ b/EAPMethods/src/Main_UI.cpp
@@ -51,11 +51,6 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
 #endif
        g_peer.m_instance = hinstDLL;

-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
-        // Declare our DllHost process as DPI-aware.
-        SetProcessDPIAware();
-#endif
-
        // Save current activation context, as proper activation context is set at this time only (LoadLibrary() call).
        GetCurrentActCtx(&g_act_ctx);
    } else if (fdwReason == DLL_PROCESS_DETACH) {
--- a/EventMonitor/ETWLog.cpp
+++ b/EventMonitor/ETWLog.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -168,11 +168,11 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
    m_rec_idx(wxETWEVENT_RECORDS_MAX),
    wxListCtrl(parent, id, pos, size, style, validator, name)
 {
-    this->AppendColumn(_("Time"  ), wxLIST_FORMAT_LEFT, FromDIP(160));
-    this->AppendColumn(_("PID"   ), wxLIST_FORMAT_LEFT, FromDIP( 50));
-    this->AppendColumn(_("TID"   ), wxLIST_FORMAT_LEFT, FromDIP( 50));
-    this->AppendColumn(_("Source"), wxLIST_FORMAT_LEFT, FromDIP( 80));
-    this->AppendColumn(_("Event" ), wxLIST_FORMAT_LEFT, FromDIP(350));
+    this->AppendColumn(_("Time"  ), wxLIST_FORMAT_LEFT, 160);
+    this->AppendColumn(_("PID"   ), wxLIST_FORMAT_LEFT,  50);
+    this->AppendColumn(_("TID"   ), wxLIST_FORMAT_LEFT,  50);
+    this->AppendColumn(_("Source"), wxLIST_FORMAT_LEFT,  80);
+    this->AppendColumn(_("Event" ), wxLIST_FORMAT_LEFT, 350);

    // Maximum expected column widths for pre-formatted row display
    m_col_format_width[0] = 26;
@@ -204,11 +204,11 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
    ULONG ulResult;
    for (unsigned int i = 0; ; i++) {
        //tstring log_file(tstring_printf(i ? _T("test.etl") : _T("test %u.etl"), i));
-        tstring session_name(tstring_printf(i ? _T(PRODUCT_NAME_STR) _T(" Event Monitor Session %u") : _T(PRODUCT_NAME_STR) _T(" Event Monitor Session"), i));
+        tstring name(tstring_printf(i ? _T(PRODUCT_NAME_STR) _T(" Event Monitor Session %u") : _T(PRODUCT_NAME_STR) _T(" Event Monitor Session"), i));

        // Allocate session properties.
        ULONG
-            ulSizeName    = (ULONG)((session_name.length() + 1)*sizeof(TCHAR)),
+            ulSizeName    = (ULONG)((name    .length() + 1)*sizeof(TCHAR)),
            //ulSizeLogFile = (ULONG)((log_file.length() + 1)*sizeof(TCHAR)),
            ulSize        = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName /*+ ulSizeLogFile*/;
        unique_ptr<EVENT_TRACE_PROPERTIES> properties(reinterpret_cast<EVENT_TRACE_PROPERTIES*>(new char[ulSize]));
@@ -226,13 +226,13 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
        //properties->LogFileNameOffset   = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName;
        //memcpy(reinterpret_cast<char*>(properties.get()) + properties->LogFileNameOffset, log_file.c_str(), ulSizeLogFile);

-        if ((ulResult = m_session.create(session_name.c_str(), properties.get())) == ERROR_SUCCESS) {
+        if ((ulResult = m_session.create(name.c_str(), properties.get())) == ERROR_SUCCESS) {
            break;
        } else if (ulResult == ERROR_ACCESS_DENIED) {
            wxLogError(_("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."));
            return;
        } else if (ulResult == ERROR_ALREADY_EXISTS) {
-            wxLogDebug(_("The %s event session already exists."), session_name);
+            wxLogDebug(_("The %s event session already exists."), name);
            // Do not despair... Retry with a new session name and ID.
            continue;
        } else {
@@ -805,7 +805,7 @@ static tstring MapToString(_In_ const EVENT_MAP_INFO *pMapInfo, _In_ ULONG ulDat
        return out.empty() ? tstring_printf(_T("%lu"), ulData) : out;
    }

-    return _T("(unknown map)");
+    return _T("<unknown map>");
 }


@@ -930,7 +930,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
                    RtlIpv6AddressToString((IN6_ADDR*)pData, szIPv6Addr);
                    return tstring_printf(_T("%s"), szIPv6Addr);
                } else
-                    return _T("(IPv6 address)");
+                    return _T("<IPv6 address>");
            }
            default: {
                tstring out;
@@ -956,7 +956,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
            case sizeof(ULONGLONG): return tstring_printf(_T("0x%016I64x"), *(PULONGLONG)pData);
            default: // Unsupported pointer size.
                assert(0);
-                return _T("(pointer)");
+                return _T("<pointer>");
            }

        case TDH_INTYPE_SIZET:
@@ -966,7 +966,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
            case sizeof(ULONGLONG): return tstring_printf(_T("%I64u"), *(PULONGLONG)pData);
            default: // Unsupported size_t size.
                assert(0);
-                return _T("(size_t)");
+                return _T("<size_t>");
            }

        case TDH_INTYPE_FILETIME: {
@@ -983,7 +983,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
            case TDH_OUTTYPE_CULTURE_INSENSITIVE_DATETIME: return tstring_printf(_T("%04d-%02d-%02d %02d:%02d:%02d.%03u"), ((PSYSTEMTIME)pData)->wYear, ((PSYSTEMTIME)pData)->wMonth, ((PSYSTEMTIME)pData)->wDay, ((PSYSTEMTIME)pData)->wHour, ((PSYSTEMTIME)pData)->wMinute, ((PSYSTEMTIME)pData)->wSecond, ((PSYSTEMTIME)pData)->wMilliseconds);
            default: {
                tstring out;
-                return GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, (PSYSTEMTIME)pData, NULL, out) ? out : tstring(_T("(time)"));
+                return GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, (PSYSTEMTIME)pData, NULL, out) ? out : tstring(_T("<time>"));
            }}

        case TDH_INTYPE_WBEMSID:
@@ -995,7 +995,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
            // 32-bit computer and 16 bytes on a 64-bit computer.
            // Doubling the pointer size handles both cases.
            assert(nDataSize >= (SIZE_T)nPtrSize * 2);
-            return (PULONG)pData > 0 ? DataToString(TDH_INTYPE_SID, OutType, pData + nPtrSize * 2, nDataSize - nPtrSize * 2, pMapInfo, nPtrSize) : _T("(WBEM SID)");
+            return (PULONG)pData > 0 ? DataToString(TDH_INTYPE_SID, OutType, pData + nPtrSize * 2, nDataSize - nPtrSize * 2, pMapInfo, nPtrSize) : _T("<WBEM SID>");

        case TDH_INTYPE_SID: {
            assert(nDataSize >= sizeof(SID));
@@ -1009,14 +1009,14 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
                    ConvertSidToStringSid((PSID)pData, (LPTSTR*)&sid))
                    return tstring_printf(_T("%s"), sid.get());
                else
-                    return _T("(SID)");
+                    return _T("<SID>");
            }
        }

    default:
        // It is not actually an error if we do not understand the given data type.
        assert(0);
-        return _T("(unknown data type)");
+        return _T("<unknown data type>");
    }
 }

@@ -1053,7 +1053,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
    // Get the size of the array if the property is an array.
    ULONG ulArraySize = 0;
    if ((ulResult = GetArraySize(pEvent, pInfo, ulPropIndex, &ulArraySize)) != ERROR_SUCCESS)
-        return tstring_printf(_T("(Error getting array size (error %u))"), ulResult);;
+        return tstring_printf(_T("<Error getting array size (error %u)>"), ulResult);;

    tstring out;
    bool out_nonfirst = false;
@@ -1078,7 +1078,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
                // The TDH API does not support IPv6 addresses. If the output type is TDH_OUTTYPE_IPV6,
                // you will not be able to consume the rest of the event. If you try to consume the
                // remainder of the event, you will get ERROR_EVT_INVALID_EVENT_DATA.
-                return _T("(The event contains an IPv6 address. Skipping.)");
+                return _T("<The event contains an IPv6 address. Skipping.>");
            } else {
                vector<BYTE> data;
                if (pStructureName) {
@@ -1098,7 +1098,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
                    // This happens with empty/NULL data. Not an error actually.
                    assert(data.empty());
                } else if (ulResult != ERROR_SUCCESS)
-                    return tstring_printf(_T("(Error getting property (error %u))"), ulResult);
+                    return tstring_printf(_T("<Error getting property (error %u)>"), ulResult);

                // Get the name/value mapping if the property specifies a value map.
                unique_ptr<EVENT_MAP_INFO> map_info;
@@ -1107,7 +1107,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
                    // name/value mapping not found. Not an error actually.
                    assert(!map_info);
                } else if (ulResult != ERROR_SUCCESS)
-                    return tstring_printf(_T("(Error getting map information (error %u))"), ulResult);
+                    return tstring_printf(_T("<Error getting map information (error %u)>"), ulResult);
                else if (pInfo->DecodingSource == DecodingSourceXMLFile) {
                    // The mapped string values defined in a manifest will contain a trailing space
                    // in the EVENT_MAP_ENTRY structure. Replace the trailing space with a null-
@@ -1126,7 +1126,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
                    data.data(),
                    data.size(),
                    map_info.get(),
-                    nPtrSize) : _T("(null)");
+                    nPtrSize) : _T("<null>");
            }
        }
    }
--- a/EventMonitor/EventMonitor.rc
+++ b/EventMonitor/EventMonitor.rc
--- a/EventMonitor/EventMonitor.vcxproj
+++ b/EventMonitor/EventMonitor.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -30,102 +22,66 @@
    <ProjectGuid>{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>EventMonitor</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="EventMonitor.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="EventMonitor.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="EventMonitor.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="EventMonitor.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="EventMonitor.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="EventMonitor.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ResourceCompile Include="EventMonitor.rc" />
  </ItemGroup>
@@ -146,9 +102,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="res\wxEventMonitor_UI.cpp" />
  </ItemGroup>
@@ -156,10 +110,10 @@
    <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/EventMonitor/Frame.cpp
+++ b/EventMonitor/Frame.cpp
@@ -26,10 +26,10 @@
 //////////////////////////////////////////////////////////////////////////


-wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, long style, const wxString& name) :
-    wxFrame(parent, id, title, pos, parent->FromDIP(wxSize(600,400)), style, name)
+wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name) :
+    wxFrame(parent, id, title, pos, size, style, name)
 {
-    this->SetSizeHints(FromDIP(wxSize(150,150)), wxDefaultSize);
+    this->SetSizeHints(wxSize(150,150), wxDefaultSize);
    m_mgr.SetManagedWindow(this);
    m_mgr.SetFlags(wxAUI_MGR_DEFAULT);

--- a/EventMonitor/Frame.h
+++ b/EventMonitor/Frame.h
@@ -72,7 +72,7 @@ public:
    /// \param[in] style   The window style. See `wxFrame` class description.
    /// \param[in] name    The name of the window. This parameter is used to associate a name with the item, allowing the application user to set Motif resource values for individual windows.
    ///
-    wxEventMonitorFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Event Monitor"), const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitor"));
+    wxEventMonitorFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Event Monitor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(600,400), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitor"));

    ///
    /// Destructor
--- a/EventMonitor/MSIBuild/Makefile
+++ b/EventMonitor/MSIBuild/Makefile
--- a/EventMonitor/locale/EventMonitor.pot
+++ b/EventMonitor/locale/EventMonitor.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+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"
@@ -16,12 +16,10 @@ msgstr ""
 "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-1: ver1.0/EventMonitor\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/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
@@ -30,57 +28,44 @@ msgstr ""
 #: 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
 msgid "Event Monitor"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/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
 msgid "Time"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
 msgid "PID"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
 msgid "TID"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
 msgid "Source"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
 msgid "Event"
 msgstr ""

 #: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/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 ""

 #: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/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
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
@@ -88,8 +73,6 @@ 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
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
@@ -99,157 +82,128 @@ msgstr ""
 #: 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
 #, 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
 msgid "E&xit"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/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
 msgid "&Program"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/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
 msgid "Copies selected records to clipboard"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/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
 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
 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
 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
 msgid "Select &All"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/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
 msgid "Select &None"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/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
 msgid "&Edit"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 #, 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
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
@@ -257,39 +211,31 @@ 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
 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
 msgid "&View"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
 msgid "Copy"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
 msgid "Copy All"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
 msgid "Edit"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""

 #: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
 msgid "Trace Log"
 msgstr ""

@@ -309,14 +255,6 @@ msgstr ""
 #: 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
 msgid "Real-time display of internal events"
 msgstr ""

@@ -328,9 +266,5 @@ msgstr ""
 #: 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
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""
--- a/EventMonitor/locale/cs_CZ.po
+++ b/EventMonitor/locale/cs_CZ.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EventMonitor/locale/es_ES.po
+++ b/EventMonitor/locale/es_ES.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: José Manuel Macías, 2016\n"
+"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/it_IT.po
+++ b/EventMonitor/locale/it_IT.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Daniele Albrizio <daniele@albrizio.it>, 2018\n"
+"Last-Translator: Nunzio Napolitano <nunzio.napolitano@uniparthenope.it>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/eduroam_devel/teams/11799/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Monitor delgi eventi"
 #: ver1.1/EventMonitor/ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
-msgstr "Errore durante l'apertura dell'event trace (errore %u)."
+msgstr ""

 #: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
 #: ver1.1/EventMonitor/ETWLog.cpp:171
@@ -76,22 +76,18 @@ msgid ""
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""
-"Accesso negato durante la creazione di una sessione di eventi: è necessario "
-"disporre dei privilegi di amministratore (Esegui come Amministratore) o "
-"essere un membro del gruppo degli utenti Performance Log Users per avviare "
-"la sessione di traccia degli eventi."

 #: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
 #: ver1.1/EventMonitor/ETWLog.cpp:235
 #, c-format
 msgid "The %s event session already exists."
-msgstr "La sessione evento %s esiste già."
+msgstr ""

 #: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
 #: ver1.1/EventMonitor/ETWLog.cpp:239
 #, c-format
 msgid "Error creating event session (error %u)."
-msgstr "Errore durante la creazione di una sessione evento (errore %u)."
+msgstr ""

 #: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
 #: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
@@ -100,7 +96,7 @@ msgstr "Errore durante la creazione di una sessione evento (errore %u)."
 #: ver1.1/EventMonitor/ETWLog.cpp:285
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
-msgstr "Errore durante l'abilitazione dell'event provider %s (errore %u)."
+msgstr ""

 #: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
 #: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
@@ -112,12 +108,12 @@ msgstr "Errore durante l'abilitazione dell'event provider %s (errore %u)."
 #: ver1.1/EventMonitor/Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
-msgstr "Attiva/disattiva la visualizzazione di %s record"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
 #: ver1.1/EventMonitor/Frame.cpp:65
 msgid "E&xit"
-msgstr "E&sci"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
 #: ver1.1/EventMonitor/Frame.cpp:65
@@ -138,30 +134,30 @@ msgstr "&Copia"
 #: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
 #: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
 msgid "Copies selected records to clipboard"
-msgstr "Copia i record selezionati negli appunti"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
 #: ver1.1/EventMonitor/Frame.cpp:78
 msgid "Copy A&ll"
-msgstr "Copia t&utto"
+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
 msgid "Copies all records to clipboard (including hidden)"
-msgstr "Copia tutti i record negli appunti (inclusi quelli nascosti)"
+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
 msgid "Clear"
-msgstr "Cancella"
+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
 msgid "Clears all records from the log"
-msgstr "Cancella tutti i record dal registro"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
 #: ver1.1/EventMonitor/Frame.cpp:90
@@ -171,96 +167,96 @@ msgstr "Seleziona &tutto"
 #: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
 #: ver1.1/EventMonitor/Frame.cpp:90
 msgid "Selects all visible records"
-msgstr "Seleziona tutti i record visibili"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
 #: ver1.1/EventMonitor/Frame.cpp:94
 msgid "Select &None"
-msgstr "Non selezionare &nulla"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
 #: ver1.1/EventMonitor/Frame.cpp:94
 msgid "Clears record selection"
-msgstr "Cancella la selezione del record"
+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
 msgid "&Edit"
-msgstr "&Modifica"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
 #: ver1.1/EventMonitor/Frame.cpp:101
 msgid "Auto &Scroll"
-msgstr "&Scorrimento automatico"
+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
 msgid "Automatically scrolls to the most recent records as they come-in"
-msgstr "Scorre automaticamente verso i record più recenti mentre arrivano"
+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
 msgid "Verbose"
-msgstr "Verboso"
+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
 msgid "Displays all levels of records"
-msgstr "Mostra tutti i livelli dei record"
+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
 msgid "Informational"
-msgstr "Informativo"
+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
 msgid "Displays all records up to informational level"
-msgstr "Visualizza tutti i record fino al livello informativo"
+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
 msgid "Warning"
-msgstr "Avvertenza"
+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
 msgid "Displays all records up to warning level"
-msgstr "Visualizza tutti i record fino al livello di avvertenza"
+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
 msgid "Error"
-msgstr "Errore"
+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
 msgid "Displays error level records only"
-msgstr "Visualizza solo i record a livello di errore"
+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
 #, c-format
 msgid "%s toolbar"
-msgstr "barra strumenti %s"
+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
 #, c-format
 msgid "Toggles display of %s toolbar"
-msgstr "Attiva/disattiva la visualizzazione della barra degli strumenti %s"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
 #: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
@@ -268,38 +264,38 @@ msgstr "Attiva/disattiva la visualizzazione della barra degli strumenti %s"
 #: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
 #: ver1.1/EventMonitor/Frame.cpp:185
 msgid "View"
-msgstr "Vista"
+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
 msgid "&View"
-msgstr "&Vista"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
 #: ver1.1/EventMonitor/Frame.cpp:154
 msgid "Copy"
-msgstr "Copia"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
 #: ver1.1/EventMonitor/Frame.cpp:156
 msgid "Copy All"
-msgstr "Copia tutto"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
 #: ver1.1/EventMonitor/Frame.cpp:161
 msgid "Edit"
-msgstr "Modifica"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
 #: ver1.1/EventMonitor/Frame.cpp:164
 msgid "Auto Scroll"
-msgstr "Auto scorrimento"
+msgstr ""

 #: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
 #: ver1.1/EventMonitor/Frame.cpp:189
 msgid "Trace Log"
-msgstr "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
@@ -326,7 +322,7 @@ msgstr "Trace Log"
 #: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Real-time display of internal events"
-msgstr "Visualizzazione degli eventi interni in tempo reale "
+msgstr ""

 #: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
@@ -341,4 +337,4 @@ msgstr "Visualizzazione degli eventi interni in tempo reale "
 #: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
-msgstr "EVENTM~1|GÉANTLink Event Monitor"
+msgstr ""
--- a/EventMonitor/locale/lt_LT.po
+++ b/EventMonitor/locale/lt_LT.po
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EventMonitor/locale/sk_SK.po
+++ b/EventMonitor/locale/sk_SK.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/EventMonitor/res/wxEventMonitor_UI.cpp
+++ b/EventMonitor/res/wxEventMonitor_UI.cpp
@@ -19,7 +19,7 @@ wxEventMonitorLogPanelBase::wxEventMonitorLogPanelBase( wxWindow* parent, wxWind
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
 	
 	m_log = new wxETWListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxNO_BORDER, wxDefaultValidator, wxT("EventMonitorLog") );
-	bSizerMain->Add( m_log, 1, wxEXPAND, FromDIP(5) );
+	bSizerMain->Add( m_log, 1, wxEXPAND, 5 );
 	
 	
 	this->SetSizer( bSizerMain );
--- a/GEANTLink.sln
+++ b/GEANTLink.sln
@@ -1,382 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2016
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14D5FE5B-9742-4D1F-A1E0-32E694B94AAB}"
-	ProjectSection(SolutionItems) = preProject
-		README.md = README.md
-		include\Version.h = include\Version.h
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EAP Methods", "EAP Methods", "{60BAAC3D-DC98-4C19-BC40-1A86963DE86C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\EAPTTLS\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\EAPTTLSUI\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase_UI", "lib\EAPBase_UI\build\EAPBase_UI.vcxproj", "{D4B54856-BE1F-4937-A8F7-495125BE76BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP", "lib\PAP\build\PAP.vcxproj", "{36B0CF8A-7794-46C3-8099-825BA962B4C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS", "lib\TLS\build\TLS.vcxproj", "{4D40CB8A-812E-4F12-B23A-31AF743878E8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS", "lib\TTLS\build\TTLS.vcxproj", "{EE0EF0D9-A475-4038-8637-5754724F65B0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP_UI", "lib\PAP_UI\build\PAP_UI.vcxproj", "{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS_UI", "lib\TLS_UI\build\TLS_UI.vcxproj", "{9A25C261-8ADE-4938-8393-E857EF0E37E9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS_UI", "lib\TTLS_UI\build\TTLS_UI.vcxproj", "{42F0F0F4-C928-4860-A4E4-94991C2C3D90}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsiUseFeature", "MsiUseFeature\MsiUseFeature.vcxproj", "{679D03C5-CD70-4FFA-93F8-A4AB3637509B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventMonitor", "EventMonitor\EventMonitor.vcxproj", "{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2", "lib\MSCHAPv2\build\MSCHAPv2.vcxproj", "{86A6D6A0-4B7D-4134-BE81-A5755C77584D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2_UI", "lib\MSCHAPv2_UI\build\MSCHAPv2_UI.vcxproj", "{7AF5B922-7C17-428A-97E0-09E3B41A684D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost", "lib\EapHost\build\EapHost.vcxproj", "{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost_UI", "lib\EapHost_UI\build\EapHost_UI.vcxproj", "{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTC", "lib\GTC\build\GTC.vcxproj", "{114A70BB-8698-4A0C-8C90-58F22EDD8129}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTC_UI", "lib\GTC_UI\build\GTC_UI.vcxproj", "{34680813-3A52-46FB-B5A8-1E4BBF770855}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|ARM64.Build.0 = Debug|ARM64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.ActiveCfg = Debug|x64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.Build.0 = Debug|x64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x86.ActiveCfg = Debug|Win32
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x86.Build.0 = Debug|Win32
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|ARM64.ActiveCfg = Release|ARM64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|ARM64.Build.0 = Release|ARM64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.ActiveCfg = Release|x64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.Build.0 = Release|x64
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x86.ActiveCfg = Release|Win32
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x86.Build.0 = Release|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.Build.0 = Debug|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.ActiveCfg = Debug|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.Build.0 = Debug|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.ActiveCfg = Release|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.Build.0 = Release|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.ActiveCfg = Release|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.Build.0 = Release|Win32
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.ActiveCfg = Debug|x64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.Build.0 = Debug|x64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x86.ActiveCfg = Debug|Win32
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x86.Build.0 = Debug|Win32
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|ARM64.Build.0 = Release|ARM64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.ActiveCfg = Release|x64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.Build.0 = Release|x64
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x86.ActiveCfg = Release|Win32
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x86.Build.0 = Release|Win32
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.ActiveCfg = Debug|x64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.Build.0 = Debug|x64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x86.ActiveCfg = Debug|Win32
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x86.Build.0 = Debug|Win32
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|ARM64.Build.0 = Release|ARM64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.ActiveCfg = Release|x64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.Build.0 = Release|x64
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x86.ActiveCfg = Release|Win32
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x86.Build.0 = Release|Win32
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.ActiveCfg = Debug|x64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.Build.0 = Debug|x64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x86.ActiveCfg = Debug|Win32
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x86.Build.0 = Debug|Win32
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|ARM64.ActiveCfg = Release|ARM64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|ARM64.Build.0 = Release|ARM64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.ActiveCfg = Release|x64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.Build.0 = Release|x64
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x86.ActiveCfg = Release|Win32
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x86.Build.0 = Release|Win32
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.ActiveCfg = Debug|x64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.Build.0 = Debug|x64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x86.ActiveCfg = Debug|Win32
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x86.Build.0 = Debug|Win32
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|ARM64.Build.0 = Release|ARM64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.ActiveCfg = Release|x64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.Build.0 = Release|x64
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x86.ActiveCfg = Release|Win32
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x86.Build.0 = Release|Win32
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.ActiveCfg = Debug|x64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.Build.0 = Debug|x64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x86.ActiveCfg = Debug|Win32
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x86.Build.0 = Debug|Win32
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|ARM64.Build.0 = Release|ARM64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.ActiveCfg = Release|x64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.Build.0 = Release|x64
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x86.ActiveCfg = Release|Win32
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x86.Build.0 = Release|Win32
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|ARM64.Build.0 = Debug|ARM64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.ActiveCfg = Debug|x64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.Build.0 = Debug|x64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x86.ActiveCfg = Debug|Win32
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x86.Build.0 = Debug|Win32
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|ARM64.ActiveCfg = Release|ARM64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|ARM64.Build.0 = Release|ARM64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.ActiveCfg = Release|x64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.Build.0 = Release|x64
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x86.ActiveCfg = Release|Win32
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x86.Build.0 = Release|Win32
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.ActiveCfg = Debug|x64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.Build.0 = Debug|x64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x86.ActiveCfg = Debug|Win32
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x86.Build.0 = Debug|Win32
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|ARM64.Build.0 = Release|ARM64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.ActiveCfg = Release|x64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.Build.0 = Release|x64
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x86.ActiveCfg = Release|Win32
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x86.Build.0 = Release|Win32
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.ActiveCfg = Debug|x64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.Build.0 = Debug|x64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x86.ActiveCfg = Debug|Win32
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x86.Build.0 = Debug|Win32
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|ARM64.Build.0 = Release|ARM64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.ActiveCfg = Release|x64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.Build.0 = Release|x64
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x86.ActiveCfg = Release|Win32
-		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x86.Build.0 = Release|Win32
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.ActiveCfg = Debug|x64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.Build.0 = Debug|x64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x86.ActiveCfg = Debug|Win32
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x86.Build.0 = Debug|Win32
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|ARM64.Build.0 = Release|ARM64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.ActiveCfg = Release|x64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.Build.0 = Release|x64
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x86.ActiveCfg = Release|Win32
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x86.Build.0 = Release|Win32
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.ActiveCfg = Debug|x64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.Build.0 = Debug|x64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x86.ActiveCfg = Debug|Win32
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x86.Build.0 = Debug|Win32
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|ARM64.Build.0 = Release|ARM64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.ActiveCfg = Release|x64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.Build.0 = Release|x64
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x86.ActiveCfg = Release|Win32
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x86.Build.0 = Release|Win32
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|ARM64.Build.0 = Debug|ARM64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.ActiveCfg = Debug|x64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.Build.0 = Debug|x64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x86.ActiveCfg = Debug|Win32
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x86.Build.0 = Debug|Win32
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|ARM64.ActiveCfg = Release|ARM64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|ARM64.Build.0 = Release|ARM64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.ActiveCfg = Release|x64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.Build.0 = Release|x64
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x86.ActiveCfg = Release|Win32
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x86.Build.0 = Release|Win32
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|ARM64.Build.0 = Debug|ARM64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.ActiveCfg = Debug|x64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.Build.0 = Debug|x64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x86.ActiveCfg = Debug|Win32
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x86.Build.0 = Debug|Win32
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|ARM64.Build.0 = Release|ARM64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.ActiveCfg = Release|x64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.Build.0 = Release|x64
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x86.ActiveCfg = Release|Win32
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x86.Build.0 = Release|Win32
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.ActiveCfg = Debug|x64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.Build.0 = Debug|x64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x86.ActiveCfg = Debug|Win32
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x86.Build.0 = Debug|Win32
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|ARM64.Build.0 = Release|ARM64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.ActiveCfg = Release|x64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.Build.0 = Release|x64
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x86.ActiveCfg = Release|Win32
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x86.Build.0 = Release|Win32
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.ActiveCfg = Debug|Win32
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.Build.0 = Debug|Win32
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.Build.0 = Release|ARM64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.ActiveCfg = Release|Win32
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.Build.0 = Release|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|ARM64.Build.0 = Debug|ARM64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.ActiveCfg = Debug|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.Build.0 = Debug|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x86.ActiveCfg = Debug|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x86.Build.0 = Debug|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|ARM64.ActiveCfg = Release|ARM64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|ARM64.Build.0 = Release|ARM64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.ActiveCfg = Release|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.Build.0 = Release|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x86.ActiveCfg = Release|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x86.Build.0 = Release|Win32
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.ActiveCfg = Debug|x64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.Build.0 = Debug|x64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x86.ActiveCfg = Debug|Win32
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x86.Build.0 = Debug|Win32
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|ARM64.Build.0 = Release|ARM64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.ActiveCfg = Release|x64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.Build.0 = Release|x64
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x86.ActiveCfg = Release|Win32
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x86.Build.0 = Release|Win32
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.ActiveCfg = Debug|x64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.Build.0 = Debug|x64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x86.ActiveCfg = Debug|Win32
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x86.Build.0 = Debug|Win32
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|ARM64.Build.0 = Release|ARM64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.ActiveCfg = Release|x64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.Build.0 = Release|x64
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x86.ActiveCfg = Release|Win32
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x86.Build.0 = Release|Win32
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|ARM64.Build.0 = Debug|ARM64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.ActiveCfg = Debug|x64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.Build.0 = Debug|x64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x86.ActiveCfg = Debug|Win32
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x86.Build.0 = Debug|Win32
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|ARM64.ActiveCfg = Release|ARM64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|ARM64.Build.0 = Release|ARM64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.ActiveCfg = Release|x64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.Build.0 = Release|x64
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x86.ActiveCfg = Release|Win32
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x86.Build.0 = Release|Win32
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|ARM64.Build.0 = Debug|ARM64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.ActiveCfg = Debug|x64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.Build.0 = Debug|x64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x86.ActiveCfg = Debug|Win32
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x86.Build.0 = Debug|Win32
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|ARM64.ActiveCfg = Release|ARM64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|ARM64.Build.0 = Release|ARM64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.ActiveCfg = Release|x64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.Build.0 = Release|x64
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x86.ActiveCfg = Release|Win32
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x86.Build.0 = Release|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|ARM64.Build.0 = Debug|ARM64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x64.ActiveCfg = Debug|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x64.Build.0 = Debug|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x86.ActiveCfg = Debug|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x86.Build.0 = Debug|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|ARM64.ActiveCfg = Release|ARM64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|ARM64.Build.0 = Release|ARM64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x64.ActiveCfg = Release|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x64.Build.0 = Release|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x86.ActiveCfg = Release|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x86.Build.0 = Release|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|ARM64.Build.0 = Debug|ARM64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x64.ActiveCfg = Debug|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x64.Build.0 = Debug|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x86.ActiveCfg = Debug|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x86.Build.0 = Debug|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|ARM64.ActiveCfg = Release|ARM64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|ARM64.Build.0 = Release|ARM64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x64.ActiveCfg = Release|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x64.Build.0 = Release|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x86.ActiveCfg = Release|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{331B6077-E3E2-4867-B93E-9D3F57280DE7} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
-		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{DD7A97CA-F18E-43B7-95C4-D06E6A291624} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
-		{AD6816A0-9600-4E01-8C49-39D03D1E791F} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{D4B54856-BE1F-4937-A8F7-495125BE76BE} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{36B0CF8A-7794-46C3-8099-825BA962B4C7} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{4D40CB8A-812E-4F12-B23A-31AF743878E8} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{EE0EF0D9-A475-4038-8637-5754724F65B0} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{9A25C261-8ADE-4938-8393-E857EF0E37E9} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{42F0F0F4-C928-4860-A4E4-94991C2C3D90} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{679D03C5-CD70-4FFA-93F8-A4AB3637509B} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
-		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
-		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
-		{86A6D6A0-4B7D-4134-BE81-A5755C77584D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{7AF5B922-7C17-428A-97E0-09E3B41A684D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{34680813-3A52-46FB-B5A8-1E4BBF770855} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E52A6A8F-2AF5-43C7-8E01-9808E865BCF0}
-	EndGlobalSection
-EndGlobal
--- a/MSI/Base/Main/Makefile
+++ b/MSI/Base/Main/Makefile
--- a/MSI/Base/locale/MSIBase.pot
+++ b/MSI/Base/locale/MSIBase.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2017-02-02 18:14+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"
@@ -16,8 +16,7 @@ msgstr ""
 "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-1: ver1.0/MSI/Base/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
@@ -27,10 +26,6 @@ msgstr ""
 #: 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
 msgid "[ProductName] requires Windows Vista or later version of Windows."
 msgstr ""

@@ -50,14 +45,6 @@ msgstr ""
 #: 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
 msgid "http://www.geant.org/"
 msgstr ""

@@ -69,9 +56,5 @@ msgstr ""
 #: 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
 msgid "https://github.com/Amebis/GEANTLink/releases"
 msgstr ""
--- a/MSI/Base/locale/cs_CZ.po
+++ b/MSI/Base/locale/cs_CZ.po
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/MSI/Base/locale/es_ES.po
+++ b/MSI/Base/locale/es_ES.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: José Manuel Macías, 2016\n"
+"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/MSI/Base/locale/lt_LT.po
+++ b/MSI/Base/locale/lt_LT.po
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/MSI/Base/locale/sk_SK.po
+++ b/MSI/Base/locale/sk_SK.po
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
--- a/MSILocal.mak
+++ b/MSILocal.mak
--- a/BIN
+++ b/BIN
--- a/MakefileLang.mak
+++ b/MakefileLang.mak
--- a/MakefileLangPlatCfg.mak
+++ b/MakefileLangPlatCfg.mak
--- a/MakefilePlat.mak
+++ b/MakefilePlat.mak
--- a/MakefilePlatCfg.mak
+++ b/MakefilePlatCfg.mak
--- a/MsiUseFeature/MsiUseFeature.rc
+++ b/MsiUseFeature/MsiUseFeature.rc
--- a/MsiUseFeature/MsiUseFeature.vcxproj
+++ b/MsiUseFeature/MsiUseFeature.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -30,102 +22,66 @@
    <ProjectGuid>{679D03C5-CD70-4FFA-93F8-A4AB3637509B}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>MsiUseFeature</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="MsiUseFeature.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="MsiUseFeature.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="MsiUseFeature.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="MsiUseFeature.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="MsiUseFeature.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="MsiUseFeature.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -135,9 +91,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -147,7 +101,7 @@
    <ResourceCompile Include="MsiUseFeature.rc" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X clients for enterpr
    - PAP
    - MSCHAPv2
    - EAP-MSCHAPv2
-    - EAP-GTC: Challenge/Response and Password authentication modes
    - System-installed EAP method chaining (experimental)

 ### Security
@@ -32,17 +31,14 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X clients for enterpr
 - Lockable network profile configuration

 ### Deployment
- Released as multi-lingual x86, x64, and ARM64 MSI packages; Group Policy deployment supported
- [MsiUseFeature utility](https://github.com/Amebis/GEANTLink/tree/master/MsiUseFeature) for GÉANTLink install state testing (for embedding GÉANTLink into other setup packages)
- [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/master/CredWrite) for automated user credential import to Credential Manager
- [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/master/WLANManager) to allow network profile configuration dialog shortcuts
+- Released as multi-lingual 32 and 64-bit MSI packages; Group Policy deployment supported
+- [MsiUseFeature utility](https://github.com/Amebis/GEANTLink/tree/ver1.1/MsiUseFeature) for GÉANTLink install state testing (for embedding GÉANTLink into other setup packages)
+- [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/ver1.1/CredWrite) for automated user credential import to Credential Manager
+- [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/ver1.1/WLANManager) to allow network profile configuration dialog shortcuts

 ### Supported operating systems
 - Windows Vista, Windows Server 2008
 - Windows 7, Windows Server 2008 R2
- Windows 8 Desktop, Windows Server 2012
- Windows 8.1 Desktop, Windows Server 2012 R2
- Windows 10 Desktop, Windows Server 2016

 ## Download
 Binaries are available for download [here](https://github.com/Amebis/GEANTLink/releases).
@@ -51,36 +47,29 @@ Binaries are available for download [here](https://github.com/Amebis/GEANTLink/r

 ### Building Environment Requirements
 - Microsoft Windows Vista or later
- Microsoft Visual Studio 2017
+- Microsoft Visual Studio 2010 SP1
 - _msgfmt.exe_ from [gettext](https://www.gnu.org/software/gettext/);
  Hint: [Poedit](https://poedit.net/) contains up-to-date binary Win32 compiled gettext-utilities. Install it and add `GettextTools\bin` folder to the system path.
 - _sed.exe_ and _grep.exe_
 - _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's `Bin` folder to the system path.

 ### wxWidgets
-GÉANTLink is using wxWidgets static libraries. Since upstream wxWidgets libraries don't support ARM64 yet, a clone with ARM64 support was prepared at [GitHub](https://github.com/Amebis/wxWidgets.git).
+GÉANTLink is using wxWidgets v3.0.2 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets).

-#### Compiling wxWidgets x86 static libraries
-1. Start _x86 Native Tools Command Prompt for VS 2017_
+#### Compiling wxWidgets Win32 static libraries
+1. Start _Visual Studio Command Prompt (2010)_
 2. Change working folder to `build\msw`
-3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141`
-4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 BUILD=release`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 BUILD=release`

 #### Compiling wxWidgets x64 static libraries
-1. Start _x64 Native Tools Command Prompt for VS 2017_
+1. Start _Visual Studio x64 Cross Tools Command Prompt (2010)_
 2. Change working folder to `build\msw`
-3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64`
-4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64 BUILD=release`
-
-#### Compiling wxWidgets ARM64 static libraries
-1. Start command prompt
-2. Change working folder to `build\msw`
-3. Run: `"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"`
-3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=ARM64 USE_OPENGL=0`
-4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=ARM64 USE_OPENGL=0 BUILD=release`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64 BUILD=release`

 #### Specifying wxWidgets path
-GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets`).
+GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets\3.0.2`).

 ### Digital Signing of Build Outputs
 In order to have the build process digitally sign output files, one should provide the following:
@@ -88,7 +77,7 @@ In order to have the build process digitally sign output files, one should provi
 1. A signing certificate installed in the current user’s certificate store.
 2. The following variables in the environment:
  - `ManifestCertificateThumbprint` - set the value to certificate’s SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
-  - `ManifestTimestampRFC3161Url` - set the value to URL used to perform RFC3161 timestamp signature (i.e. `http://sha256timestamp.ws.symantec.com/sha256/timestamp`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
+  - `ManifestTimestampUrl` - set the value to URL used to perform timestamp signature (i.e. `http://timestamp.verisign.com/scripts/timstamp.dll`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.

 Please note that only Release builds are configured for timestamp signing. Debug configurations do not attempt to timestamp sign the resulting DLL and EXE files in order to speed up the building process and enable offline building.

@@ -100,7 +89,7 @@ GÉANTLink has some submodules. When cloning Git repository, make sure to use `-

 After clone is complete, grant _Users_ local group read and execute permissions to `output` subfolder (when working folder is private). This allows _EapHost_ service to load GÉANTLink's DLL, and Event Viewer to display GÉANTLink events.

-GÉANTLink can be build and debugged opening _GEANTLink.sln_ in Visual C++ IDE.
+GÉANTLink can be build and debugged opening _VS10Solution.sln_ in Visual C++ 2010 IDE.

 Before one can attempt to debug EAP DLLs, you should run `nmake register` from an elevated command prompt. See _Building in command line_ chapter below.

@@ -109,7 +98,7 @@ Next, one must configure a network profile actually using GÉANTLink for the aut
 GÉANTLink EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLSUI.dll_).

 ##### Backend DLL
-The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _GEANTLink.sln_, and attach to the running _Eap3Host.exe_ process.
+The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _VS10Solution.sln_, and attach to the running _Eap3Host.exe_ process.

 On initial connection attempt _Eap3Host.exe_ will load the DLL and will not release it until _EapHost_ service is restarted. To release our DLL (i.e. for rebuild) you have to restart _EapHost_ service manually or run `nmake register` again.

@@ -123,7 +112,7 @@ A few seconds after desired function call has finished, _DllHost.exe_ terminates
 To debug early life of our GUI DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to attach the debugger to _DllHost.exe_ process before our DLL starts.

 #### Building in command line
-Open _x64 Native Tools Command Prompt for VS 2017_ for building.
+Use of standard command prompt is recommended, providing that Microsoft Visual Studio 2010 folders containing _nmake.exe_ and _devenv.com_ are added to the system path.

 Use Microsoft NMAKE to build the project.

--- a/VS10Solution.sln
+++ b/VS10Solution.sln
@@ -0,0 +1,261 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14D5FE5B-9742-4D1F-A1E0-32E694B94AAB}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+		include\Version.h = include\Version.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EAP Methods", "EAP Methods", "{60BAAC3D-DC98-4C19-BC40-1A86963DE86C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\EAPTTLS\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\EAPTTLSUI\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase_UI", "lib\EAPBase_UI\build\EAPBase_UI.vcxproj", "{D4B54856-BE1F-4937-A8F7-495125BE76BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP", "lib\PAP\build\PAP.vcxproj", "{36B0CF8A-7794-46C3-8099-825BA962B4C7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS", "lib\TLS\build\TLS.vcxproj", "{4D40CB8A-812E-4F12-B23A-31AF743878E8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS", "lib\TTLS\build\TTLS.vcxproj", "{EE0EF0D9-A475-4038-8637-5754724F65B0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP_UI", "lib\PAP_UI\build\PAP_UI.vcxproj", "{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS_UI", "lib\TLS_UI\build\TLS_UI.vcxproj", "{9A25C261-8ADE-4938-8393-E857EF0E37E9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS_UI", "lib\TTLS_UI\build\TTLS_UI.vcxproj", "{42F0F0F4-C928-4860-A4E4-94991C2C3D90}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsiUseFeature", "MsiUseFeature\MsiUseFeature.vcxproj", "{679D03C5-CD70-4FFA-93F8-A4AB3637509B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventMonitor", "EventMonitor\EventMonitor.vcxproj", "{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2", "lib\MSCHAPv2\build\MSCHAPv2.vcxproj", "{86A6D6A0-4B7D-4134-BE81-A5755C77584D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2_UI", "lib\MSCHAPv2_UI\build\MSCHAPv2_UI.vcxproj", "{7AF5B922-7C17-428A-97E0-09E3B41A684D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost", "lib\EapHost\build\EapHost.vcxproj", "{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost_UI", "lib\EapHost_UI\build\EapHost_UI.vcxproj", "{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|Win32.Build.0 = Debug|Win32
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.ActiveCfg = Debug|x64
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.Build.0 = Debug|x64
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|Win32.ActiveCfg = Release|Win32
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|Win32.Build.0 = Release|Win32
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.ActiveCfg = Release|x64
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.Build.0 = Release|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|Win32.Build.0 = Debug|Win32
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.ActiveCfg = Debug|x64
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.Build.0 = Debug|x64
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|Win32.ActiveCfg = Release|Win32
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|Win32.Build.0 = Release|Win32
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.ActiveCfg = Release|x64
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.Build.0 = Release|x64
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|Win32.Build.0 = Debug|Win32
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.ActiveCfg = Debug|x64
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.Build.0 = Debug|x64
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|Win32.ActiveCfg = Release|Win32
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|Win32.Build.0 = Release|Win32
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.ActiveCfg = Release|x64
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.Build.0 = Release|x64
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|Win32.Build.0 = Debug|Win32
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.ActiveCfg = Debug|x64
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.Build.0 = Debug|x64
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|Win32.ActiveCfg = Release|Win32
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|Win32.Build.0 = Release|Win32
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.ActiveCfg = Release|x64
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.Build.0 = Release|x64
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|Win32.Build.0 = Debug|Win32
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.ActiveCfg = Debug|x64
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.Build.0 = Debug|x64
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|Win32.ActiveCfg = Release|Win32
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|Win32.Build.0 = Release|Win32
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.ActiveCfg = Release|x64
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.Build.0 = Release|x64
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|Win32.Build.0 = Debug|Win32
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.ActiveCfg = Debug|x64
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.Build.0 = Debug|x64
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|Win32.ActiveCfg = Release|Win32
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|Win32.Build.0 = Release|Win32
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.ActiveCfg = Release|x64
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.Build.0 = Release|x64
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|Win32.Build.0 = Debug|Win32
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.ActiveCfg = Debug|x64
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.Build.0 = Debug|x64
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|Win32.ActiveCfg = Release|Win32
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|Win32.Build.0 = Release|Win32
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.ActiveCfg = Release|x64
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.Build.0 = Release|x64
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|Win32.Build.0 = Debug|Win32
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.ActiveCfg = Debug|x64
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.Build.0 = Debug|x64
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|Win32.ActiveCfg = Release|Win32
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|Win32.Build.0 = Release|Win32
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.ActiveCfg = Release|x64
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.Build.0 = Release|x64
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|Win32.Build.0 = Debug|Win32
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.ActiveCfg = Debug|x64
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.Build.0 = Debug|x64
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|Win32.ActiveCfg = Release|Win32
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|Win32.Build.0 = Release|Win32
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.ActiveCfg = Release|x64
+		{EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.Build.0 = Release|x64
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|Win32.Build.0 = Debug|Win32
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.ActiveCfg = Debug|x64
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.Build.0 = Debug|x64
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|Win32.ActiveCfg = Release|Win32
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|Win32.Build.0 = Release|Win32
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.ActiveCfg = Release|x64
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.Build.0 = Release|x64
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|Win32.Build.0 = Debug|Win32
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.ActiveCfg = Debug|x64
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.Build.0 = Debug|x64
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|Win32.ActiveCfg = Release|Win32
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|Win32.Build.0 = Release|Win32
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.ActiveCfg = Release|x64
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.Build.0 = Release|x64
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|Win32.ActiveCfg = Debug|Win32
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|Win32.Build.0 = Debug|Win32
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.ActiveCfg = Debug|x64
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.Build.0 = Debug|x64
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|Win32.ActiveCfg = Release|Win32
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|Win32.Build.0 = Release|Win32
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.ActiveCfg = Release|x64
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.Build.0 = Release|x64
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|Win32.Build.0 = Debug|Win32
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.ActiveCfg = Debug|x64
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.Build.0 = Debug|x64
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|Win32.ActiveCfg = Release|Win32
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|Win32.Build.0 = Release|Win32
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.ActiveCfg = Release|x64
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.Build.0 = Release|x64
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|Win32.Build.0 = Debug|Win32
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.ActiveCfg = Debug|x64
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.Build.0 = Debug|x64
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|Win32.ActiveCfg = Release|Win32
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|Win32.Build.0 = Release|Win32
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.ActiveCfg = Release|x64
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.Build.0 = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.Build.0 = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.ActiveCfg = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.Build.0 = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|Win32.Build.0 = Debug|Win32
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.ActiveCfg = Debug|x64
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.Build.0 = Debug|x64
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|Win32.ActiveCfg = Release|Win32
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|Win32.Build.0 = Release|Win32
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.ActiveCfg = Release|x64
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.Build.0 = Release|x64
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|Win32.Build.0 = Debug|Win32
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.ActiveCfg = Debug|x64
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.Build.0 = Debug|x64
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|Win32.ActiveCfg = Release|Win32
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|Win32.Build.0 = Release|Win32
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.ActiveCfg = Release|x64
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.Build.0 = Release|x64
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|Win32.Build.0 = Debug|Win32
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.ActiveCfg = Debug|x64
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.Build.0 = Debug|x64
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|Win32.ActiveCfg = Release|Win32
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|Win32.Build.0 = Release|Win32
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.ActiveCfg = Release|x64
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.Build.0 = Release|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|Win32.Build.0 = Debug|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.ActiveCfg = Debug|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.Build.0 = Debug|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|Win32.ActiveCfg = Release|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|Win32.Build.0 = Release|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.ActiveCfg = Release|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.Build.0 = Release|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|Win32.Build.0 = Debug|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.ActiveCfg = Debug|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.Build.0 = Debug|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|Win32.ActiveCfg = Release|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|Win32.Build.0 = Release|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.ActiveCfg = Release|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{331B6077-E3E2-4867-B93E-9D3F57280DE7} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
+		{DD7A97CA-F18E-43B7-95C4-D06E6A291624} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{AD6816A0-9600-4E01-8C49-39D03D1E791F} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{D4B54856-BE1F-4937-A8F7-495125BE76BE} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{36B0CF8A-7794-46C3-8099-825BA962B4C7} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{4D40CB8A-812E-4F12-B23A-31AF743878E8} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{EE0EF0D9-A475-4038-8637-5754724F65B0} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{3D309C2E-64AB-4BC4-A16D-468571A2BC1A} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{9A25C261-8ADE-4938-8393-E857EF0E37E9} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{42F0F0F4-C928-4860-A4E4-94991C2C3D90} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{86A6D6A0-4B7D-4134-BE81-A5755C77584D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{7AF5B922-7C17-428A-97E0-09E3B41A684D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
+		{679D03C5-CD70-4FFA-93F8-A4AB3637509B} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
+		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
+		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
+	EndGlobalSection
+EndGlobal
--- a/WLANManager/MSIBuild/Makefile
+++ b/WLANManager/MSIBuild/Makefile
--- a/WLANManager/README.md
+++ b/WLANManager/README.md
@@ -1,13 +1,12 @@
-# WLANManager
+#WLANManager
 Invokes standard Windows Wireless Network Properties dialog

-## Usage
+##Usage
 ```
-WLANManager profile <profile name> [interface <interface name>]
+WLANManager profile <name> [interface <name>]
 ```

- `profile name`   - The name of the network profile (not neccessarely the same as SSID)
- `interface name` - The name of the specific network interface to search the profile at
+- `name` - The name of the network profile (not neccessarely the same as SSID)

 Return codes:
 - -1 = Invalid parameters
--- a/WLANManager/WLANManager.rc
+++ b/WLANManager/WLANManager.rc
--- a/WLANManager/WLANManager.vcxproj
+++ b/WLANManager/WLANManager.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -30,102 +22,66 @@
    <ProjectGuid>{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>WLANManager</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="WLANManager.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="WLANManager.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
    <Import Project="WLANManager.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="WLANManager.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="WLANManager.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
    <Import Project="WLANManager.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="StdAfx.h" />
  </ItemGroup>
@@ -135,16 +91,14 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="WLANManager.rc" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/WLANManager/locale/WLANManager.pot
+++ b/WLANManager/locale/WLANManager.pot
@@ -16,8 +16,7 @@ msgstr ""
 "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-1: ver1.0/WLANManager\n"

 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
--- a/WLANManager/locale/cs_CZ.po
+++ b/WLANManager/locale/cs_CZ.po
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/WLANManager/locale/es_ES.po
+++ b/WLANManager/locale/es_ES.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: WLANManager\n"
 "POT-Creation-Date: 2016-11-08 11:51+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: José Manuel Macías, 2016\n"
+"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/WLANManager/locale/lt_LT.po
+++ b/WLANManager/locale/lt_LT.po
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/WLANManager/locale/sk_SK.po
+++ b/WLANManager/locale/sk_SK.po
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 1.8.11\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
--- a/include/ARM64.props
+++ b/include/ARM64.props
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2016-2018 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_arm64_lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>wxNO_GL_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Lib>
-      <TargetMachine>MachineARM64</TargetMachine>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineARM64</TargetMachine>
-      <AdditionalDependencies>advapi32.lib;ole32.lib;oleaut32.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
--- a/include/Common.props
+++ b/include/Common.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2018 Amebis
+    Copyright 2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -28,12 +28,11 @@
    <OutDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</OutDir>
    <IncludePath>$(WXWIN)\include\msvc;$(WXWIN)\include;$(IncludePath)</IncludePath>
    <SourcePath>$(WXWIN)\src\aui;$(WXWIN)\src\cocoa;$(WXWIN)\src\common;$(WXWIN)\src\dfb;$(WXWIN)\src\expat;$(WXWIN)\src\generic;$(WXWIN)\src\gtk;$(WXWIN)\src\gtk1;$(WXWIN)\src\html;$(WXWIN)\src\jpeg;$(WXWIN)\src\motif;$(WXWIN)\src\msdos;$(WXWIN)\src\msw;$(WXWIN)\src\os2;$(WXWIN)\src\osx;$(WXWIN)\src\png;$(WXWIN)\src\propgrid;$(WXWIN)\src\regex;$(WXWIN)\src\ribbon;$(WXWIN)\src\richtext;$(WXWIN)\src\stc;$(WXWIN)\src\tiff;$(WXWIN)\src\univ;$(WXWIN)\src\unix;$(WXWIN)\src\x11;$(WXWIN)\src\xml;$(WXWIN)\src\xrc;$(WXWIN)\src\zlib;$(SourcePath)</SourcePath>
-    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;SECURITY_WIN32;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;EAP_TLS=1;wxMSVC_VERSION=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;SECURITY_WIN32;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;EAP_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -47,9 +46,6 @@
    <POCompile>
      <OutputFile>$(OutDir)..\locale\%(Filename)\$(ProjectName).mo</OutputFile>
    </POCompile>
-    <Manifest>
-      <EnableDpiAwareness>true</EnableDpiAwareness>
-    </Manifest>
  </ItemDefinitionGroup>
  <ItemGroup />
 </Project>
--- a/include/Debug.props
+++ b/include/Debug.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2018 Amebis
+    Copyright 2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -26,6 +26,7 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <SmallerTypeCheck>true</SmallerTypeCheck>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    </ClCompile>
    <ResourceCompile>
@@ -38,7 +39,7 @@
  <ItemGroup />
  <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
    <Message Text="Signing output file..." />
-    <Exec Command="signtool.exe sign /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /q &quot;$(OutDir)$(TargetName)$(TargetExt)&quot;" />
+    <SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />
    <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
  </Target>
 </Project>
--- a/include/MSIBuildCfg.mak
+++ b/include/MSIBuildCfg.mak
--- a/include/Release.props
+++ b/include/Release.props
@@ -43,7 +43,7 @@
  <ItemGroup />
  <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
    <Message Text="Signing output file..." />
-    <Exec Command="signtool.exe sign /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /tr &quot;%ManifestTimestampRFC3161Url%&quot; /q &quot;$(OutDir)$(TargetName)$(TargetExt)&quot;" />
+    <SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />
    <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
  </Target>
 </Project>
--- a/include/Version.h
+++ b/include/Version.h
@@ -29,7 +29,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x01020900
+#define PRODUCT_VERSION          0x01010700

 //
 // Product version by components
@@ -38,27 +38,27 @@
 // separately.
 //
 #define PRODUCT_VERSION_MAJ      1
-#define PRODUCT_VERSION_MIN      2
-#define PRODUCT_VERSION_REV      9
+#define PRODUCT_VERSION_MIN      1
+#define PRODUCT_VERSION_REV      7
 #define PRODUCT_VERSION_BUILD    0

 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "1.2e"
-#define PRODUCT_BUILD_YEAR_STR   "2018"
+#define PRODUCT_VERSION_STR      "1.1d"
+#define PRODUCT_BUILD_YEAR_STR   "2017"

 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "1.2.9"
+#define PRODUCT_VERSION_INST     "1.1.7"

 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{81CC33C6-8914-4D56-9568-5B8409ADCA64}"
+#define PRODUCT_VERSION_GUID     "{8AE8EFC4-9183-4911-A033-9C03F9A89FCD}"

 //
 // Product vendor
--- a/include/Win32.props
+++ b/include/Win32.props
@@ -24,7 +24,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(WXWIN)\lib\vc_lib;$(LibraryPath)</LibraryPath>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <Lib>
--- a/include/x64.props
+++ b/include/x64.props
@@ -24,7 +24,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_x64_lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(WXWIN)\lib\vc_x64_lib;$(LibraryPath)</LibraryPath>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <Lib>
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -0,0 +1,2 @@
+/GTC
+/GTC_UI
--- a/lib/EAPBase/build/EAPBase.vcxproj
+++ b/lib/EAPBase/build/EAPBase.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{AD6816A0-9600-4E01-8C49-39D03D1E791F}</ProjectGuid>
    <RootNamespace>EAPBase</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EAPBase.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EAPBase.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EAPBase.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EAPBase.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EAPBase.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EAPBase.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\Config.h" />
    <ClInclude Include="..\include\Credentials.h" />
@@ -127,7 +85,6 @@
    <ClInclude Include="..\include\EAPXML.h" />
    <ClInclude Include="..\include\Method.h" />
    <ClInclude Include="..\include\Module.h" />
-    <ClInclude Include="..\include\UIContext.h" />
    <ClInclude Include="..\src\StdAfx.h" />
  </ItemGroup>
  <ItemGroup>
@@ -140,11 +97,8 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
-    <ClCompile Include="..\src\UIContext.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\Events\build\Events.vcxproj">
--- a/lib/EAPBase/build/EAPBase.vcxproj.filters
+++ b/lib/EAPBase/build/EAPBase.vcxproj.filters
@@ -32,9 +32,6 @@
    <ClInclude Include="..\include\Credentials.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\include\UIContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\StdAfx.cpp">
@@ -55,8 +52,5 @@
    <ClCompile Include="..\src\EAP.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\UIContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
  </ItemGroup>
 </Project>
--- a/lib/EAPBase/include/Credentials.h
+++ b/lib/EAPBase/include/Credentials.h
@@ -226,98 +226,6 @@ namespace eap
    };


-    ///
-    /// Identity-only based method credentials
-    ///
-    class credentials_identity : public credentials
-    {
-    public:
-        ///
-        /// Constructs credentials
-        ///
-        /// \param[in] mod  EAP module to use for global services
-        ///
-        credentials_identity(_In_ module &mod);
-
-        ///
-        /// Copies credentials
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        credentials_identity(_In_ const credentials_identity &other);
-
-        ///
-        /// Moves credentials
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        credentials_identity(_Inout_ credentials_identity &&other);
-
-        ///
-        /// Copies credentials
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        credentials_identity& operator=(_In_ const credentials_identity &other);
-
-        ///
-        /// Moves credentials
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        credentials_identity& operator=(_Inout_ credentials_identity &&other);
-
-        virtual config* clone() const;
-
-        /// \name XML management
-        /// @{
-        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-        /// @}
-
-        /// \name Storage
-        /// @{
-        virtual void store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const;
-        virtual void retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level);
-
-        ///
-        /// @copydoc eap::credentials::target_suffix()
-        /// \returns This implementation always returns `_T("pass")`
-        ///
-        virtual LPCTSTR target_suffix() const;
-        /// @}
-
-        ///
-        /// Combine credentials in the following order:
-        ///
-        /// 1. Cached credentials
-        /// 2. Configured credentials (if \p cfg is derived from `config_method_with_cred`)
-        /// 3. Stored credentials
-        ///
-        /// \param[in] dwFlags                A combination of [EAP flags](https://msdn.microsoft.com/en-us/library/windows/desktop/bb891975.aspx) that describe the EAP authentication session behavior
-        /// \param[in] hTokenImpersonateUser  Impersonation token for a logged-on user to collect user-related information
-        /// \param[in] cred_cached            Cached credentials (optional, can be \c NULL)
-        /// \param[in] cfg                    Method configuration (when derived from `config_method_with_cred`, metod attempt to load credentials from \p cfg)
-        /// \param[in] pszTargetName          The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
-        ///
-        /// \returns
-        /// - \c source_cache   Credentials were obtained from EapHost cache
-        /// - \c source_config  Credentials were set by method configuration
-        /// - \c source_storage Credentials were loaded from Windows Credential Manager
-        ///
-        virtual source_t combine(
-            _In_             DWORD         dwFlags,
-            _In_             HANDLE        hTokenImpersonateUser,
-            _In_opt_   const credentials   *cred_cached,
-            _In_       const config_method &cfg,
-            _In_opt_z_       LPCTSTR       pszTargetName);
-    };
-
-
    ///
    /// Password based method credentials
    ///
--- a/lib/EAPBase/include/EAP.h
+++ b/lib/EAPBase/include/EAP.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -651,7 +651,7 @@ namespace eap
    ///
    /// Sanitizing BLOB of fixed size
    ///
-    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f<N>
    {
        unsigned char data[N]; ///< BLOB data

@@ -672,16 +672,6 @@ namespace eap
            memcpy(data, other.data, N);
        }

-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  BLOB to move from
-        ///
-        inline sanitizing_blob_f(_Inout_ sanitizing_blob_f<N> &&other)
-        {
-            memcpy(data, other.data, N);
-        }
-
        ///
        /// Moves the BLOB
        ///
@@ -718,21 +708,7 @@ namespace eap
        ///
        /// Moves the BLOB
        ///
-        /// \param[inout] other  BLOB to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_f& operator=(_Inout_ sanitizing_blob_f<N> &&other)
-        {
-            if (this != std::addressof(other))
-                memcpy(data, other.data, N);
-            return *this;
-        }
-
-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  Zero-initialized BLOB to move from
+        /// \param[inout] other  Zero-initialized BLOB to copy from
        ///
        /// \returns Reference to this object
        ///
@@ -802,7 +778,7 @@ namespace eap
    ///
    /// Sanitizing BLOB of fixed size (zero initialized)
    ///
-    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf : sanitizing_blob_f<N>
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf<N> : sanitizing_blob_f<N>
    {
        ///
        /// Constructor
@@ -812,27 +788,6 @@ namespace eap
            memset(data, 0, N);
        }

-        ///
-        /// Copies a BLOB
-        ///
-        /// \param[in] other  Zero-initialized BLOB to copy from
-        ///
-        inline sanitizing_blob_zf(_In_ const sanitizing_blob_zf<N> &other) :
-            sanitizing_blob_f<N>(other)
-        {
-        }
-
-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  Zero-initialized BLOB to move from
-        ///
-        inline sanitizing_blob_zf(_Inout_ sanitizing_blob_zf<N> &&other) :
-            sanitizing_blob_f<N>(std::move(other))
-        {
-            memset(other.data, 0, N);
-        }
-
        ///
        /// Copies a BLOB
        ///
@@ -843,72 +798,14 @@ namespace eap
        {
        }

-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  BLOB to move from
-        ///
-        inline sanitizing_blob_zf(_Inout_ sanitizing_blob_f<N> &&other) :
-            sanitizing_blob_f<N>(std::move(other))
-        {
-        }
-
-        ///
-        /// Copies a BLOB
-        ///
-        /// \param[in] other  Zero-initialized BLOB to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_zf& operator=(_In_ const sanitizing_blob_zf<N> &other)
-        {
-            if (this != std::addressof(other))
-                memcpy(data, other.data, N);
-            return *this;
-        }
-
        ///
        /// Moves the BLOB
        ///
        /// \param[inout] other  Zero-initialized BLOB to move from
        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_zf& operator=(_Inout_ sanitizing_blob_zf<N> &&other)
+        inline sanitizing_blob_zf(_Inout_ sanitizing_blob_zf<N> &&other) :
+            sanitizing_blob_f<N>(std::move(other))
        {
-            if (this != std::addressof(other)) {
-                memcpy(data, other.data, N);
-                memset(other.data, 0, N);
-            }
-            return *this;
-        }
-
-        ///
-        /// Copies a BLOB
-        ///
-        /// \param[in] other  BLOB to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_zf& operator=(_In_ const sanitizing_blob_f<N> &other)
-        {
-            if (this != std::addressof(other))
-                memcpy(data, other.data, N);
-            return *this;
-        }
-
-        ///
-        /// Moves the BLOB
-        ///
-        /// \param[inout] other  BLOB to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        inline sanitizing_blob_zf& operator=(_Inout_ sanitizing_blob_f<N> &&other)
-        {
-            if (this != std::addressof(other))
-                memcpy(data, other.data, N);
-            return *this;
        }
    };
 #pragma pack(pop)
--- a/lib/EAPBase/include/UIContext.h
+++ b/lib/EAPBase/include/UIContext.h
@@ -1,102 +0,0 @@
-/*
-    Copyright 2015-2017 Amebis
-    Copyright 2016-2017 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace eap
-{
-    class ui_context;
-}
-
-#pragma once
-
-#include "Config.h"
-#include "Credentials.h"
-#include "Module.h"
-
-#include "../../../include/Version.h"
-
-
-namespace eap
-{
-    ///
-    /// \defgroup EAPBaseUICtx  UI Context
-    /// Back and front-end inter-process data exchange
-    ///
-    /// @{
-
-    ///
-    /// UI context
-    ///
-    class ui_context : public packable
-    {
-    public:
-        ///
-        /// Constructs context
-        ///
-        /// \param[in] cfg   Connection configuration
-        /// \param[in] cred  Connection credentials
-        ///
-        ui_context(_In_ config_connection &cfg, _In_ credentials_connection &cred);
-
-        ///
-        /// Copies context
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        ui_context(_In_ const ui_context &other);
-
-        ///
-        /// Moves context
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        ui_context(_Inout_ ui_context &&other);
-
-        ///
-        /// Copies context
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        ui_context& operator=(_In_ const ui_context &other);
-
-        ///
-        /// Moves context
-        ///
-        /// \param[in] other  Configuration to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        ui_context& operator=(_Inout_ ui_context &&other);
-
-        /// \name BLOB management
-        /// @{
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-        virtual size_t get_pk_size() const;
-        virtual void operator>>(_Inout_ cursor_in &cursor);
-        /// @}
-
-    public:
-        config_connection &m_cfg;       ///< Connection configuration
-        credentials_connection &m_cred; ///< Connection credentials
-    };
-
-    /// @}
-}
--- a/lib/EAPBase/src/Credentials.cpp
+++ b/lib/EAPBase/src/Credentials.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2018 Amebis
+    Copyright 2015-2016 Amebis
    Copyright 2016 GÉANT

    This file is part of GÉANTLink.
@@ -159,184 +159,7 @@ tstring eap::credentials::get_name() const
    tstring identity(std::move(get_identity()));
    return
        !identity.empty() ? identity :
-        empty()           ? _T("(empty)") : _T("(blank ID)");
-}
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::credentials_identity
-//////////////////////////////////////////////////////////////////////
-
-eap::credentials_identity::credentials_identity(_In_ module &mod) : credentials(mod)
-{
-}
-
-
-eap::credentials_identity::credentials_identity(_In_ const credentials_identity &other) : credentials(other)
-{
-}
-
-
-eap::credentials_identity::credentials_identity(_Inout_ credentials_identity &&other) : credentials(std::move(other))
-{
-}
-
-
-eap::credentials_identity& eap::credentials_identity::operator=(_In_ const credentials_identity &other)
-{
-    if (this != &other)
-        (credentials&)*this = other;
-
-    return *this;
-}
-
-
-eap::credentials_identity& eap::credentials_identity::operator=(_Inout_ credentials_identity &&other)
-{
-    if (this != &other)
-        (credentials&)*this = std::move(other);
-
-    return *this;
-}
-
-
-eap::config* eap::credentials_identity::clone() const
-{
-    return new credentials_identity(*this);
-}
-
-
-void eap::credentials_identity::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
-{
-    assert(pDoc);
-    assert(pConfigRoot);
-
-    // We could have used credentials::save() to save identity,
-    // but that method tolerates absence of <UserName> element,
-    // whereas for this class the absence of <UserName> is fatal.
-    config::save(pDoc, pConfigRoot);
-
-    HRESULT hr;
-
-    // <UserName>
-    if (FAILED(hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"UserName"), namespace_eapmetadata, bstr(m_identity))))
-        throw com_runtime_error(hr, __FUNCTION__ " Error creating <UserName> element.");
-}
-
-
-void eap::credentials_identity::load(_In_ IXMLDOMNode *pConfigRoot)
-{
-    assert(pConfigRoot);
-    HRESULT hr;
-
-    // We could have used credentials::load() to load identity,
-    // but that method tolerates absence of <UserName> element,
-    // whereas for this class the absence of <UserName> is fatal.
-    config::load(pConfigRoot);
-
-    wstring xpath(eapxml::get_xpath(pConfigRoot));
-
-    if (FAILED(hr = eapxml::get_element_value(pConfigRoot, bstr(L"eap-metadata:UserName"), m_identity)))
-        throw com_runtime_error(hr, __FUNCTION__ " Error reading <UserName> element.");
-
-    m_module.log_config((xpath + L"/UserName").c_str(), m_identity.c_str());
-}
-
-
-void eap::credentials_identity::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const
-{
-    assert(pszTargetName);
-
-    tstring target(target_name(pszTargetName, level));
-
-    // Write credentials.
-    assert(m_identity.length() < CRED_MAX_USERNAME_LENGTH);
-    CREDENTIAL cred = {
-        0,                                     // Flags
-        CRED_TYPE_GENERIC,                     // Type
-        const_cast<LPTSTR>(target.c_str()),    // TargetName
-        _T(""),                                // Comment
-        { 0, 0 },                              // LastWritten
-        0,                                     // CredentialBlobSize
-        NULL,                                  // CredentialBlob
-        CRED_PERSIST_ENTERPRISE,               // Persist
-        0,                                     // AttributeCount
-        NULL,                                  // Attributes
-        NULL,                                  // TargetAlias
-        const_cast<LPTSTR>(m_identity.c_str()) // UserName
-    };
-    if (!CredWrite(&cred, 0))
-        throw win_runtime_error(__FUNCTION__ " CredWrite failed.");
-}
-
-
-void eap::credentials_identity::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level)
-{
-    assert(pszTargetName);
-
-    // Read credentials.
-    unique_ptr<CREDENTIAL, CredFree_delete<CREDENTIAL> > cred;
-    if (!CredRead(target_name(pszTargetName, level).c_str(), CRED_TYPE_GENERIC, 0, (PCREDENTIAL*)&cred))
-        throw win_runtime_error(__FUNCTION__ " CredRead failed.");
-
-    if (cred->UserName)
-        m_identity = cred->UserName;
-    else
-        m_identity.clear();
-
-    wstring xpath(pszTargetName);
-    m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str());
-}
-
-
-LPCTSTR eap::credentials_identity::target_suffix() const
-{
-    return _T("id");
-}
-
-
-eap::credentials::source_t eap::credentials_identity::combine(
-    _In_             DWORD         dwFlags,
-    _In_             HANDLE        hTokenImpersonateUser,
-    _In_opt_   const credentials   *cred_cached,
-    _In_       const config_method &cfg,
-    _In_opt_z_       LPCTSTR       pszTargetName)
-{
-    UNREFERENCED_PARAMETER(dwFlags);
-
-    if (cred_cached) {
-        // Using EAP service cached credentials.
-        *this = *dynamic_cast<const credentials_identity*>(cred_cached);
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
-        return source_cache;
-    }
-
-    auto cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg);
-    if (cfg_with_cred && cfg_with_cred->m_use_cred) {
-        // Using configured credentials.
-        *this = *dynamic_cast<const credentials_identity*>(cfg_with_cred->m_cred.get());
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
-        return source_config;
-    }
-
-    if (pszTargetName) {
-        // Switch user context.
-        user_impersonator impersonating(hTokenImpersonateUser);
-
-        try {
-            credentials_identity cred_loaded(m_module);
-            cred_loaded.retrieve(pszTargetName, cfg.m_level);
-
-            // Using stored credentials.
-            *this = std::move(cred_loaded);
-            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
-            return source_storage;
-        } catch (...) {
-            // Not actually an error.
-        }
-    }
-
-    return source_unknown;
+        empty()           ? _T("<empty>") : _T("<blank ID>");
 }


@@ -919,8 +742,8 @@ inline static basic_string<_Elem, _Traits, _Ax> kph_encode(_In_ unsigned char da
 {
    // Encode one byte of data.
    _Elem str[3] = {
-        static_cast<_Elem>('A' + (data >> 4       )),
-        static_cast<_Elem>('a' + (data      & 0x0f)),
+        'A' + (data >> 4       ),
+        'a' + (data      & 0x0f),
    };
    return str;
 } 
--- a/lib/EAPBase/src/StdAfx.h
+++ b/lib/EAPBase/src/StdAfx.h
@@ -24,7 +24,6 @@
 #include "../include/Credentials.h"
 #include "../include/Method.h"
 #include "../include/Module.h"
-#include "../include/UIContext.h"

 #include "../include/EAP.h"
 #include "../include/EAPXML.h"
--- a/lib/EAPBase/src/UIContext.cpp
+++ b/lib/EAPBase/src/UIContext.cpp
@@ -1,100 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-using namespace std;
-using namespace winstd;
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::ui_context
-//////////////////////////////////////////////////////////////////////
-
-eap::ui_context::ui_context(_In_ config_connection &cfg, _In_ credentials_connection &cred) :
-    m_cfg(cfg),
-    m_cred(cred)
-{
-}
-
-
-eap::ui_context::ui_context(_In_ const ui_context &other) :
-    m_cfg   (other.m_cfg ),
-    m_cred  (other.m_cred),
-    packable(other       )
-{
-}
-
-
-eap::ui_context::ui_context(_Inout_ ui_context &&other) :
-    m_cfg   (          other.m_cfg  ),
-    m_cred  (          other.m_cred ),
-    packable(std::move(other       ))
-{
-}
-
-
-eap::ui_context& eap::ui_context::operator=(_In_ const ui_context &other)
-{
-    if (this != &other) {
-        assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Copy context within same configuration only!
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Copy context within same credentials only!
-        (packable&)*this = other;
-    }
-
-    return *this;
-}
-
-
-eap::ui_context& eap::ui_context::operator=(_Inout_ ui_context &&other)
-{
-    if (this != &other) {
-        assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Move context within same configuration only!
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move context within same credentials only!
-        (packable&)*this = std::move(other);
-    }
-
-    return *this;
-}
-
-
-void eap::ui_context::operator<<(_Inout_ cursor_out &cursor) const
-{
-    packable::operator<<(cursor);
-    cursor << m_cfg ;
-    cursor << m_cred;
-}
-
-
-size_t eap::ui_context::get_pk_size() const
-{
-    return
-        packable::get_pk_size() +
-        pksizeof(m_cfg ) +
-        pksizeof(m_cred);
-}
-
-
-void eap::ui_context::operator>>(_Inout_ cursor_in &cursor)
-{
-    packable::operator>>(cursor);
-    cursor >> m_cfg ;
-    cursor >> m_cred;
-}
--- a/lib/EAPBase_UI/build/EAPBase_UI.vcxproj
+++ b/lib/EAPBase_UI/build/EAPBase_UI.vcxproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
@@ -29,97 +21,63 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{D4B54856-BE1F-4937-A8F7-495125BE76BE}</ProjectGuid>
    <RootNamespace>EAPBase_UI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EAPBase_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EAPBase_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
    <Import Project="EAPBase_UI.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EAPBase_UI.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="EAPBase_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
    <Import Project="EAPBase_UI.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
  <ItemGroup>
    <ClInclude Include="..\include\EAP_UI.h" />
    <ClInclude Include="..\include\Module.h" />
@@ -135,9 +93,7 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
--- a/lib/EAPBase_UI/include/EAP_UI.h
+++ b/lib/EAPBase_UI/include/EAP_UI.h
@@ -43,7 +43,6 @@ class wxEAPProviderIDPanel;
 class wxEAPConfigProvider;
 template <class _Tcred, class _wxT> class wxEAPCredentialsConfigPanel;
 template <class _Tcred, class _Tbase> class wxEAPCredentialsPanel;
-template <class _Tcred, class _Tbase> class wxIdentityCredentialsPanel;
 template <class _Tcred, class _Tbase> class wxPasswordCredentialsPanel;
 class wxEAPProviderSelectDialog;

@@ -95,7 +94,7 @@ inline wxIcon wxLoadIconFromResource(HINSTANCE hinst, PCWSTR pszName, const wxSi
 ///
 /// \returns
 /// - \p id when \p id is not blank;
-/// - localized "(Your Organization)" otherwise.
+/// - localized "<Your Organization>" otherwise.
 ///
 inline wxString wxEAPGetProviderName(const std::wstring &id);

@@ -852,11 +851,11 @@ protected:
                m_cred_storage.clear();
                m_has_storage = false;
            } else {
-                m_storage_identity->SetLabel(wxString::Format(_("(error %u)"), err.number()));
+                m_storage_identity->SetLabel(wxString::Format(_("<error %u>"), err.number()));
                m_has_storage = true;
            }
        } catch (...) {
-            m_storage_identity->SetLabel(_("(error)"));
+            m_storage_identity->SetLabel(_("<error>"));
            m_has_storage = true;
        }
    }
@@ -867,7 +866,7 @@ protected:
        wxString identity(m_cred_storage.get_identity());
        m_storage_identity->SetLabel(
            !identity.empty() ? identity :
-            m_cred_storage.empty() ? _("(empty)") : _("(blank ID)"));
+            m_cred_storage.empty() ? _("<empty>") : _("<blank ID>"));
    }


@@ -876,7 +875,7 @@ protected:
        wxString identity(m_cred_config.get_identity());
        m_config_identity->SetLabel(
            !identity.empty() ? identity :
-            m_cred_config.empty() ? _("(empty)") : _("(blank ID)"));
+            m_cred_config.empty() ? _("<empty>") : _("<blank ID>"));
    }

    /// \endcond
@@ -918,7 +917,7 @@ public:
        if (!is_config && !m_cfg.m_use_cred && m_cfg.m_allow_save) {
            m_remember = new wxCheckBox(m_sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember"));
            m_remember->SetHelpText(_("Check if you would like to save credentials"));
-            m_sb_credentials_vert->Add(m_remember, 0, wxALL|wxEXPAND, FromDIP(5));
+            m_sb_credentials_vert->Add(m_remember, 0, wxALL|wxEXPAND, 5);
        } else
            m_remember = NULL;
    }
@@ -954,14 +953,14 @@ protected:


 ///
-/// Generic identity credential entry panel
+/// Generic password credential entry panel
 ///
 template <class _Tcred, class _Tbase>
-class wxIdentityCredentialsPanel : public wxEAPCredentialsPanel<_Tcred, _Tbase>
+class wxPasswordCredentialsPanel : public wxEAPCredentialsPanel<_Tcred, _Tbase>
 {
 public:
    ///
-    /// Constructs a identity credentials panel
+    /// Constructs a password credentials panel
    ///
    /// \param[in]    prov       Provider configuration data
    /// \param[in]    cfg        Method configuration data
@@ -969,18 +968,19 @@ public:
    /// \param[in]    parent     Parent window
    /// \param[in]    is_config  Is this panel used to config credentials?
    ///
-    wxIdentityCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
+    wxPasswordCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
+        m_password_set(false),
        wxEAPCredentialsPanel<_Tcred, _Tbase>(prov, cfg, cred, parent, is_config)
    {
        // Load and set icon.
        winstd::library lib_shell32;
-        if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(/*16770*/269)));
+        if (lib_shell32.load(_T("imageres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(82)));

        bool layout = false;
        if (!m_prov.m_lbl_alt_credential.empty()) {
            m_credentials_label->SetLabel(m_prov.m_lbl_alt_credential);
-            m_credentials_label->Wrap( FromDIP(440) );
+            m_credentials_label->Wrap( 440 );
            layout = true;
        }

@@ -989,6 +989,11 @@ public:
            layout = true;
        }

+        if (!m_prov.m_lbl_alt_password.empty()) {
+            m_password_label->SetLabel(m_prov.m_lbl_alt_password);
+            layout = true;
+        }
+
        if (layout)
            this->Layout();
    }
@@ -1000,85 +1005,26 @@ protected:
    {
        m_identity->SetValue(m_cred.m_identity);
        m_identity->SetSelection(0, -1);
-
-        if (!m_is_config && m_cfg.m_use_cred) {
-            // Credential prompt mode & Using configured credentials
-            m_identity_label->Enable(false);
-            m_identity      ->Enable(false);
-        }
-
-        return wxEAPCredentialsPanel<_Tcred, _Tbase>::TransferDataToWindow();
-    }
-
-    virtual bool TransferDataFromWindow()
-    {
-        if (!wxEAPCredentialsPanel<_Tcred, _Tbase>::TransferDataFromWindow())
-            return false;
-
-        m_cred.m_identity = m_identity->GetValue();
-
-        return true;
-    }
-
-    /// \endcond
-};
-
-/// @}
-
-
-///
-/// Generic password credential entry panel
-///
-template <class _Tcred, class _Tbase>
-class wxPasswordCredentialsPanel : public wxIdentityCredentialsPanel<_Tcred, _Tbase>
-{
-public:
-    ///
-    /// Constructs a password credentials panel
-    ///
-    /// \param[in]    prov       Provider configuration data
-    /// \param[in]    cfg        Method configuration data
-    /// \param[inout] cred       Credentials data
-    /// \param[in]    parent     Parent window
-    /// \param[in]    is_config  Is this panel used to config credentials?
-    ///
-    wxPasswordCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
-        m_password_set(false),
-        wxIdentityCredentialsPanel<_Tcred, _Tbase>(prov, cfg, cred, parent, is_config)
-    {
-        // Load and set icon.
-        winstd::library lib_shell32;
-        if (lib_shell32.load(_T("imageres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(82)));
-
-        if (!m_prov.m_lbl_alt_password.empty()) {
-            m_password_label->SetLabel(m_prov.m_lbl_alt_password);
-            this->Layout();
-        }
-    }
-
-protected:
-    /// \cond internal
-
-    virtual bool TransferDataToWindow()
-    {
        m_password->SetValue(m_cred.m_password.empty() ? wxEmptyString : wxT("dummypass"));
        m_password_set = false;

        if (!m_is_config && m_cfg.m_use_cred) {
            // Credential prompt mode & Using configured credentials
+            m_identity_label->Enable(false);
+            m_identity      ->Enable(false);
            m_password_label->Enable(false);
            m_password      ->Enable(false);
        }

-        return wxIdentityCredentialsPanel<_Tcred, _Tbase>::TransferDataToWindow();
+        return wxEAPCredentialsPanel<_Tcred, wxPasswordCredentialsPanelBase>::TransferDataToWindow();
    }

    virtual bool TransferDataFromWindow()
    {
-        if (!wxIdentityCredentialsPanel<_Tcred, _Tbase>::TransferDataFromWindow())
+        if (!wxEAPCredentialsPanel<_Tcred, wxPasswordCredentialsPanelBase>::TransferDataFromWindow())
            return false;

+        m_cred.m_identity = m_identity->GetValue();
        if (m_password_set)
            m_cred.m_password = m_password->GetValue();

@@ -1087,7 +1033,7 @@ protected:

    virtual void OnPasswordText(wxCommandEvent& event)
    {
-        wxIdentityCredentialsPanel<_Tcred, _Tbase>::OnPasswordText(event);
+        wxEAPCredentialsPanel<_Tcred, _Tbase>::OnPasswordText(event);

        m_password_set = true;
    }
@@ -1128,7 +1074,7 @@ inline wxIcon wxLoadIconFromResource(HINSTANCE hinst, PCWSTR pszName, const wxSi
 inline wxString wxEAPGetProviderName(const std::wstring &id)
 {
    return
-        !id.empty() ? id : _("(Your Organization)");
+        !id.empty() ? id : _("<Your Organization>");
 }


--- a/lib/EAPBase_UI/res/wxEAP_UI.cpp
+++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Rozman	b1ea8465f4	Set version to 1.1d	2017-12-05 09:39:31 +01:00
Simon Rozman	0ecb5710b9	Translation update	2017-12-05 09:38:25 +01:00
Simon Rozman	4e136ecb28	Update wxExtend module	2017-12-05 09:37:49 +01:00
Simon Rozman	da4f300b47	Update WinStd submodule	2017-12-05 09:37:34 +01:00
Simon Rozman	e8f2cd237a	Ignore post v1.1 folders For easier switching between branches the non-v1.1 folders has been .gitignored.	2017-12-05 09:36:39 +01:00
Simon Rozman	9eaa46e185	Distribution folder changed	2017-11-20 12:07:18 +01:00
Simon Rozman	067fc26b32	Issue with NULL-initialized new profile configuration fixed	2017-07-10 10:48:55 +02:00
Simon Rozman	97c788298e	Translation update	2017-05-30 12:40:49 +02:00
Simon Rozman	3ba8cfb4c4	Sub-module update	2017-05-30 12:39:00 +02:00
Simon Rozman	1a89ca5e70	Version set to 1.1c	2017-05-22 09:29:50 +02:00
Simon Rozman	54d69aeec1	`daea1bba62` reverted	2017-05-22 09:16:27 +02:00
Simon Rozman	54934a619e	WMI\Autologger records not installed any more, since they caused feature completeness check trouble: MsiUseFeature() reports feature broken, when it is denied access to any component folder or registry key # Conflicts: # Makefile	2017-05-22 09:16:27 +02:00
Simon Rozman	c5f514ac56	MsiUseFeature() returning INSTALLSTATE_BROKEN is tolerated in non-elevated process now	2017-05-22 08:42:16 +02:00
Simon Rozman	3edcf6e1fd	WLANManager.exe now deployed as WLANManager-Win32.exe and WLANManager-x64.exe	2017-05-17 13:02:54 +02:00
Simon Rozman	9248c02db0	Documentation update	2017-05-17 12:51:16 +02:00
Simon Rozman	e2287c07c0	Sub-module update	2017-05-17 12:47:51 +02:00
Simon Rozman	b693f464d3	Secondary error message pop-up removed	2017-05-17 12:45:32 +02:00
Simon Rozman	753f55ffc0	WLANManager support for multiple wireless interfaces	2017-05-17 12:45:32 +02:00
Simon Rozman	920d0ab2f7	Indentation fix	2017-03-14 09:37:33 +01:00
Simon Rozman	d3b9a21c81	Version set to 1.1b	2017-02-24 12:16:02 +01:00
Simon Rozman	4281672d13	Clean-up	2017-02-23 12:14:20 +01:00
Simon Rozman	b3b292a848	Incorrect `CoCreateInstance()` result evaluation fixed # Conflicts: # lib/WinStd	2017-02-23 11:14:32 +01:00
Simon Rozman	f39d192d91	Debugging-related exception in WlanUIEditProfile() resolved	2017-02-23 11:14:09 +01:00
Simon Rozman	5bd970b9e7	Locale is dynamic now, since wxLocale does not support re-initialization (when module is reused)	2017-02-22 09:43:57 +01:00
Simon Rozman	1b143cdbc9	Documentation update # Conflicts: # lib/GTC_UI/include/GTC_UI.h	2017-02-22 09:43:57 +01:00
Simon Rozman	7b6e1b2438	New version of wxExtend	2017-02-20 10:59:13 +01:00
Simon Rozman	fc85c6e4bb	Compilation of debug MSI files fixed	2017-02-20 10:07:46 +01:00
Simon Rozman	0bae6380c9	Documentation update	2017-02-13 07:59:50 +01:00
Simon Rozman	f8f32262c2	64-bit language detection removed from 32-bit MSI resolving ICE80 warning	2017-02-09 13:41:33 +01:00
Simon Rozman	f43488be98	Uninitialized enum higher bytes when reading as unsigned char fixed	2017-02-09 11:43:55 +01:00
Simon Rozman	f32d653bb8	eap::config split to eap::config and eap::packable	2017-02-07 09:38:01 +01:00
Simon Rozman	7e5c98ef39	Version set to 1.1a	2017-02-06 08:15:58 +01:00
Simon Rozman	af37909893	Translation update	2017-02-06 08:05:33 +01:00
Simon Rozman	3ff617a048	__DANGEROUS__LOG_CONFIDENTIAL_DATA is now 0/1 #defined	2017-02-02 13:58:21 +01:00
Simon Rozman	fc0bf839c2	EAP_INNER_EAPHOST is now 0/1 #defined	2017-02-02 13:51:17 +01:00
Simon Rozman	6ef00f3fc2	EAP_USE_NATIVE_CREDENTIAL_CACHE is now 0/1 #defined	2017-02-02 13:27:54 +01:00
Simon Rozman	8dcddb9ded	Documentation update	2017-02-02 12:17:34 +01:00
Simon Rozman	d3b69976b9	EapHost credential prompt result evaluation fixed	2017-02-02 11:38:16 +01:00
Simon Rozman	e93a771e16	EapHost conditional compilation directive fixed	2017-02-02 11:38:16 +01:00
Simon Rozman	6689383824	Clean-up	2017-02-01 14:38:37 +01:00
Simon Rozman	58b9b1cf88	Clean-up	2017-02-01 13:12:25 +01:00
Simon Rozman	89139e824b	EapHost peer initialization conditional now	2017-02-01 11:04:07 +01:00
Simon Rozman	e3904b31eb	get_ui_context() upgraded	2017-02-01 10:54:31 +01:00
Simon Rozman	a6eac3beb4	Simple BLOB encryption/decryption added & comment updates	2017-02-01 10:28:04 +01:00
Simon Rozman	9e0fc09c40	Missing namespace added	2017-02-01 10:13:41 +01:00
Simon Rozman	8c0330f324	Clean-up	2017-01-31 13:57:33 +01:00
Simon Rozman	5bf303aac3	EAP errors now correctly displayed in Event Viewer	2017-01-31 12:38:01 +01:00
Simon Rozman	d2998c9210	Incorrect RFC quote removed	2017-01-31 11:07:55 +01:00
Simon Rozman	33fb62a256	Both event channels are registered using Makefile disabled now, to prevent Events.dll getting constantly locked by Event Log service. # Conflicts: # Makefile	2017-01-31 10:45:48 +01:00
Simon Rozman	368afacbb9	"User ID" and "Password" labels vertically centered	2017-01-31 10:45:15 +01:00
Simon Rozman	65483351f4	Additional clarification of UI context handling	2017-01-30 14:52:08 +01:00
Simon Rozman	a3af704d8e	Comment fixed	2017-01-30 14:52:08 +01:00
Simon Rozman	c7ed9c0845	EAP types look-up extended	2017-01-30 12:19:45 +01:00
Simon Rozman	67426d5db4	Distribution folder changed	2017-01-30 08:57:23 +01:00
Simon Rozman	ea15fde6c1	Version set to 1.1	2017-01-30 08:51:46 +01:00