Set version to 1.0e

Translation update
Update wxExtend module
2017-12-05 09:14:17 +01:00 · 2017-12-05 09:12:38 +01:00 · 2017-12-05 09:12:12 +01:00 · 2017-12-05 09:02:13 +01:00 · 2017-11-20 12:06:08 +01:00 · 2017-07-10 10:49:33 +02:00
319 changed files with 14116 additions and 24102 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</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>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</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>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</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-16.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/CredWrite/Main.cpp
+++ b/CredWrite/Main.cpp
@@ -116,8 +116,7 @@ static int CredWrite()
 }


-_Use_decl_annotations_
-int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nCmdShow)
 {
    UNREFERENCED_PARAMETER(hPrevInstance);
    UNREFERENCED_PARAMETER(lpCmdLine);
--- a/CredWrite/README.md
+++ b/CredWrite/README.md
@@ -1,9 +1,7 @@
-# CredWrite
-
-Imports given credentials to Windows Credential Manager for GÉANTLink use
-
-## Usage
+#CredWrite
+Imports given credentials to Windows Credential Manager for G<>ANTLink use

+##Usage
 ```
 CredWrite <username> <password> [<realm> [level]]
 ```
@@ -15,15 +13,8 @@ CredWrite <username> <password> [<realm> [level]]

 The credentials are stored to Windows Credential Manager in invoking user's roaming profile.

-### Return codes
-
+Return codes:
 - -1 = Invalid parameters
 - 0  = Success
 - 1  = Error parsing command line
 - 2  = Error encrypting password or writing credentials
-
-### Example
-
-```
-CredWrite dXNlckBjb250b3NvLmNvbQ== cGFzc3dvcmQxMjM= urn:RFC4282:realm:contoso.com 1
-```
--- a/CredWrite/StdAfx.h
+++ b/CredWrite/StdAfx.h
@@ -29,7 +29,6 @@

 #include <Windows.h>
 #include <eaptypes.h> // Must include after <Windows.h>
-#include <shellapi.h>
 #include <tchar.h>

 #include <memory>
--- 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</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>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</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>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</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>
@@ -141,15 +97,9 @@
    <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
      <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj">
-      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
-    </ProjectReference>
    <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 +112,7 @@
    <ProjectReference Include="..\..\lib\TTLS\build\TTLS.vcxproj">
      <Project>{ee0ef0d9-a475-4038-8637-5754724f65b0}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd-16.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</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>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</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>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</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>
@@ -144,21 +100,9 @@
    <ProjectReference Include="..\..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj">
      <Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj">
-      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\lib\EapHost_UI\build\EapHost_UI.vcxproj">
-      <Project>{13d2d8b5-f6aa-459d-b5f7-29b95dd9d583}</Project>
-    </ProjectReference>
    <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 +127,10 @@
    <ProjectReference Include="..\..\lib\TTLS_UI\build\TTLS_UI.vcxproj">
      <Project>{42f0f0f4-c928-4860-a4e4-94991c2c3d90}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd-16.0.vcxproj">
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib-16.0.vcxproj">
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
  </ItemGroup>
@@ -202,7 +146,6 @@
    <POCompile Include="..\locale\de_DE.po" />
    <POCompile Include="..\locale\el_GR.po" />
    <POCompile Include="..\locale\es_ES.po" />
-    <POCompile Include="..\locale\et_EE.po" />
    <POCompile Include="..\locale\eu_ES.po" />
    <POCompile Include="..\locale\fi_FI.po" />
    <POCompile Include="..\locale\fr_CA.po" />
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
@@ -132,8 +132,5 @@
    <POCompile Include="..\locale\ko_KR.po">
      <Filter>Resource Files\Localization</Filter>
    </POCompile>
-    <POCompile Include="..\locale\et_EE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
  </ItemGroup>
 </Project>
--- a/EAPMethods/MSIBuild/Makefile
+++ b/EAPMethods/MSIBuild/Makefile
--- a/EAPMethods/locale/EAPMethods.pot
+++ b/EAPMethods/locale/EAPMethods.pot
@@ -2,93 +2,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2019-08-12 14:04+0200\n"
+"POT-Creation-Date: 2016-11-07 12:58+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 1.8.10\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:285
-#, c-format
-msgid "Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:285
-msgid "Warning"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:371 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:641
-msgid "Provider Settings"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:674 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:793 lib/TTLS_UI/src/Module.cpp:285
-#: lib/TTLS_UI/src/Module.cpp:357
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:796 lib/TTLS_UI/src/Module.cpp:287
-#: lib/TTLS_UI/src/Module.cpp:359
-msgid "Writing credentials failed."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:816
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:855
-#, c-format
-msgid "(error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:859
-msgid "(error)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:870 lib/EAPBase_UI/include/EAP_UI.h:879
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(empty)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:870 lib/EAPBase_UI/include/EAP_UI.h:879
-msgid "(blank ID)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:919
-msgid "&Remember"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:920
-msgid "Check if you would like to save credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1131
-msgid "(Your Organization)"
-msgstr ""
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"

 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
@@ -114,321 +44,242 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""

+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:605
+#, c-format
+msgid "%s User Credentials"
+msgstr ""
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""

 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use credentials from Credential &Manager"
+msgid "Use credentials from Credential &Manager:"
 msgstr ""

 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid "Select this option if you would like to use credentials stored in Windows Credential Manager"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use credentials from &profile configuration"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid "Select this option if you would like to store credentials as a part of  profile configuration"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid "Describe your organization to customize user prompts.  When organization is introduced, end-users find program messages easier to understand and act."
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid "Assign your organization a unique ID to allow sharing the same credential set across different network profiles."
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid "Your configuration can be locked to prevent accidental modification by end-users. Users will only be allowed to enter credentials."
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid "&Lock this configuration and prevent any further modification via user interface."
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""

-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:99
 #, c-format
 msgid "%s Credentials"
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:128 lib/EAPBase_UI/include/EAP_UI.h:367
+#: lib/EAPBase_UI/include/EAP_UI.h:377 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:173
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:174
 msgid "your provider"
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:193
 msgid "Open the default web browser"
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:204
 msgid "Open your e-mail program"
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:215
 msgid "Dial the phone number"
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:235
 #, c-format
 msgid "%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:236
 msgid "Your provider"
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:257
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:258
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:259
 msgid "Previous attempt to connect reported your credentials are being changed."
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:260
 msgid "Previous attempt to connect failed."
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:261
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
+#: lib/EAPBase_UI/src/EAP_UI.cpp:282
 #, c-format
 msgid "The %s version installed on this computer logs credentials in visible and easy to read way."
 msgstr ""

-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
+#: lib/EAPBase_UI/src/EAP_UI.cpp:283
 msgid "Please, reconsider necessity to enter your credentials."
 msgstr ""

-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr ""
-
-#: lib/GTC_UI/include/GTC_UI.h:111 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr ""
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr ""
@@ -473,68 +324,73 @@ msgstr ""
 msgid "&Remove CA"
 msgstr ""

-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr ""

-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid "A semicolon delimited list of acceptable server FQDN names; blank to skip name check; Unicode characters allowed"
 msgstr ""

-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr ""

-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:325
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:317
 msgid "User Certificate"
 msgstr ""

-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr ""

-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid "Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate"
 msgstr ""

-#: lib/TLS_UI/src/TLS_UI.cpp:252
+#: lib/TLS_UI/src/TLS_UI.cpp:59 lib/EAPBase_UI/include/EAP_UI.h:803
+#: lib/EAPBase_UI/include/EAP_UI.h:812
+msgid "<empty>"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:246
 msgid "Add Certificate"
 msgstr ""

-#: lib/TLS_UI/src/TLS_UI.cpp:253
+#: lib/TLS_UI/src/TLS_UI.cpp:247
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""

-#: lib/TLS_UI/src/TLS_UI.cpp:254
+#: lib/TLS_UI/src/TLS_UI.cpp:248
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""

-#: lib/TLS_UI/src/TLS_UI.cpp:255
+#: lib/TLS_UI/src/TLS_UI.cpp:249
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""

-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:250
 msgid "All Files (*.*)"
 msgstr ""

-#: lib/TLS_UI/src/TLS_UI.cpp:270
+#: lib/TLS_UI/src/TLS_UI.cpp:264
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""

-#: lib/TLS_UI/src/TLS_UI.cpp:270
+#: lib/TLS_UI/src/TLS_UI.cpp:264
 msgid "Error"
 msgstr ""

@@ -555,11 +411,11 @@ 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
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -574,78 +430,108 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: lib/TTLS_UI/src/Module.cpp:395
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:724
 #, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""

-#: lib/TTLS_UI/src/Module.cpp:397
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:727
+msgid "Writing credentials failed."
 msgstr ""

-#: lib/TTLS_UI/src/Module.cpp:533
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/TTLS_UI/src/Module.cpp:536
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:118
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:182
 msgid "Inner Authentication"
 msgstr ""

-#: lib/TTLS_UI/src/TTLS_UI.cpp:124
-msgid "Select inner authentication method from the list"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:126
-msgid "PAP"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:128
-msgid "MSCHAPv2"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:130
-msgid "EAP-MSCHAPv2"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:132
-msgid "EAP-GTC"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:135
-msgid "Other EAP methods..."
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:141
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:197
 msgid "Outer Authentication"
 msgstr ""

-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/TTLS_UI/src/TTLS_UI.cpp:188
+msgid "Select inner authentication method from the list"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:190
+msgid "PAP"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:192
+msgid "MSCHAPv2"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:302
+#, c-format
+msgid "Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:302
+msgid "Warning"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:576
+msgid "Provider Settings"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:747
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:788
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:792
+msgid "<error>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:803 lib/EAPBase_UI/include/EAP_UI.h:812
+msgid "<blank ID>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:854
+msgid "&Remember"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:855
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:1000
+msgid "<Your Organization>"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr ""

-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr ""

-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "TTLS"
 msgstr ""

-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "Tunneled Transport Layer Security"
 msgstr ""
--- a/EAPMethods/locale/bg_BG.po
+++ b/EAPMethods/locale/bg_BG.po
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -200,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
@@ -511,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
@@ -670,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 ""

@@ -775,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"
@@ -795,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"
@@ -834,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"
@@ -903,7 +787,7 @@ msgstr "Използвай &празна външна самоличност"
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr "Пропусни моето потребителско име и използвай само @mydomain.org"

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -924,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 ""
@@ -990,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
@@ -1,22 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2018
-# eduki <ecercos@xtec.cat>, 2018
-# jmontane, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: jmontane, 2019\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -42,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 "(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 "(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 "(ID buit)"
-
-#: 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
@@ -174,7 +48,7 @@ msgstr "+"
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 msgid "Adds new provider"
-msgstr "Afegeix un proveïdor nou"
+msgstr "Afegir nou proveidor"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:42
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:42
@@ -186,7 +60,7 @@ msgstr "-"
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 msgid "Removes selected provider"
-msgstr "Esborra el proveïdor seleccionat"
+msgstr "Esborrar proveidor seleccionat"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:47
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:47
@@ -200,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
@@ -243,7 +127,7 @@ msgstr ""
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:272
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:272
 msgid "&Clear Credentials"
-msgstr "&Esborra les credencials"
+msgstr "&Esborrar Credencials"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:273
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:273
@@ -262,7 +146,7 @@ msgstr ""
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:316
 msgid "&Set Credentials..."
-msgstr "&Desa les credencials..."
+msgstr "&Desar Credencials..."

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:278
 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:317
@@ -305,7 +189,7 @@ msgstr "ID d'usuari i contrasenya"
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Please provide your user ID and password."
-msgstr "Introduïu el vostre ID d'usuari i contrasenya"
+msgstr "Sisplau introduiu el vostre ID d'usuari i contrasenya"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:379
 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:443
@@ -320,7 +204,7 @@ msgstr "ID d'usuari:"
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:384
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
-"Introduïu el vostre identificador aquí (identificador@domini.org, "
+"Introduiu el vostre identificador aquí (identificador@domini.org, "
 "DOMINI\\identificador, etc.)"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:388
@@ -333,7 +217,7 @@ msgstr "Contrasenya:"
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:393
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:393
 msgid "Enter your password here"
-msgstr "Introduïu la vostra contrasenya aquí"
+msgstr "Introduiu la vostra contrasenya aquí"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid "User ID"
@@ -341,7 +225,7 @@ msgstr "ID d'usuari"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:433
 msgid "Please provide your user ID."
-msgstr "Introduïu el vostre ID."
+msgstr "Sisplau introduïu el vostre ID."

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:473
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:424
@@ -378,7 +262,7 @@ msgstr ""
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:451
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:451
 msgid "(Keep it short, please)"
-msgstr "(Sigueu breu)"
+msgstr "(Sigueu breus, sisplau)"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:510
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:461
@@ -503,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
@@ -619,7 +492,8 @@ msgstr ""
 #: 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 "Reconsidereu la necessitat d'introduir les vostres credencials."
+msgstr ""
+"Sisplau, reconsidereu la necessitat d'introduir les vostres credencials."

 #: master/lib/EapHost_UI/res/wxEapHost_UI.cpp:17
 #: ver1.1/lib/EapHost_UI/res/wxEapHost_UI.cpp:17
@@ -660,18 +534,18 @@ 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"

 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:26
 msgid "Please provide your response."
-msgstr "Indiqueu la vostra resposta."
+msgstr "Faciliteu sisplau la vostra resposta."

 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:38
 msgid "Server challenge"
-msgstr "Repte del servidor"
+msgstr "Repte del Servidor"

 #: master/lib/GTC_UI/res/wxGTC_UI.cpp:43
 msgid "Enter your response here"
@@ -752,7 +626,7 @@ msgstr ""
 #: master/lib/TLS_UI/res/wxTLS_UI.cpp:52 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:52
 #: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:52
 msgid "Add CA from File..."
-msgstr "Afegeix CA des d'un fitxer..."
+msgstr "Afegir CA des d'un fitxer..."

 #: master/lib/TLS_UI/res/wxTLS_UI.cpp:53 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:53
 #: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:53
@@ -762,20 +636,20 @@ msgstr "Afegeix una nova autoritat de certificació des de d'un arxiu"
 #: master/lib/TLS_UI/res/wxTLS_UI.cpp:57 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:57
 #: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:57
 msgid "&Remove CA"
-msgstr "&Elimina 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"
@@ -783,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 "Personalitza la &identitat:"
+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"
@@ -822,10 +696,21 @@ 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"
-msgstr "Afegeix un certificat"
+msgstr "Afegir Certificat"

 #: master/lib/TLS_UI/src/TLS_UI.cpp:253 ver1.0/lib/TLS_UI/src/TLS_UI.cpp:247
 #: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:253
@@ -892,7 +777,7 @@ msgstr "Utilitza una identitat externa &buida"
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr "Omet el meu identificador i utilitza només @elmeudomini.org"

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -913,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)."
@@ -980,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
@@ -1,21 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
-# Petr Adamec <p.b.adamec@gmail.com>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\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"
 "MIME-Version: 1.0\n"
 "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"
@@ -41,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
@@ -196,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
@@ -476,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
@@ -625,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 ""

@@ -724,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"
@@ -847,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -868,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 ""
@@ -934,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -199,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
@@ -504,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
@@ -663,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 ""

@@ -768,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"
@@ -787,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"
@@ -827,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"
@@ -897,7 +782,7 @@ msgstr "Leeren N&utzernamen verwenden"
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""
 "Im unverschlüsselten Teil den Nutzernamen weglassen und nur den @domain Teil"
 " senden"
@@ -921,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 ""
@@ -989,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
@@ -1,22 +1,18 @@
-# Translators:
-# Zenon Mousmoulas <zenon@mousmoulas.gr>, 2017
-# Vicky Kons <vickyk@admin.grnet.gr>, 2017
-# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -42,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
@@ -201,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
@@ -507,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
@@ -669,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"

@@ -774,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"
@@ -794,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"
@@ -836,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"
@@ -907,7 +790,7 @@ msgstr "Χρησιμοποιήστε &κενή εξωτερική ταυτότη
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""
 "Παραλείψτε το όνομα χρήστη μου και χρησιμοποιήστε μόνο το @mydomain.org"

@@ -929,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)."
@@ -996,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
@@ -1,21 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2018
-# Alberto Martínez Setién, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Alberto Martínez Setién, 2018\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 <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"
@@ -41,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
@@ -199,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
@@ -506,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
@@ -666,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"

@@ -772,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"
@@ -791,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"
@@ -830,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"
@@ -901,7 +786,7 @@ msgstr "Usar una identidad externa &vacía"
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr "Omitir mi nombre de usuario y usar @midominio.org sólo"

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -922,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)."
@@ -990,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/et_EE.po
+++ b/EAPMethods/locale/et_EE.po
--- a/EAPMethods/locale/eu_ES.po
+++ b/EAPMethods/locale/eu_ES.po
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,21 +1,18 @@
-# Translators:
-# Dubravko Penezic <dpenezic@gmail.com>, 2018
-# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\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: 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"
@@ -41,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
@@ -200,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
@@ -220,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
@@ -230,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
@@ -276,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
@@ -285,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
@@ -338,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
@@ -496,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
@@ -605,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
@@ -725,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
@@ -753,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"
@@ -772,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"
@@ -811,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"
@@ -883,7 +760,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""
 "Koristi samo @mojadomena.hr (ovo nije podržano za korisnike iz sustava "
 "AAI@EduHr)"
@@ -892,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
@@ -906,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
@@ -963,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
@@ -972,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
--- a/EAPMethods/locale/lt_LT.po
+++ b/EAPMethods/locale/lt_LT.po
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "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"
@@ -40,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
@@ -196,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
@@ -492,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
@@ -651,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 ""

@@ -753,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"
@@ -772,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"
@@ -811,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"
@@ -882,7 +770,7 @@ msgstr "Naudoti &tuščią išorinę tapatybę"
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr "Praleisti mano naudotojo vardą ir naudoti tik @domenas.lt"

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -903,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 ""
@@ -969,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
@@ -1,21 +1,18 @@
-# Translators:
-# Tom Ivar Myren <tom.myren@uninett.no>, 2017
-# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -41,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
@@ -199,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
@@ -496,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
@@ -654,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"

@@ -757,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"
@@ -776,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"
@@ -815,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"
@@ -885,7 +770,7 @@ msgstr "Bruk &tom ytre identitet"
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr "Utelat mitt brukernavn og bruk kun @mydomian.org"

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -906,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)."
@@ -972,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -196,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
@@ -499,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
@@ -660,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 ""

@@ -763,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"
@@ -782,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"
@@ -823,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"
@@ -894,7 +782,7 @@ msgstr "Użyj &pustego identyfikatora zewnętrznego"
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr "Pomiń mój identyfikator i użyj tylko @mydomain.org"

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -915,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 ""
@@ -982,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
@@ -1,13 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
-# Pedro Simões <psimoes@fccn.pt>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\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"
 "MIME-Version: 1.0\n"
@@ -15,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"
@@ -41,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
@@ -196,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
@@ -476,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
@@ -625,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 ""

@@ -724,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"
@@ -847,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -868,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 ""
@@ -934,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -198,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
@@ -497,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
@@ -652,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"

@@ -755,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"
@@ -774,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"
@@ -813,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"
@@ -882,7 +768,7 @@ msgstr "Uporabi prazno zunanjo id&entiteto"
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr "Izpusti moje uporabniško ime in uporabi samo @mojadomena.si"

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -903,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)."
@@ -969,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
@@ -1,21 +1,18 @@
-# Translators:
-# Marko Eremija <marko.eremija@amres.ac.rs>, 2017
-# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -41,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
@@ -199,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
@@ -503,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
@@ -663,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"

@@ -766,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"
@@ -786,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"
@@ -826,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"
@@ -896,7 +781,7 @@ msgstr "Koristi &empty spoljni identitet"
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr "Izostavi korisničko ime i koristi samo @mojdomen.ac.rs"

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -917,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 ""
@@ -991,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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
@@ -1,13 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
-# Gokhan Eryol <gokhaneryol@gmail.com>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\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"
 "MIME-Version: 1.0\n"
@@ -15,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"
@@ -41,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
@@ -196,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
@@ -477,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
@@ -626,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 ""

@@ -725,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"
@@ -848,7 +736,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -869,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 ""
@@ -935,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
@@ -1,20 +1,18 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2018-06-20 15:30+0200\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2017\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
@@ -40,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
@@ -195,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
@@ -475,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
@@ -624,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 ""

@@ -723,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"
@@ -846,7 +735,7 @@ msgstr ""
 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.0/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 #: ver1.1/lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Omit my user name and use @mydomain.org only"
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""

 #: master/lib/TTLS_UI/res/wxTTLS_UI.cpp:48
@@ -867,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 ""
@@ -933,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.cpp
+++ b/EAPMethods/src/Main.cpp
--- 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) {
@@ -76,8 +71,7 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
 ///
 /// \sa [EapPeerFreeMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363606.aspx)
 ///
-_Use_decl_annotations_
-VOID WINAPI EapPeerFreeMemory(void *pUIContextData)
+VOID WINAPI EapPeerFreeMemory(_In_ void *pUIContextData)
 {
    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));

@@ -91,8 +85,7 @@ VOID WINAPI EapPeerFreeMemory(void *pUIContextData)
 ///
 /// \sa [EapPeerFreeErrorMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363605.aspx)
 ///
-_Use_decl_annotations_
-VOID WINAPI EapPeerFreeErrorMemory(EAP_ERROR *ppEapError)
+VOID WINAPI EapPeerFreeErrorMemory(_In_ EAP_ERROR *ppEapError)
 {
    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));

@@ -106,14 +99,13 @@ VOID WINAPI EapPeerFreeErrorMemory(EAP_ERROR *ppEapError)
 ///
 /// \sa [EapPeerConfigXml2Blob function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363602.aspx)
 ///
-_Use_decl_annotations_
 DWORD WINAPI EapPeerConfigXml2Blob(
-    DWORD            dwFlags,
-    EAP_METHOD_TYPE  eapMethodType,
-    IXMLDOMDocument2 *pConfigDoc,
-    BYTE             **pConnectionDataOut,
-    DWORD            *pdwConnectionDataOutSize,
-    EAP_ERROR        **ppEapError)
+    _In_  DWORD            dwFlags,
+    _In_  EAP_METHOD_TYPE  eapMethodType,
+    _In_  IXMLDOMDocument2 *pConfigDoc,
+    _Out_ BYTE             **pConnectionDataOut,
+    _Out_ DWORD            *pdwConnectionDataOutSize,
+    _Out_ EAP_ERROR        **ppEapError)
 {
    DWORD dwResult = ERROR_SUCCESS;
    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
@@ -121,35 +113,42 @@ DWORD WINAPI EapPeerConfigXml2Blob(
    //Sleep(10000);
 #endif

-    // Initialize output parameters.
-    if (pConnectionDataOut)
-        *pConnectionDataOut = NULL;
-    if (pdwConnectionDataOutSize)
-        *pdwConnectionDataOutSize = 0;
-    if (ppEapError)
-        *ppEapError = NULL;
-
    // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532)
-        return dwResult = ERROR_NOT_SUPPORTED;
-    if (!pConfigDoc || !pConnectionDataOut || !pdwConnectionDataOutSize)
+    if (!ppEapError)
        return dwResult = ERROR_INVALID_PARAMETER;

-    // Configure XML selection namespaces used.
-    pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
+    assert(!*ppEapError);

-    // <Config>
-    com_obj<IXMLDOMElement> pXmlElConfig;
-    if (FAILED(eapxml::select_element(pConfigDoc, bstr(L"//eaphostconfig:Config"), pXmlElConfig)))
-        return dwResult = g_peer.log_error(ppEapError, ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" Error reading <Config> element."));
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)eapMethodType.eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (eapMethodType.dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)eapMethodType.dwAuthorId, (int)67532).c_str()));
+    else if (!pConfigDoc)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConfigDoc is NULL.")));
+    else if (!pConnectionDataOut)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionDataOut is NULL.")));
+    else if (!pdwConnectionDataOutSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwConnectionDataOutSize is NULL.")));
+    else {
+        // Configure XML selection namespaces used.
+        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));

-    // Load configuration.
-    try {
-        g_peer.config_xml2blob(dwFlags, pXmlElConfig, pConnectionDataOut, pdwConnectionDataOutSize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
+        // <Config>
+        com_obj<IXMLDOMElement> pXmlElConfig;
+        if (FAILED(eapxml::select_element(pConfigDoc, bstr(L"//eaphostconfig:Config"), pXmlElConfig))) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" Error reading <Config> element.")));
+            return dwResult;
+        }
+
+        // Load configuration.
+        try {
+            g_peer.config_xml2blob(dwFlags, pXmlElConfig, pConnectionDataOut, pdwConnectionDataOutSize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
    }

    return dwResult;
@@ -163,14 +162,13 @@ DWORD WINAPI EapPeerConfigXml2Blob(
 ///
 /// \sa [EapPeerConfigBlob2Xml function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363601.aspx)
 ///
-_Use_decl_annotations_
 DWORD WINAPI EapPeerConfigBlob2Xml(
-          DWORD            dwFlags,
-          EAP_METHOD_TYPE  eapMethodType,
-    const BYTE             *pConnectionData,
-          DWORD            dwConnectionDataSize,
-          IXMLDOMDocument2 **ppConfigDoc,
-          EAP_ERROR        **ppEapError)
+    _In_                                   DWORD            dwFlags,
+    _In_                                   EAP_METHOD_TYPE  eapMethodType,
+    _In_count_(dwConnectionDataSize) const BYTE             *pConnectionData,
+    _In_                                   DWORD            dwConnectionDataSize,
+    _Out_                                  IXMLDOMDocument2 **ppConfigDoc,
+    _Out_                                  EAP_ERROR        **ppEapError)
 {
    DWORD dwResult = ERROR_SUCCESS;
    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
@@ -178,54 +176,67 @@ DWORD WINAPI EapPeerConfigBlob2Xml(
    //Sleep(10000);
 #endif

-    // Initialize output parameters.
-    if (ppConfigDoc)
-        *ppConfigDoc = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
    // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532)
-        return dwResult = ERROR_NOT_SUPPORTED;
-    if (!pConnectionData && dwConnectionDataSize || !ppConfigDoc)
+    if (!ppEapError)
        return dwResult = ERROR_INVALID_PARAMETER;

-    HRESULT hr;
+    assert(!*ppEapError);

-    // Create configuration XML document.
-    com_obj<IXMLDOMDocument2> pConfigDoc;
-    if (FAILED(hr = pConfigDoc.create(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER)))
-        return dwResult = g_peer.log_error(ppEapError, HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error creating XML document."));
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)eapMethodType.eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (eapMethodType.dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)eapMethodType.dwAuthorId, (int)67532).c_str()));
+    else if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!ppConfigDoc)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppConfigDoc is NULL.")));
+    else {
+        HRESULT hr;

-    pConfigDoc->put_async(VARIANT_FALSE);
+        // Create configuration XML document.
+        com_obj<IXMLDOMDocument2> pConfigDoc;
+        if (FAILED(hr = pConfigDoc.create(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER))) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error creating XML document.")));
+            return dwResult;
+        }

-    // Load empty XML configuration.
-    VARIANT_BOOL isSuccess = VARIANT_FALSE;
-    if (FAILED((hr = pConfigDoc->loadXML(L"<Config xmlns=\"http://www.microsoft.com/provisioning/EapHostConfig\"></Config>", &isSuccess))))
-        return dwResult = g_peer.log_error(ppEapError, HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error loading XML document template."));
-    if (!isSuccess)
-        return dwResult = g_peer.log_error(ppEapError, ERROR_XML_PARSE_ERROR, _T(__FUNCTION__) _T(" Loading XML template failed."));
+        pConfigDoc->put_async(VARIANT_FALSE);

-    // Configure XML selection namespaces used.
-    pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
+        // Load empty XML configuration.
+        VARIANT_BOOL isSuccess = VARIANT_FALSE;
+        if (FAILED((hr = pConfigDoc->loadXML(L"<Config xmlns=\"http://www.microsoft.com/provisioning/EapHostConfig\"></Config>", &isSuccess)))) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error loading XML document template.")));
+            return dwResult;
+        }
+        if (!isSuccess) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_XML_PARSE_ERROR, _T(__FUNCTION__) _T(" Loading XML template failed.")));
+            return dwResult;
+        }

-    // Select <Config> node.
-    com_obj<IXMLDOMNode> pXmlElConfig;
-    if (FAILED(eapxml::select_node(pConfigDoc, bstr(L"eaphostconfig:Config"), pXmlElConfig)))
-        return dwResult = g_peer.log_error(ppEapError, ERROR_NOT_FOUND, _T(__FUNCTION__) _T(" Error selecting <Config> element."));
+        // Configure XML selection namespaces used.
+        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));

-    // Save configuration.
-    pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
-    try {
-        g_peer.config_blob2xml(dwFlags, pConnectionData, dwConnectionDataSize, pConfigDoc, pXmlElConfig);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        return dwResult = ERROR_INVALID_DATA;
+        // Select <Config> node.
+        com_obj<IXMLDOMNode> pXmlElConfig;
+        if (FAILED(eapxml::select_node(pConfigDoc, bstr(L"eaphostconfig:Config"), pXmlElConfig))) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_FOUND, _T(__FUNCTION__) _T(" Error selecting <Config> element.")));
+            return dwResult;
+        }
+
+        // Save configuration.
+        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
+        try {
+            g_peer.config_blob2xml(dwFlags, pConnectionData, dwConnectionDataSize, pConfigDoc, pXmlElConfig);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            return dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            return dwResult = ERROR_INVALID_DATA;
+        }
+
+        *ppConfigDoc = pConfigDoc.detach();
    }

-    *ppConfigDoc = pConfigDoc.detach();
-
    return dwResult;
 }

@@ -235,16 +246,15 @@ DWORD WINAPI EapPeerConfigBlob2Xml(
 ///
 /// \sa [EapPeerInvokeConfigUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363614.aspx)
 ///
-//_Use_decl_annotations_
 DWORD WINAPI EapPeerInvokeConfigUI(
-    const EAP_METHOD_TYPE *pEapType,
-          HWND            hwndParent,
-          DWORD           dwFlags,
-          DWORD           dwConnectionDataInSize,
-    const BYTE            *pConnectionDataIn,
-          DWORD           *pdwConnectionDataOutSize,
-          BYTE            **ppConnectionDataOut,
-          EAP_ERROR       **ppEapError)
+    _In_                               const EAP_METHOD_TYPE *pEapType,
+    _In_                                     HWND            hwndParent,
+    _In_                                     DWORD           dwFlags,
+    _In_                                     DWORD           dwConnectionDataInSize,
+    _In_count_(dwConnectionDataInSize) const BYTE            *pConnectionDataIn,
+    _Out_                                    DWORD           *pdwConnectionDataOutSize,
+    _Out_                                    BYTE            **ppConnectionDataOut,
+    _Out_                                    EAP_ERROR       **ppEapError)
 {
    UNREFERENCED_PARAMETER(dwFlags);
    DWORD dwResult = ERROR_SUCCESS;
@@ -254,26 +264,33 @@ DWORD WINAPI EapPeerInvokeConfigUI(
    //Sleep(10000);
 #endif

-    // Initialize output parameters.
-    if (pdwConnectionDataOutSize)
-        *pdwConnectionDataOutSize = 0;
-    if (ppConnectionDataOut)
-        *ppConnectionDataOut = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
    // Parameter check
-    if (!pEapType || !pConnectionDataIn && dwConnectionDataInSize || !pdwConnectionDataOutSize || !ppConnectionDataOut)
+    if (!ppEapError)
        return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != 67532)
-        return dwResult = ERROR_NOT_SUPPORTED;

-    try {
-        g_peer.invoke_config_ui(hwndParent, pConnectionDataIn, dwConnectionDataInSize, ppConnectionDataOut, pdwConnectionDataOutSize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
+    assert(!*ppEapError);
+
+    if (!pEapType)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapType is NULL.")));
+    else if (pEapType->eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)pEapType->eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (pEapType->dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)pEapType->dwAuthorId, (int)67532).c_str()));
+    else if (!pConnectionDataIn && dwConnectionDataInSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionDataIn is NULL.")));
+    else if (!pdwConnectionDataOutSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwConnectionDataOutSize is NULL.")));
+    else if (!ppConnectionDataOut)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppConnectionDataOut is NULL.")));
+    else {
+        try {
+            g_peer.invoke_config_ui(hwndParent, pConnectionDataIn, dwConnectionDataInSize, ppConnectionDataOut, pdwConnectionDataOutSize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
    }

    return dwResult;
@@ -285,19 +302,18 @@ DWORD WINAPI EapPeerInvokeConfigUI(
 ///
 /// \sa [EapPeerInvokeIdentityUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363615.aspx)
 ///
-//_Use_decl_annotations_
 DWORD WINAPI EapPeerInvokeIdentityUI(
-    const EAP_METHOD_TYPE *pEapType,
-          DWORD           dwFlags,
-          HWND            hwndParent,
-          DWORD           dwConnectionDataSize,
-    const BYTE            *pConnectionData,
-          DWORD           dwUserDataSize,
-    const BYTE            *pUserData,
-          DWORD           *pdwUserDataOutSize,
-          BYTE            **ppUserDataOut,
-          LPWSTR          *ppwszIdentity,
-          EAP_ERROR       **ppEapError)
+    _In_                             const EAP_METHOD_TYPE *pEapType,
+    _In_                                   DWORD           dwFlags,
+    _In_                                   HWND            hwndParent,
+    _In_                                   DWORD           dwConnectionDataSize,
+    _In_count_(dwConnectionDataSize) const BYTE            *pConnectionData,
+    _In_                                   DWORD           dwUserDataSize,
+    _In_count_(dwUserDataSize)       const BYTE            *pUserData,
+    _Out_                                  DWORD           *pdwUserDataOutSize,
+    _Out_                                  BYTE            **ppUserDataOut,
+    _Out_                                  LPWSTR          *ppwszIdentity,
+    _Out_                                  EAP_ERROR       **ppEapError)
 {
    DWORD dwResult = ERROR_SUCCESS;
    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
@@ -306,28 +322,37 @@ DWORD WINAPI EapPeerInvokeIdentityUI(
    //Sleep(10000);
 #endif

-    // Initialize output parameters.
-    if (pdwUserDataOutSize)
-        *pdwUserDataOutSize = 0;
-    if (ppUserDataOut)
-        *ppUserDataOut = NULL;
-    if (ppwszIdentity)
-        *ppwszIdentity = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
    // Parameter check
-    if (!pEapType || !pConnectionData && dwConnectionDataSize || !pUserData && dwUserDataSize || !pdwUserDataOutSize || !ppUserDataOut || !ppwszIdentity)
-        return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != 67532)
-        return dwResult = ERROR_NOT_SUPPORTED;
+    if (!ppEapError)
+        dwResult = ERROR_INVALID_PARAMETER;

-    try {
-        g_peer.invoke_identity_ui(hwndParent, dwFlags, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, ppUserDataOut, pdwUserDataOutSize, ppwszIdentity);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
+    assert(!*ppEapError);
+
+    if (!pEapType)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapType is NULL.")));
+    else if (pEapType->eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)pEapType->eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (pEapType->dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)pEapType->dwAuthorId, (int)67532).c_str()));
+    else if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!pUserData && dwUserDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUserData is NULL.")));
+    else if (!pdwUserDataOutSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwUserDataOutSize is NULL.")));
+    else if (!ppUserDataOut)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppUserDataOut is NULL.")));
+    else if (!ppwszIdentity)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL.")));
+    else {
+        try {
+            g_peer.invoke_identity_ui(hwndParent, dwFlags, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, ppUserDataOut, pdwUserDataOutSize, ppwszIdentity);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
    }

    return dwResult;
@@ -339,15 +364,14 @@ DWORD WINAPI EapPeerInvokeIdentityUI(
 ///
 /// \sa [EapPeerInvokeInteractiveUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363616.aspx)
 ///
-//_Use_decl_annotations_
 DWORD WINAPI EapPeerInvokeInteractiveUI(
-    const EAP_METHOD_TYPE *pEapType,
-          HWND            hwndParent,
-          DWORD           dwUIContextDataSize,
-    const BYTE            *pUIContextData,
-          DWORD           *pdwDataFromInteractiveUISize,
-          BYTE            **ppDataFromInteractiveUI,
-          EAP_ERROR       **ppEapError)
+    _In_                            const EAP_METHOD_TYPE *pEapType,
+    _In_                                  HWND            hwndParent,
+    _In_                                  DWORD           dwUIContextDataSize,
+    _In_count_(dwUIContextDataSize) const BYTE            *pUIContextData,
+    _Out_                                 DWORD           *pdwDataFromInteractiveUISize,
+    _Out_                                 BYTE            **ppDataFromInteractiveUI,
+    _Out_                                 EAP_ERROR       **ppEapError)
 {
    DWORD dwResult = ERROR_SUCCESS;
    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
@@ -356,26 +380,33 @@ DWORD WINAPI EapPeerInvokeInteractiveUI(
    //Sleep(10000);
 #endif

-    // Initialize output parameters.
-    if (pdwDataFromInteractiveUISize)
-        *pdwDataFromInteractiveUISize = 0;
-    if (ppDataFromInteractiveUI)
-        *ppDataFromInteractiveUI = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
    // Parameter check
-    if (!pEapType || !pUIContextData && dwUIContextDataSize || !pdwDataFromInteractiveUISize || !ppDataFromInteractiveUI)
+    if (!ppEapError)
        return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != 67532)
-        return dwResult = ERROR_NOT_SUPPORTED;

-    try {
-        g_peer.invoke_interactive_ui(hwndParent, pUIContextData, dwUIContextDataSize, ppDataFromInteractiveUI, pdwDataFromInteractiveUISize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
+    assert(!*ppEapError);
+
+    if (!pEapType)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapType is NULL.")));
+    else if (pEapType->eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)pEapType->eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (pEapType->dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)pEapType->dwAuthorId, (int)67532).c_str()));
+    else if (!pUIContextData && dwUIContextDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUIContextData is NULL.")));
+    else if (!pdwDataFromInteractiveUISize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwDataFromInteractiveUISize is NULL.")));
+    else if (!ppDataFromInteractiveUI)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppDataFromInteractiveUI is NULL.")));
+    else {
+        try {
+            g_peer.invoke_interactive_ui(hwndParent, pUIContextData, dwUIContextDataSize, ppDataFromInteractiveUI, pdwDataFromInteractiveUISize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
    }

    return dwResult;
--- a/EventMonitor/App.cpp
+++ b/EventMonitor/App.cpp
@@ -28,7 +28,6 @@
 // wxEventMonitorApp
 //////////////////////////////////////////////////////////////////////////

-#pragma warning(suppress: 28251)
 wxIMPLEMENT_APP(wxEventMonitorApp);


--- 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.
@@ -132,8 +132,11 @@ VOID WINAPI wxEventTraceProcessorThread::EventRecordCallback(_In_ PEVENT_RECORD
    wxASSERT_MSG(pEvent->UserContext, wxT("thread is NULL"));

    wxEventTraceProcessorThread *_this = ((wxEventTraceProcessorThread*)pEvent->UserContext);
-    if (!_this || _this->TestDestroy())
+
+    if (_this->TestDestroy()) {
+        // Event processing is pending destruction.
        return;
+    }

    _this->m_parent->QueueEvent(new wxETWEvent(wxEVT_ETW_EVENT, *pEvent));
 }
@@ -165,17 +168,17 @@ 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;
    m_col_format_width[1] = 5;
    m_col_format_width[2] = 5;
-    m_col_format_width[3] = std::max<size_t>(std::max<size_t>(_countof("EapHost"), _countof("Schannel")), _countof(PRODUCT_NAME_STR)) - 1;
+    m_col_format_width[3] = std::max<int>(std::max<int>(_countof("EapHost"), _countof("Schannel")), _countof(PRODUCT_NAME_STR)) - 1;
    m_col_format_width[4] = 0;

    // Prepare all possible item attributes.
@@ -201,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]));
@@ -216,24 +219,20 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
        properties->Wnode.BufferSize    = ulSize;
        properties->Wnode.Flags         = WNODE_FLAG_TRACED_GUID;
        properties->Wnode.ClientContext = 1; //QPC clock resolution
-        HRESULT hr = CoCreateGuid(&(properties->Wnode.Guid));
-        if (FAILED(hr)) {
-            wxLogError(winstd::tstring_printf(wxT("error 0x%08x generating GUID"), hr).c_str());
-            continue;
-        }
+        CoCreateGuid(&(properties->Wnode.Guid));
        properties->LogFileMode         = /*EVENT_TRACE_FILE_MODE_SEQUENTIAL |*/ EVENT_TRACE_REAL_TIME_MODE;
        properties->MaximumFileSize     = 1;  // 1 MB
        properties->LoggerNameOffset    = sizeof(EVENT_TRACE_PROPERTIES);
        //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 {
@@ -777,13 +776,13 @@ static tstring MapToString(_In_ const EVENT_MAP_INFO *pMapInfo, _In_ ULONG ulDat
        ((pMapInfo->Flag &  EVENTMAP_INFO_FLAG_WBEM_VALUEMAP    ) && (pMapInfo->Flag & ~EVENTMAP_INFO_FLAG_WBEM_VALUEMAP) != EVENTMAP_INFO_FLAG_WBEM_FLAG))
    {
        if ((pMapInfo->Flag & EVENTMAP_INFO_FLAG_WBEM_NO_MAP) == EVENTMAP_INFO_FLAG_WBEM_NO_MAP)
-            return tstring_printf(_T("%ls"), (LPCWSTR)((PBYTE)pMapInfo + pMapInfo->MapEntryArray[ulData].OutputOffset));
+            return tstring_printf(_T("%ls"), (PBYTE)pMapInfo + pMapInfo->MapEntryArray[ulData].OutputOffset);
        else {
            for (ULONG i = 0; ; i++) {
                if (i >= pMapInfo->EntryCount)
                    return tstring_printf(_T("%lu"), ulData);
                else if (pMapInfo->MapEntryArray[i].Value == ulData)
-                    return tstring_printf(_T("%ls"), (LPCWSTR)((PBYTE)pMapInfo + pMapInfo->MapEntryArray[i].OutputOffset));
+                    return tstring_printf(_T("%ls"), (PBYTE)pMapInfo + pMapInfo->MapEntryArray[i].OutputOffset);
            }
        }
    } else if (
@@ -806,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>");
 }


@@ -818,7 +817,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
        case TDH_INTYPE_UNICODESTRING:
        case TDH_INTYPE_NONNULLTERMINATEDSTRING:
        case TDH_INTYPE_UNICODECHAR:
-            return tstring_printf(_T("%.*ls"), (unsigned int)(nDataSize/sizeof(WCHAR)), (LPCWSTR)pData);
+            return tstring_printf(_T("%.*ls"), nDataSize/sizeof(WCHAR), pData);

        case TDH_INTYPE_ANSISTRING:
        case TDH_INTYPE_NONNULLTERMINATEDANSISTRING:
@@ -919,7 +918,6 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
        case TDH_INTYPE_BINARY:
            switch (OutType) {
            case TDH_OUTTYPE_IPV6: {
-                #pragma warning(suppress: 6387) // ntdll.dll *must* exist.
                auto RtlIpv6AddressToString = (LPTSTR(NTAPI*)(const IN6_ADDR*, LPTSTR))GetProcAddress(GetModuleHandle(_T("ntdll.dll")),
 #ifdef _UNICODE
                    "RtlIpv6AddressToStringW"
@@ -932,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;
@@ -947,12 +945,8 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
        case TDH_INTYPE_GUID: {
            assert(nDataSize >= sizeof(GUID));
            WCHAR szGuid[39];
-            if (StringFromGUID2(*(GUID*)pData, szGuid, _countof(szGuid)))
-                return tstring_printf(_T("%ls"), szGuid);
-            else {
-                assert(0);
-                return _T("(GUID)");
-            }
+            StringFromGUID2(*(GUID*)pData, szGuid, _countof(szGuid));
+            return tstring_printf(_T("%ls"), szGuid);
        }

        case TDH_INTYPE_POINTER:
@@ -962,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:
@@ -972,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: {
@@ -989,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:
@@ -1001,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 + (SIZE_T)nPtrSize * 2, nDataSize - (SIZE_T)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));
@@ -1015,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>");
    }
 }

@@ -1033,7 +1027,7 @@ static ULONG GetArraySize(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, ULONG i
        ULONG ulResult;

        // Get array count property.
-        PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)pInfo + pInfo->EventPropertyInfoArray[pInfo->EventPropertyInfoArray[i].countPropertyIndex].NameOffset, ULONG_MAX };
+        PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[pInfo->EventPropertyInfoArray[i].countPropertyIndex].NameOffset), ULONG_MAX };
        vector<unsigned char> count;
        if ((ulResult = TdhGetProperty(pEvent, 0, NULL, 1, &data_desc, count)) != ERROR_SUCCESS)
            return ulResult;
@@ -1059,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;
@@ -1073,7 +1067,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
            if (out_nonfirst) out += _T(", "); else out_nonfirst = true;
            out += _T('(');
            for (USHORT j = pInfo->EventPropertyInfoArray[ulPropIndex].structType.StructStartIndex, usLastMember = pInfo->EventPropertyInfoArray[ulPropIndex].structType.StructStartIndex + pInfo->EventPropertyInfoArray[ulPropIndex].structType.NumOfStructMembers; j < usLastMember; j++) {
-                out += tstring_printf(_T("%ls: "), (LPCWSTR)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[j].NameOffset));
+                out += tstring_printf(_T("%ls: "), reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[j].NameOffset);
                out += PropertyToString(pEvent, pInfo, j, reinterpret_cast<LPWSTR>(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k, nPtrSize);
            }
            out += _T(')');
@@ -1084,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) {
@@ -1092,19 +1086,19 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
                    // The first descriptor in the array identifies the name of the structure and the second 
                    // descriptor defines the member of the structure whose data you want to retrieve. 
                    PROPERTY_DATA_DESCRIPTOR data_desc[2] = {
-                        { (ULONGLONG)pStructureName                                               , ulStructIndex },
-                        { (ULONGLONG)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset, k             }
+                        { (ULONGLONG)pStructureName                                                                           , ulStructIndex },
+                        { (ULONGLONG)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k             }
                    };
                    ulResult = TdhGetProperty(pEvent, 0, NULL, _countof(data_desc), data_desc, data);
                } else {
-                    PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset, k };
+                    PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k };
                    ulResult = TdhGetProperty(pEvent, 0, NULL, 1, &data_desc, data);
                }
                if (ulResult == ERROR_EVT_INVALID_EVENT_DATA) {
                    // 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;
@@ -1113,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-
@@ -1132,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/ETWLog.h
+++ b/EventMonitor/ETWLog.h
@@ -150,7 +150,7 @@ protected:

 private:
    /// \cond internal
-    static VOID WINAPI EventRecordCallback(_In_ PEVENT_RECORD pEvent);
+    static VOID WINAPI EventRecordCallback(PEVENT_RECORD pEvent);
    /// \endcond

 protected:
--- 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</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>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</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>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</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-16.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib-16.0.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
  </ItemGroup>
@@ -176,7 +130,6 @@
    <POCompile Include="locale\de_DE.po" />
    <POCompile Include="locale\el_GR.po" />
    <POCompile Include="locale\es_ES.po" />
-    <POCompile Include="locale\et_EE.po" />
    <POCompile Include="locale\eu_ES.po" />
    <POCompile Include="locale\fi_FI.po" />
    <POCompile Include="locale\fr_CA.po" />
--- a/EventMonitor/EventMonitor.vcxproj.filters
+++ b/EventMonitor/EventMonitor.vcxproj.filters
@@ -162,8 +162,5 @@
    <POCompile Include="locale\ko_KR.po">
      <Filter>Resource Files\Localization</Filter>
    </POCompile>
-    <POCompile Include="locale\et_EE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
  </ItemGroup>
 </Project>
--- 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
@@ -34,9 +34,6 @@ class wxPersistentEventMonitorFrame;

 #include <WinStd/Win.h>

-#pragma warning(push)
-#pragma warning(disable: 26444)
-

 /// \addtogroup EventMonitor
 /// @{
@@ -75,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
@@ -176,5 +173,3 @@ inline wxPersistentObject *wxCreatePersistentObject(wxEventMonitorFrame *wnd)
 }

 /// @}
-
-#pragma warning(pop)
--- a/EventMonitor/MSIBuild/Makefile
+++ b/EventMonitor/MSIBuild/Makefile
--- a/EventMonitor/locale/EventMonitor.pot
+++ b/EventMonitor/locale/EventMonitor.pot
@@ -2,21 +2,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2019-08-12 14:04+0200\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: en_US\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"

-#: App.cpp:61 Frame.h:75 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
@@ -26,41 +27,41 @@ msgstr ""
 msgid "Error opening event trace (error %u)."
 msgstr ""

-#: ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr ""

-#: ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr ""

-#: ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr ""

-#: ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr ""

-#: ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr ""

-#: ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid "Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."
 msgstr ""

-#: ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""

-#: ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""

-#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
@@ -204,8 +205,6 @@ msgstr ""
 msgid "Trace Log"
 msgstr ""

-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
@@ -213,7 +212,6 @@ msgstr ""
 msgid "Real-time display of internal events"
 msgstr ""

-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
--- a/EventMonitor/locale/bg_BG.po
+++ b/EventMonitor/locale/bg_BG.po
@@ -1,12 +1,10 @@
-# Translators:
-# University of Ruse <support@uni-ruse.bg>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: University of Ruse <support@uni-ruse.bg>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n"
 "MIME-Version: 1.0\n"
--- a/EventMonitor/locale/ca_ES.po
+++ b/EventMonitor/locale/ca_ES.po
@@ -1,12 +1,10 @@
-# Translators:
-# eduki <ecercos@xtec.cat>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\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"
 "MIME-Version: 1.0\n"
--- a/EventMonitor/locale/cs_CZ.po
+++ b/EventMonitor/locale/cs_CZ.po
@@ -4,13 +4,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/eduroam_devel/teams/11799/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "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/cy_UK.po
+++ b/EventMonitor/locale/cy_UK.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Welsh (https://www.transifex.com/eduroam_devel/teams/11799/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/de_DE.po
+++ b/EventMonitor/locale/de_DE.po
@@ -1,14 +1,11 @@
-# Translators:
-# eduroam_devel <stefan.winter@restena.lu>, 2016
-# Eric Hoch <eric.hoch@hhu.de>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Last-Translator: Eric Hoch <eric.hoch@hhu.de>, 2016\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: eduroam_devel <stefan.winter@restena.lu>, 2016\n"
 "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/el_GR.po
+++ b/EventMonitor/locale/el_GR.po
@@ -1,13 +1,10 @@
-# Translators:
-# Vicky Kons <vickyk@admin.grnet.gr>, 2016
-# Zenon Mousmoulas <zenon@mousmoulas.gr>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Zenon Mousmoulas <zenon@mousmoulas.gr>, 2016\n"
 "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n"
 "MIME-Version: 1.0\n"
--- a/EventMonitor/locale/es_ES.po
+++ b/EventMonitor/locale/es_ES.po
@@ -1,13 +1,11 @@
-# Translators:
-# José Manuel Macías, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Last-Translator: José Manuel Macías, 2016\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\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/et_EE.po
+++ b/EventMonitor/locale/et_EE.po
@@ -1,347 +0,0 @@
-# Translators:
-# Indrek Rokk <indrek.rokk@eenet.ee>, 2018
-# Anne M <anne@eenet.ee>, 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Last-Translator: Anne M <anne@eenet.ee>, 2019\n"
-"Language-Team: Estonian (https://www.transifex.com/eduroam_devel/teams/11799/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
-"X-Poedit-Basepath: ../../..\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-SourceCharset: UTF-8\n"
-
-#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-msgid "Event Monitor"
-msgstr "Sündmuste monitor"
-
-#: 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 "Viga sündmuse jälitamise avamisel (viga %u)."
-
-#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
-msgid "Time"
-msgstr "Aeg"
-
-#: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
-msgid "PID"
-msgstr "PID"
-
-#: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
-msgid "TID"
-msgstr "TID"
-
-#: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
-msgid "Source"
-msgstr "Allikas"
-
-#: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
-msgid "Event"
-msgstr "Sündmus"
-
-#: 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 ""
-"Puudub pääsuluba: sündmuse jälitusseansi loomiseks vajad "
-"administraatoriõigusi (Run As Administrator) või kuulumist soorituste logi "
-"kasutajagruppi (Performance Log Users)"
-
-#: 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 "%s sündmuse seanss on juba olemas."
-
-#: 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 "Viga sündmuse seansi loomisel (viga %u)."
-
-#: 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 "Viga %s sündmuse looja võimaldamisel (viga %u)."
-
-#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
-#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
-#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
-#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
-#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
-#, c-format
-msgid "Toggles display of %s records"
-msgstr "Lülitab %s kirjete näitamise sisse"
-
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
-msgid "E&xit"
-msgstr "V&älju"
-
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
-msgid "Quits this program"
-msgstr "Lõpetab selle programmi"
-
-#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
-msgid "&Program"
-msgstr "&Programm"
-
-#: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
-msgid "&Copy"
-msgstr "&Kopeeri"
-
-#: 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 "Kopeerib valitud kirjed lõikelauale"
-
-#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
-msgid "Copy A&ll"
-msgstr "Kopee&ri kõik"
-
-#: 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 "Kopeerib kõik (sh varjatud) kirjed lõikelauale"
-
-#: 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 "Kustuta"
-
-#: 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 "Kustutab logist kõik kirjed"
-
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
-msgid "Select &All"
-msgstr "Vali k&õik"
-
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
-msgid "Selects all visible records"
-msgstr "Valib kõik nähtavad kirjed"
-
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
-msgid "Select &None"
-msgstr "Valiku &nullimine"
-
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
-msgid "Clears record selection"
-msgstr "Tühjendab kirjete valiku"
-
-#: 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 "R&edigeeri"
-
-#: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
-msgid "Auto &Scroll"
-msgstr "A&utomaatne kerimine"
-
-#: 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 ""
-"Kerib automaatselt kõige värskemate kirjeteni vastavalt nende tekkimisele"
-
-#: 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 "Pikk tulemus"
-
-#: 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 "Kõigi tasemete kirjete kuvamine"
-
-#: 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 "Informatiivne"
-
-#: 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 "Kirjete kuvamine informatiivse tasemeni"
-
-#: 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 "Hoiatused"
-
-#: 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 "Kirjete kuvamine hoiatustasemeni"
-
-#: 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 "Vead"
-
-#: 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 "Kirjete kuvamine ainult veatasemel"
-
-#: 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 "%s tööriistariba"
-
-#: 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 "Vahetab %s tööriistariba kuvamise"
-
-#: 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 "Vaata"
-
-#: 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 "&Vaata"
-
-#: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
-msgid "Copy"
-msgstr "Kopeeri"
-
-#: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
-msgid "Copy All"
-msgstr "Kopeeri kõik"
-
-#: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
-msgid "Edit"
-msgstr "Redigeeri"
-
-#: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
-msgid "Auto Scroll"
-msgstr "Automaatne kerimine"
-
-#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
-msgid "Trace Log"
-msgstr "Jälituslogi"
-
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-msgid "Real-time display of internal events"
-msgstr "Sisesündmuste reaalajas kuvamine"
-
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-msgid "EVENTM~1|GÉANTLink Event Monitor"
-msgstr "EVENTM~1|GÉANTLink Event Monitor"
--- a/EventMonitor/locale/eu_ES.po
+++ b/EventMonitor/locale/eu_ES.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Basque (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/fi_FI.po
+++ b/EventMonitor/locale/fi_FI.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/eduroam_devel/teams/11799/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/fr_CA.po
+++ b/EventMonitor/locale/fr_CA.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: French (Canada) (https://www.transifex.com/eduroam_devel/teams/11799/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/fr_FR.po
+++ b/EventMonitor/locale/fr_FR.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: French (France) (https://www.transifex.com/eduroam_devel/teams/11799/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/gl_ES.po
+++ b/EventMonitor/locale/gl_ES.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Galician (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/gl_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/hr_HR.po
+++ b/EventMonitor/locale/hr_HR.po
@@ -1,12 +1,10 @@
-# Translators:
-# Dubravko Penezic <dpenezic@gmail.com>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Dubravko Penezic <dpenezic@gmail.com>, 2016\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/eduroam_devel/teams/11799/hr_HR/)\n"
 "MIME-Version: 1.0\n"
--- a/EventMonitor/locale/hu_HU.po
+++ b/EventMonitor/locale/hu_HU.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Hungarian (https://www.transifex.com/eduroam_devel/teams/11799/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/is_IS.po
+++ b/EventMonitor/locale/is_IS.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Icelandic (https://www.transifex.com/eduroam_devel/teams/11799/is/)\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
@@ -1,14 +1,11 @@
-# Translators:
-# Nunzio Napolitano <nunzio.napolitano@uniparthenope.it>, 2017
-# Daniele Albrizio <daniele@albrizio.it>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Last-Translator: Daniele Albrizio <daniele@albrizio.it>, 2018\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\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"
@@ -45,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
@@ -79,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
@@ -103,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
@@ -115,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
@@ -141,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
@@ -174,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
@@ -271,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
@@ -329,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
@@ -344,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/ko_KR.po
+++ b/EventMonitor/locale/ko_KR.po
@@ -1,339 +1,227 @@
-# 
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Language-Team: Korean (Korea) (https://www.transifex.com/eduroam_devel/teams/11799/ko_KR/)\n"
+"POT-Creation-Date: 2016-09-12 12:15+0200\n"
+"PO-Revision-Date: 2016-09-12 12:15+0200\n"
+"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko_KR\n"
+"X-Generator: Poedit 1.8.8\n"
+"X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.11\n"
-"X-Poedit-Basepath: ../../..\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-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: _\n"
+"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
+"Language: ko_KR\n"
+"X-Poedit-SearchPath-0: .\n"

-#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/En.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""

-#: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
+#: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""

-#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr ""

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

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

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

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

-#: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""

-#: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""

-#: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""

-#: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
-#: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
-#: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""

-#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
-#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
-#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
-#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
-#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
+#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""

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

-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "Quits this program"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
+#: Frame.cpp:69
 msgid "&Program"
 msgstr ""

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

-#: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
-#: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
+#: Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
-#: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Select &All"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""

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

-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
+#: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
 msgstr ""

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

-#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
-#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
+#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
 msgstr ""

-#: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
+#: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
 msgstr ""

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

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

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

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

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

-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-msgid "Real-time display of internal events"
-msgstr ""
+#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
+#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Feature-2.idtx:3
+#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
+msgid "1252"
+msgstr "949"

-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""
+
+#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Release.Feature-2.idtx:4
+#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
+msgid "Real-time display of internal events"
+msgstr ""
--- a/EventMonitor/locale/lt_LT.po
+++ b/EventMonitor/locale/lt_LT.po
@@ -1,19 +1,17 @@
-# Translators:
-# Rimas Kudelis <rq@akl.lt>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Rimas Kudelis <rq@akl.lt>, 2016\n"
 "Language-Team: Lithuanian (https://www.transifex.com/eduroam_devel/teams/11799/lt/)\n"
 "MIME-Version: 1.0\n"
 "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/nb_NO.po
+++ b/EventMonitor/locale/nb_NO.po
@@ -1,12 +1,10 @@
-# Translators:
-# Tom Ivar Myren <tom.myren@uninett.no>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Tom Ivar Myren <tom.myren@uninett.no>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n"
 "MIME-Version: 1.0\n"
--- a/EventMonitor/locale/nl_NL.po
+++ b/EventMonitor/locale/nl_NL.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Dutch (https://www.transifex.com/eduroam_devel/teams/11799/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/pl_PL.po
+++ b/EventMonitor/locale/pl_PL.po
@@ -1,12 +1,10 @@
-# Translators:
-# Tomasz Wolniewicz <tw2529@gmail.com>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Tomasz Wolniewicz <tw2529@gmail.com>, 2016\n"
 "Language-Team: Polish (Poland) (https://www.transifex.com/eduroam_devel/teams/11799/pl_PL/)\n"
 "MIME-Version: 1.0\n"
--- a/EventMonitor/locale/pt_PT.po
+++ b/EventMonitor/locale/pt_PT.po
@@ -1,13 +1,11 @@
-# Translators:
-# Pedro Simões <psimoes@fccn.pt>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Last-Translator: Pedro Simões <psimoes@fccn.pt>, 2017\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Pedro Simões <psimoes@fccn.pt>, 2016\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/ru_RU.po
+++ b/EventMonitor/locale/ru_RU.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Russian (Russia) (https://www.transifex.com/eduroam_devel/teams/11799/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/sk_SK.po
+++ b/EventMonitor/locale/sk_SK.po
@@ -4,13 +4,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Slovak (Slovakia) (https://www.transifex.com/eduroam_devel/teams/11799/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "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/locale/sl_SI.po
+++ b/EventMonitor/locale/sl_SI.po
@@ -1,12 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\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"
 "MIME-Version: 1.0\n"
--- a/EventMonitor/locale/sr_RS.po
+++ b/EventMonitor/locale/sr_RS.po
@@ -1,12 +1,10 @@
-# Translators:
-# Marko Eremija <marko.eremija@amres.ac.rs>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Marko Eremija <marko.eremija@amres.ac.rs>, 2016\n"
 "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n"
 "MIME-Version: 1.0\n"
--- a/EventMonitor/locale/sv_SE.po
+++ b/EventMonitor/locale/sv_SE.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Swedish (https://www.transifex.com/eduroam_devel/teams/11799/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/tr_TR.po
+++ b/EventMonitor/locale/tr_TR.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Turkish (https://www.transifex.com/eduroam_devel/teams/11799/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/vi_VN.po
+++ b/EventMonitor/locale/vi_VN.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Vietnamese (https://www.transifex.com/eduroam_devel/teams/11799/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\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-16.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-16.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,36 +2,31 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2019-08-12 14:04+0200\n"
+"POT-Creation-Date: 2016-09-19 11:20+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.3\n"
-"X-Poedit-Basepath: ..\n"
+"X-Generator: Poedit 1.8.9\n"
+"X-Poedit-Basepath: ../Main\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: en_US\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: Main\n"
+"X-Poedit-SearchPath-0: .\n"

-#: Main/en_US.ARM64.Release.LaunchCondition-2.idtx:4
-#: Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: Main/en_US.x64.Release.LaunchCondition-2.idtx:4
+#: en_US.Win32.Release.LaunchCondition-2.idtx:4
+#: en_US.x64.Release.LaunchCondition-2.idtx:4
 msgid "[ProductName] requires Windows Vista or later version of Windows."
 msgstr ""

-#: Main/en_US.ARM64.Release.Property-2.idtx:4
-#: Main/en_US.ARM64.Release.Property-2.idtx:5
-#: Main/en_US.Win32.Release.Property-2.idtx:4
-#: Main/en_US.Win32.Release.Property-2.idtx:5
-#: Main/en_US.x64.Release.Property-2.idtx:4
-#: Main/en_US.x64.Release.Property-2.idtx:5
+#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5
+#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5
 msgid "http://www.geant.org/"
 msgstr ""

-#: Main/en_US.ARM64.Release.Property-2.idtx:6
-#: Main/en_US.Win32.Release.Property-2.idtx:6
-#: Main/en_US.x64.Release.Property-2.idtx:6
+#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
 msgid "https://github.com/Amebis/GEANTLink/releases"
 msgstr ""
--- a/MSI/Base/locale/bg_BG.po
+++ b/MSI/Base/locale/bg_BG.po
@@ -1,13 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
-# University of Ruse <support@uni-ruse.bg>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: University of Ruse <support@uni-ruse.bg>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n"
 "MIME-Version: 1.0\n"
--- a/MSI/Base/locale/ca_ES.po
+++ b/MSI/Base/locale/ca_ES.po
@@ -1,13 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
-# eduki <ecercos@xtec.cat>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\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"
 "MIME-Version: 1.0\n"
--- a/MSI/Base/locale/cs_CZ.po
+++ b/MSI/Base/locale/cs_CZ.po
@@ -1,19 +1,17 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/eduroam_devel/teams/11799/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "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/cy_UK.po
+++ b/MSI/Base/locale/cy_UK.po
@@ -1,12 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\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"
 "MIME-Version: 1.0\n"
--- a/MSI/Base/locale/de_DE.po
+++ b/MSI/Base/locale/de_DE.po
@@ -1,13 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
-# eduroam_devel <stefan.winter@restena.lu>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: eduroam_devel <stefan.winter@restena.lu>, 2016\n"
 "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n"
 "MIME-Version: 1.0\n"
--- a/MSI/Base/locale/el_GR.po
+++ b/MSI/Base/locale/el_GR.po
@@ -1,13 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
-# Vicky Kons <vickyk@admin.grnet.gr>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Vicky Kons <vickyk@admin.grnet.gr>, 2016\n"
 "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n"
 "MIME-Version: 1.0\n"
--- a/MSI/Base/locale/es_ES.po
+++ b/MSI/Base/locale/es_ES.po
@@ -1,14 +1,11 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
-# José Manuel Macías, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\n"
-"Last-Translator: José Manuel Macías, 2016\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\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/et_EE.po
+++ b/MSI/Base/locale/et_EE.po
@@ -1,81 +0,0 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2018
-# Anne M <anne@eenet.ee>, 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\n"
-"Last-Translator: Anne M <anne@eenet.ee>, 2018\n"
-"Language-Team: Estonian (https://www.transifex.com/eduroam_devel/teams/11799/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
-"X-Poedit-Basepath: ../../../..\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-SourceCharset: UTF-8\n"
-
-#: master/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
-#: master/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: master/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
-#: master/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
-msgid "[ProductName] requires Windows Vista or later version of Windows."
-msgstr "[ProductName] vajab Windows Vistat või uuemat Windowsi versiooni."
-
-#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
-#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
-#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
-#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
-#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
-#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
-#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
-#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
-#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
-#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
-#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
-#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
-#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
-msgid "http://www.geant.org/"
-msgstr "http://www.geant.org/"
-
-#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
-#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
-#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
-#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
-#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
-#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
-#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
-#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
-msgid "https://github.com/Amebis/GEANTLink/releases"
-msgstr "https://github.com/Amebis/GEANTLink/releases"
--- a/MSI/Base/locale/eu_ES.po
+++ b/MSI/Base/locale/eu_ES.po
@@ -1,12 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\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"
 "MIME-Version: 1.0\n"
--- a/MSI/Base/locale/fi_FI.po
+++ b/MSI/Base/locale/fi_FI.po
@@ -1,12 +1,10 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-09-10 07:51+0000\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"
 "MIME-Version: 1.0\n"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Rozman	bd1cf156bc	Set version to 1.0e	2017-12-05 09:14:17 +01:00
Simon Rozman	09b35b14c3	Translation update	2017-12-05 09:12:38 +01:00
Simon Rozman	9d29353fed	Update wxExtend module	2017-12-05 09:12:12 +01:00
Simon Rozman	283fd08d51	Ignore post v1.0 folders For easier switching between branches the non-v1.0 folders has been .gitignored.	2017-12-05 09:02:13 +01:00
Simon Rozman	09bf94b377	Distribution folder changed	2017-11-20 12:06:08 +01:00
Simon Rozman	9ce58c3e15	Issue with NULL-initialized new profile configuration fixed	2017-07-10 10:49:33 +02:00
Simon Rozman	7ed4eda8ea	Translation update	2017-05-30 12:42:36 +02:00
Simon Rozman	e0b9c4d95a	Sub-module update	2017-05-30 12:39:12 +02:00
Simon Rozman	303a060f28	Version set to 1.0d	2017-05-22 09:19:51 +02:00
Simon Rozman	6264741a62	`daea1bba62` reverted	2017-05-22 09:18:02 +02:00
Simon Rozman	28f5710e47	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:18:01 +02:00
Simon Rozman	cf6e3e7c25	MsiUseFeature() returning INSTALLSTATE_BROKEN is tolerated in non-elevated process now	2017-05-22 08:42:56 +02:00
Simon Rozman	a1485a78f6	WLANManager.exe now deployed as WLANManager-Win32.exe and WLANManager-x64.exe	2017-05-17 13:02:21 +02:00
Simon Rozman	06d39f0561	Sub-module update	2017-05-17 13:01:32 +02:00
Simon Rozman	0efe4d52c3	Secondary error message pop-up removed	2017-05-17 12:56:15 +02:00
Simon Rozman	5efadaa8c2	WLANManager support for multiple wireless interfaces	2017-05-17 12:56:14 +02:00
Simon Rozman	4937550746	Documentation update	2017-05-17 12:55:14 +02:00
Simon Rozman	4b5ffdf9a1	Indentation fix	2017-03-14 09:37:57 +01:00
Simon Rozman	ffa74466a4	Version set to 1.0c	2017-02-24 12:07:05 +01:00
Simon Rozman	f4e27d2151	Clean-up	2017-02-23 12:11:39 +01:00
Simon Rozman	7f20906cf7	Incorrect `CoCreateInstance()` result evaluation fixed # Conflicts: # lib/WinStd	2017-02-23 11:12:39 +01:00
Simon Rozman	30b96082bd	Debugging-related exception in WlanUIEditProfile() resolved	2017-02-23 11:11:53 +01:00
Simon Rozman	0abae8fe0e	Locale is dynamic now, since wxLocale does not support re-initialization (when module is reused)	2017-02-22 09:45:26 +01:00
Simon Rozman	6df6eeaa0a	New version of wxExtend	2017-02-20 10:58:38 +01:00
Simon Rozman	4ac3643ef7	Compilation of debug MSI files fixed	2017-02-20 10:07:00 +01:00
Simon Rozman	3fa838aba1	Documentation update	2017-02-13 07:59:34 +01:00
Simon Rozman	2557861065	64-bit language detection removed from 32-bit MSI resolving ICE80 warning	2017-02-09 13:42:08 +01:00
Simon Rozman	212e319011	Uninitialized enum higher bytes when reading as unsigned char fixed	2017-02-09 11:42:55 +01:00
Simon Rozman	e5acaee698	Version set to 1.0b	2017-02-06 08:12:54 +01:00
Simon Rozman	fe85347c31	Translation update	2017-02-06 07:59:53 +01:00
Simon Rozman	e0572524aa	__DANGEROUS__LOG_CONFIDENTIAL_DATA is now 0/1 #defined	2017-02-02 14:01:12 +01:00
Simon Rozman	decf8d0860	EAP_USE_NATIVE_CREDENTIAL_CACHE is now 0/1 #defined	2017-02-02 13:34:43 +01:00
Simon Rozman	f5530b4ca9	Documentation update	2017-02-02 12:10:55 +01:00
Simon Rozman	9b174b7855	Simple BLOB encryption/decryption added & comment updates	2017-02-01 10:26:24 +01:00
Simon Rozman	33e5bc90a5	Missing namespace added	2017-02-01 10:14:05 +01:00
Simon Rozman	391fc796d7	Clean-up	2017-01-31 14:00:37 +01:00
Simon Rozman	946db58d3e	EAP errors now correctly displayed in Event Viewer	2017-01-31 12:37:19 +01:00
Simon Rozman	d1a6d02e67	Incorrect RFC quote removed	2017-01-31 11:07:25 +01:00
Simon Rozman	d695ded8e7	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:43:58 +01:00
Simon Rozman	c4bc78cb47	"User ID" and "Password" labels vertically centered	2017-01-31 10:42:43 +01:00
Simon Rozman	3a7d26c68e	EAP types look-up extended	2017-01-30 12:18:34 +01:00
Simon Rozman	9a71fe64c6	Documentation update	2016-12-13 11:27:53 +01:00
Simon Rozman	8d64acfab9	Event reporting extended to support event channel in Windows Event Viewer # Conflicts: # Makefile # lib/Events/res/EventsETW.man	2016-12-09 13:41:28 +01:00
Simon Rozman	eab7def72e	Event source in registry changed to match the one in manifest # Conflicts: # Makefile	2016-12-09 13:32:24 +01:00
Simon Rozman	07dbb7618a	Translation update	2016-12-07 14:05:24 +01:00
Simon Rozman	cc7bc07efe	Missing credential identity tooltip reintroduced	2016-12-07 13:28:16 +01:00
Simon Rozman	4b7c697385	Identity read-only text box in credential selection configuration panel has been replaced by static text not to confuse users they can edit it there	2016-12-07 13:19:31 +01:00
Simon Rozman	8e81ece9e3	Some extra diagnostic output added when configuration XML contains unknown/unsupported method	2016-12-07 11:54:42 +01:00
Simon Rozman	5214afe17e	Sub-module update	2016-12-06 11:13:25 +01:00
Simon Rozman	281c8a7119	eap::peer_ttls::end_session() fixed to call method's end_session() method	2016-12-05 13:17:38 +01:00
Simon Rozman	1162ccae3f	New authentication status introduced: server compromised	2016-12-05 13:15:07 +01:00
Simon Rozman	4804214231	Distribution folder changed	2016-11-29 13:01:50 +01:00
Simon Rozman	130bab1391	Charset issue in version resource fixed	2016-11-18 09:13:28 +01:00
Simon Rozman	ba609ba469	Version set to 1.0a	2016-11-18 06:49:24 +01:00
Simon Rozman	6fef48848d	Digital signing of CAB files introduced	2016-11-18 06:30:14 +01:00
Simon Rozman	bdc1ffd9f1	...3.msi and ...3.mst files renamed to remove ".3" versioning in the name, to simplify their deployment	2016-11-18 06:30:14 +01:00
Simon Rozman	0ac18d6961	...3.msi files are finalized now (marked as final, digitally signed, read-only), as they can be used for GPO deployment	2016-11-18 06:30:13 +01:00
Simon Rozman	09c08aa301	Makefile sub-target CleanSetup introduced	2016-11-18 06:30:13 +01:00
Simon Rozman	d95803c672	en_US MSI files prepared using MSILocal.mak now for more uniform building	2016-11-18 06:30:13 +01:00
Simon Rozman	9a74e982ab	Translation update	2016-11-18 06:28:36 +01:00
Simon Rozman	c603008cd4	Distribution folder changed	2016-11-08 11:35:59 +01:00
Simon Rozman	51eb485440	Sub-module update	2016-11-08 11:35:43 +01:00
Simon Rozman	e75d31dd9b	Version set to 1.0	2016-11-07 13:56:12 +01:00
Simon Rozman	0b4e4571b6	WideCharToMultiByte() and MultiByteToWideChar() optimization	2016-11-07 13:53:17 +01:00
Simon Rozman	435157955e	Documentation update	2016-11-07 13:00:17 +01:00
Simon Rozman	f155b93ac2	POT update	2016-11-07 12:58:46 +01:00
Simon Rozman	0865318278	Documentation update	2016-11-07 12:57:41 +01:00
Simon Rozman	271e062be2	Auditing of CryptProtectData() enabled	2016-11-07 11:06:33 +01:00
Simon Rozman	ebe12e5157	Password and certificate output to log is no longer conditioned by _DEBUG	2016-11-07 10:59:28 +01:00
Simon Rozman	f197c0c937	Doxygen documentation update	2016-11-07 09:26:55 +01:00
Simon Rozman	29d5769060	Excessive .c_str() removed	2016-11-07 09:20:29 +01:00
Simon Rozman	0afbdadea7	EventMonitor Doxygen documentation update	2016-11-07 09:10:35 +01:00
Simon Rozman	cebcf7506e	Redundant std::string to const char* conversion in exception constructors cleaned	2016-11-04 14:50:12 +01:00
Simon Rozman	3fb92a0c30	Version set to 1.0-beta8	2016-11-04 14:24:50 +01:00
Simon Rozman	0c5a145ad8	MSI localized files contain and install own resources only now	2016-11-04 14:05:34 +01:00
Simon Rozman	cc069d0442	Non-ready localizations deactivated	2016-11-04 14:05:33 +01:00
Simon Rozman	060aada133	Sub-module update	2016-11-04 13:58:10 +01:00