Update README.md

Force SHA-256 digest for timestamp signatures
Comodo timestamp server defaults to SHA-1. To make sure timestamp signatures are SHA-256, add appropriate signtool.exe flag.
2018-12-06 08:35:58 +01:00 · 2018-11-06 19:56:20 +01:00 · 2018-11-06 19:56:20 +01:00 · 2018-11-06 19:56:20 +01:00 · 2018-11-06 19:55:19 +01:00 · 2018-09-30 16:53:22 +02:00
210 changed files with 13816 additions and 10031 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/*.opensdf
-/*.suo
-/*.sdf
+/.vs
 /doc
-/ipch
--- a/CredWrite/CredWrite.rc
+++ b/CredWrite/CredWrite.rc
--- a/CredWrite/CredWrite.vcxproj
+++ b/CredWrite/CredWrite.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.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>
@@ -9,6 +13,10 @@
      <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>
@@ -22,66 +30,102 @@
    <ProjectGuid>{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>CredWrite</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).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\x64.props" />
-    <Import Project="..\include\Debug.props" />
+    <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="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\Win32.props" />
-    <Import Project="..\include\Release.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).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\x64.props" />
-    <Import Project="..\include\Release.props" />
+    <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="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>
@@ -91,7 +135,9 @@
      <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>
@@ -110,7 +156,7 @@
    <ProjectReference Include="..\lib\TLS\build\TLS.vcxproj">
      <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
  </ItemGroup>
--- a/CredWrite/README.md
+++ b/CredWrite/README.md
@@ -1,7 +1,7 @@
-#CredWrite
-Imports given credentials to Windows Credential Manager for G<EFBFBD>ANTLink use
+# CredWrite
+Imports given credentials to Windows Credential Manager for GÉANTLink use

-##Usage
+## Usage
 ```
 CredWrite <username> <password> [<realm> [level]]
 ```
--- a/EAPMethods/EAPTTLS/EAPTTLS.rc
+++ b/EAPMethods/EAPTTLS/EAPTTLS.rc
--- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
+++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.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>
@@ -9,6 +13,10 @@
      <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>
@@ -21,63 +29,97 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{331B6077-E3E2-4867-B93E-9D3F57280DE7}</ProjectGuid>
    <RootNamespace>EAPTTLS</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\Win32.props" />
-    <Import Project="..\..\include\Debug.props" />
+    <Import Project="..\..\include\$(Platform).props" />
+    <Import Project="..\..\include\$(Configuration).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\x64.props" />
-    <Import Project="..\..\include\Debug.props" />
+    <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="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\Win32.props" />
-    <Import Project="..\..\include\Release.props" />
+    <Import Project="..\..\include\$(Platform).props" />
+    <Import Project="..\..\include\$(Configuration).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\x64.props" />
-    <Import Project="..\..\include\Release.props" />
+    <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="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>
@@ -87,7 +129,9 @@
      <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>
@@ -115,7 +159,7 @@
    <ProjectReference Include="..\..\lib\TTLS\build\TTLS.vcxproj">
      <Project>{ee0ef0d9-a475-4038-8637-5754724f65b0}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd-15.0.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,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.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>
@@ -9,6 +13,10 @@
      <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>
@@ -21,63 +29,97 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{DD7A97CA-F18E-43B7-95C4-D06E6A291624}</ProjectGuid>
    <RootNamespace>EAPTTLSUI</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\include\Win32.props" />
-    <Import Project="..\..\include\Debug.props" />
+    <Import Project="..\..\include\$(Platform).props" />
+    <Import Project="..\..\include\$(Configuration).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\x64.props" />
-    <Import Project="..\..\include\Debug.props" />
+    <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="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\Win32.props" />
-    <Import Project="..\..\include\Release.props" />
+    <Import Project="..\..\include\$(Platform).props" />
+    <Import Project="..\..\include\$(Configuration).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\x64.props" />
-    <Import Project="..\..\include\Release.props" />
+    <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="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>
@@ -87,7 +129,9 @@
      <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>
@@ -133,10 +177,10 @@
    <ProjectReference Include="..\..\lib\TTLS_UI\build\TTLS_UI.vcxproj">
      <Project>{42f0f0f4-c928-4860-a4e4-94991c2c3d90}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd-15.0.vcxproj">
      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib.vcxproj">
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib-15.0.vcxproj">
      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
    </ProjectReference>
  </ItemGroup>
@@ -152,6 +196,7 @@
    <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,5 +132,8 @@
    <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
--- a/EAPMethods/locale/bg_BG.po
+++ b/EAPMethods/locale/bg_BG.po
@@ -1,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,130 @@ 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
@@ -74,16 +200,6 @@ 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
@@ -395,6 +511,17 @@ 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
@@ -543,8 +670,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr "Премахване на избраните certificate authorities от списъка"

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr "Допустими сървър &имена:"

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -668,38 +795,38 @@ msgstr ""
 "непопълнено, за да пропуснете проверката на името; позволени са уникод "
 "символи"

-#: 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
+#: 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
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Например: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr "Потребителски сертификат"

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr "Моля изберете Вашия &сертификат, за да се аутентикирате."

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr "Клиентски сертификат за аутентикация"

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "Клиентска &самоличност:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -707,17 +834,6 @@ 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"
@@ -808,43 +924,22 @@ msgstr "Специфицирай клиентска външна самолич
 msgid "Custom outer identity to use"
 msgstr "Клиентска външна самоличност да се използва"

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -895,98 +990,6 @@ 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,18 +1,21 @@
+# Translators:
+# eduki <ecercos@xtec.cat>, 2017
+# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +41,128 @@ msgstr ""
 "X-Poedit-SearchPath-9: ver1.1/lib/EapHost_UI\n"
 "X-Poedit-SourceCharset: UTF-8\n"

+#: master/lib/EAPBase_UI/include/EAP_UI.h:285
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:302
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:284
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Segur que voleu esborrar permanentment el proveidor %s de la configuració?"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:285
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:302
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:284
+msgid "Warning"
+msgstr "Alerta"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:371
+#: master/lib/EAPBase_UI/res/wxEAP_UI.h:119
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:367
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:377
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.h:119
+#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:370
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Credencials EAP"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:641
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:640
+msgid "Provider Settings"
+msgstr "Ajustos del proveidor"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:674
+#: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:605
+#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:673
+#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Credencials d'usuari"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:793
+#: master/lib/TTLS_UI/src/Module.cpp:285 master/lib/TTLS_UI/src/Module.cpp:357
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:724
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:275 ver1.0/lib/TTLS_UI/src/Module.cpp:285
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:263 ver1.1/lib/TTLS_UI/src/Module.cpp:319
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Error escrivint les credencial a l'Administrador de credencials: %hs (error "
+"%u)"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:796
+#: master/lib/TTLS_UI/src/Module.cpp:287 master/lib/TTLS_UI/src/Module.cpp:359
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:727
+#: ver1.0/lib/TTLS_UI/src/Module.cpp:277 ver1.0/lib/TTLS_UI/src/Module.cpp:287
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:795
+#: ver1.1/lib/TTLS_UI/src/Module.cpp:265 ver1.1/lib/TTLS_UI/src/Module.cpp:321
+msgid "Writing credentials failed."
+msgstr "Ha fallat l'escriptura de les credencials."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:816
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:815
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Ha fallat l'esborrat de credencials (error %u)."
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:854
+#, c-format
+msgid "(error %u)"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:859
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:858
+msgid "(error)"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:870
+#: master/lib/EAPBase_UI/include/EAP_UI.h:879
+#: master/lib/TLS_UI/src/TLS_UI.cpp:61
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:803
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:812
+#: ver1.0/lib/TLS_UI/src/TLS_UI.cpp:59
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:869
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:878
+#: ver1.1/lib/TLS_UI/src/TLS_UI.cpp:61
+msgid "(empty)"
+msgstr "(buit)"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:870
+#: master/lib/EAPBase_UI/include/EAP_UI.h:879
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:803
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:812
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:869
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:878
+msgid "(blank ID)"
+msgstr ""
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:919
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:918
+msgid "&Remember"
+msgstr "&Recordar"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:920
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:919
+msgid "Check if you would like to save credentials"
+msgstr "Marqueu si voleu desar les credencials"
+
+#: master/lib/EAPBase_UI/include/EAP_UI.h:1131
+#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
+#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1077
+msgid "(Your Organization)"
+msgstr "(La vostra organització)"
+
 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 #: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.cpp:37
@@ -74,16 +199,6 @@ 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
@@ -387,6 +502,17 @@ 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
@@ -534,8 +660,8 @@ msgstr "Ha fallat la configuració dels mètodes EAP (error %u, %s, %s)."
 msgid "Configuring EAP method failed (error %u)."
 msgstr "Ha fallat la configuració dels mètodes EAP (error %u)."

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

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

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

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr "&Noms de servidors acceptats:"

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -657,38 +783,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:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: 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
 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: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
+#: 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
 msgid "User Certificate"
 msgstr "Certificat d'usuari"

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

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "Personalitzar la &identitat:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -696,17 +822,6 @@ 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"
@@ -798,44 +913,23 @@ msgstr "Especifiqueu la identitat externa personalitzada"
 msgid "Custom outer identity to use"
 msgstr "Identitat externa a utilitzar"

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, 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:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
+#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
 #, 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:496
+#: master/lib/TTLS_UI/src/Module.cpp:532
 #, 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:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Ha fallat la interfície d'usuari interactiva EAP  (error %u)."
@@ -886,96 +980,6 @@ 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,18 +1,21 @@
+# 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: 2017-02-09 13:15+0100\n"
-"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"PO-Revision-Date: 2016-08-25 06:18+0000\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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 1.8.11\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"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +41,125 @@ 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
@@ -74,16 +196,6 @@ 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
@@ -364,6 +476,17 @@ 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
@@ -502,8 +625,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +868,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +934,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,129 @@ 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
@@ -74,16 +199,6 @@ 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
@@ -389,6 +504,17 @@ 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
@@ -537,8 +663,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 ""

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

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -661,38 +787,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:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: 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
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Beispiel: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr "Benutzerzertifikat"

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

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "Ab&weichender Nutzername:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -701,17 +827,6 @@ 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"
@@ -806,44 +921,23 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr "Zu verwendender Nutzername"

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, 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:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
+#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
 #, 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:496
+#: master/lib/TTLS_UI/src/Module.cpp:532
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -895,97 +989,6 @@ 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,18 +1,22 @@
+# 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: 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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +42,129 @@ 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
@@ -74,16 +201,6 @@ 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
@@ -390,6 +507,17 @@ 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
@@ -541,8 +669,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"

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr "Αφαιρεί επιλεγμένα πιστοποιητικά από τη λίστα"

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr "Αποδεκτά &ονόματα server:"

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -666,41 +794,41 @@ msgstr ""
 "εξυπηρετητών· αφήστε κενό για να παρακάμψετε την επιλογή ονόματος· "
 "επιτρέπονται οι χαρακτήρες unicode"

-#: 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
+#: 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
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Παράδειγμα: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr "Πιστοποιητικό χρήστη"

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
 "Επιλέξτε το &πιστοποιητικό σας που θα χρησιμοποιηθεί για τον έλεγχο "
 "ταυτότητας."

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""
 "Το πιστοποιητικό πελάτη που θα χρησιμοποιηθεί για τον έλεγχο της ταυτότητας"

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "Προσαρμοσμένη &ταυτότητα:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -708,17 +836,6 @@ 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"
@@ -812,44 +929,23 @@ msgstr "Καθορίστε τη διαμόρφωση της εξωτερικής
 msgid "Custom outer identity to use"
 msgstr "Προσαρμόστε την εξωτερική ταυτότητα για να την χρησιμοποιήσετε"

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

-#: master/lib/TTLS_UI/src/Module.cpp:496
+#: master/lib/TTLS_UI/src/Module.cpp:532
 #, 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:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Η επίκληση της διαδραστικότητας του EAP UI απέτυχε (error %u)."
@@ -900,97 +996,6 @@ 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,18 +1,21 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2018
+# Alberto Martínez Setién, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +41,128 @@ 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
@@ -74,16 +199,6 @@ 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
@@ -391,6 +506,17 @@ 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
@@ -540,8 +666,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"

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

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

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -665,38 +791,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:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: 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
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Ejemplo: foo.bar.com;servidor2.bar.com)"

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr "Certificado de usuario"

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

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "&Identidad personalizada:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -704,17 +830,6 @@ 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"
@@ -807,44 +922,24 @@ msgstr "Especificar identidad externa personalizada"
 msgid "Custom outer identity to use"
 msgstr "Identidad externa personalizada a usar"

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, 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:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
+#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
 #, 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:496
+#: master/lib/TTLS_UI/src/Module.cpp:532
 #, 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:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Fallo al lanzar la interfaz de usuario interactiva EAP (error %u)."
@@ -895,97 +990,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,21 @@
+# Translators:
+# Dubravko Penezic <dpenezic@gmail.com>, 2018
+# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +41,129 @@ 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
@@ -74,27 +200,18 @@ 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 ""
+msgstr "Upotrijebite vjerodajnice iz &Credential i upravitelja"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:245
@@ -103,6 +220,8 @@ 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
@@ -111,19 +230,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 ""
+msgstr "Identitet"

 #: 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 ""
+msgstr "Vaše vjerodajnice pohranjene u sustavu Windows Credential Manager"

 #: 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 "&Obriši korisničke podatke"
+msgstr "&Izbriši vjerodajnice"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:273
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:273
@@ -157,7 +276,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 ""
+msgstr "Upotrijebite vjerodajnice iz konfiguracije &profila"

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:289
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:289
@@ -166,18 +285,20 @@ 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 ""
+msgstr "Potvrde o konfiguraciji profila"

 #: 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 ""
+msgstr "Korisnički ID i lozinka"

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

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

 #: master/lib/EAPBase_UI/res/wxEAP_UI.cpp:473
 #: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.cpp:424
@@ -375,6 +496,17 @@ 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
@@ -473,105 +605,107 @@ 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 ""
+msgstr "Molimo, ponovno razmotrite potrebu za unos vjerodajnica."

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

 #: 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 ""
+msgstr "Odaberite i konfigurirajte unutarnju EAP metodu"

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

 #: 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 ""
+msgstr "Nije uspjelo nabrajanje metoda EAP (pogreška% u,% s,% s)."

 #: 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 ""
+msgstr "Nije uspjelo nabrajanje metoda EAP (pogreška% u)."

 #: 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 ""
+msgstr "Nije uspjela konfiguracija EAP metode (pogreška% u,% s,% s)."

 #: 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 ""
+msgstr "Nije uspjela konfiguracija EAP metode (pogreš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 ""
+msgstr "GTC izazov"

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

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

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

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

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

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

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

 #: master/lib/GTC_UI/src/GTC_UI.cpp:119
 #, c-format
 msgid "%s Challenge"
-msgstr ""
+msgstr "$s Izazov"

 #: 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 ""
+msgstr "Korisnički ID i lozinka MSCHAPv2"

 #: 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 ""
+msgstr "PAP User ID i Lozinka"

 #: 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 "Server Trust"
+msgstr "Povjerenje poslužitelja"

 #: 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
@@ -591,7 +725,7 @@ msgstr "Prihvatljivi certifikat autoriteti: "
 msgid ""
 "Server's certificate must be issued by one of certificate authorities listed"
 " here"
-msgstr ""
+msgstr "Certifikat poslužitelja mora izdati ovlašteni izdavatelj certifikata"

 #: 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
@@ -619,18 +753,18 @@ msgstr "Dodavanje novog certifikat autoriteta na listu"
 msgid "&Remove CA"
 msgstr "&Micanje CA"

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr "MIcanje odabranih certifikat autoriteta s liste"

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr "Prihvatljiv &naziv poslužitelja "

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -638,38 +772,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:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: 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
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Primjer: pero.hr;freeradius.primjer.hr)"

-#: 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
+#: 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
 msgid "User Certificate"
-msgstr ""
+msgstr "Korisnički certifikat"

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
-msgstr ""
+msgstr "Odaberite &certifikat koji ćete koristiti za autentikaciju."

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr "Klijentski certifikat za autentikaciju"

-#: 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
+#: 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
 msgid "Custom &identity:"
-msgstr "Samostalno odabrani &identitet"
+msgstr "Samostalno odabrani &identitet:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -677,17 +811,6 @@ 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"
@@ -769,7 +892,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
@@ -783,46 +906,25 @@ 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: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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
-msgstr ""
+msgstr "Neuspjelo otvaranje korisničkog sučelja EAP identiteta."

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

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

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

 #: master/lib/TTLS_UI/src/TTLS_UI.cpp:118
 #: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:36
@@ -861,7 +963,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 ""
+msgstr "Ostale EAP metode..."

 #: master/lib/TTLS_UI/src/TTLS_UI.cpp:141
 #: ver1.0/lib/TTLS_UI/src/TTLS_UI.cpp:61
@@ -870,97 +972,6 @@ msgstr ""
 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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=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"
+"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"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,126 @@ 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
@@ -74,16 +196,6 @@ 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
@@ -380,6 +492,17 @@ 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
@@ -528,8 +651,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 ""

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

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

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -649,38 +772,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:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: 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
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Pvz.: vienas.įstaiga.lt;du.įstaiga.lt)"

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr "Kliento sertifikatas autentifikavimui"

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "&Tinkinta tapatybė:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -688,17 +811,6 @@ 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"
@@ -791,41 +903,22 @@ 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: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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -876,96 +969,6 @@ 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,18 +1,21 @@
+# 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: 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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +41,128 @@ 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
@@ -74,16 +199,6 @@ 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
@@ -381,6 +496,17 @@ 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
@@ -528,8 +654,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"

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

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr "Aksepterte tjener&navn:"

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -650,38 +776,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:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: 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
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Eksempel: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr "Bruker sertifikat"

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr "Vennligst velg ditt &sertifikat for autentisering."

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr "Klientsertifikat for autentisering "

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "Tilpasset &identitet:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -689,17 +815,6 @@ 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"
@@ -791,43 +906,22 @@ msgstr "Spesifiser tilpasset ytre identitet"
 msgid "Custom outer identity to use"
 msgstr "Tilpasset ytre identitet som brukes"

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, 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:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
+#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
 #, 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:496
+#: master/lib/TTLS_UI/src/Module.cpp:532
 #, 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:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Kall av EAP interaktivt UI feilet (feil %u)."
@@ -878,96 +972,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,126 @@ 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
@@ -74,16 +196,6 @@ 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
@@ -387,6 +499,17 @@ 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
@@ -537,8 +660,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 ""

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

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr "Dopuszczalne &nazwy serwerów:"

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -659,40 +782,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:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: 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
 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: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
+#: 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
 msgid "User Certificate"
 msgstr "Certyfikat użytkownika"

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

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "Niestandardowy &identyfikator:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -700,17 +823,6 @@ 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"
@@ -803,42 +915,23 @@ msgstr "Podaj niestandardowy identyfikator zewnętrzny"
 msgid "Custom outer identity to use"
 msgstr "Niestandardowy identyfikator zewnętrzny"

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, 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:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
+#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
 #, 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:496
+#: master/lib/TTLS_UI/src/Module.cpp:532
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
 msgstr ""

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -889,96 +982,6 @@ 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,10 +1,13 @@
+# 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: 2017-02-09 13:15+0100\n"
-"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"PO-Revision-Date: 2016-08-25 06:18+0000\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"
@@ -12,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +41,125 @@ 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
@@ -74,16 +196,6 @@ 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
@@ -364,6 +476,17 @@ 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
@@ -502,8 +625,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr "Certificado do Utilizador"

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +868,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +934,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 1.8.11\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"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2018
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,128 @@ 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
@@ -74,16 +198,6 @@ 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
@@ -383,6 +497,17 @@ 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
@@ -527,8 +652,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"

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

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr "Sprejemljiva ime&na strežnika:"

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -649,38 +774,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:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: 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
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Primer: vzo.rec.si;streznik2.rec.si)"

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr "Uporabnikovo potrdilo"

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

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "&Identiteta po meri:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -688,17 +813,6 @@ 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"
@@ -789,42 +903,22 @@ 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: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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, 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:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
+#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
 #, 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:496
+#: master/lib/TTLS_UI/src/Module.cpp:532
 #, 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:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Zagon interaktivnega up. vmesnika EAP ni uspel (napaka %u)."
@@ -875,97 +969,6 @@ 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,18 +1,21 @@
+# 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: 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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +41,128 @@ 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
@@ -74,16 +199,6 @@ 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
@@ -388,6 +503,17 @@ 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
@@ -537,8 +663,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"

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr "Uklanja odabrano sertifikaciono telo sa liste"

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr "Prihvatljiva &names servera"

-#: 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
+#: 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
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -660,38 +786,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:81 ver1.0/lib/TLS_UI/res/wxTLS_UI.cpp:81
-#: ver1.1/lib/TLS_UI/res/wxTLS_UI.cpp:81
+#: 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
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(npr: foo.bar.com;server2.bar.com)"

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr "Korisnički sertifikat"

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

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr "Proizvoljan &identity:"

-#: 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
+#: 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
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -700,17 +826,6 @@ 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"
@@ -802,48 +917,28 @@ msgstr "Unesite proizvoljan spoljni identitet"
 msgid "Custom outer identity to use"
 msgstr "Koristi proizvoljan spoljni identitet"

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, 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:369 ver1.1/lib/TTLS_UI/src/Module.cpp:357
+#: master/lib/TTLS_UI/src/Module.cpp:396 ver1.1/lib/TTLS_UI/src/Module.cpp:358
 #, 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:496
+#: master/lib/TTLS_UI/src/Module.cpp:532
 #, 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:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -896,97 +991,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -841,95 +933,6 @@ 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,10 +1,13 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
+# Gokhan Eryol <gokhaneryol@gmail.com>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
-"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
+"PO-Revision-Date: 2016-08-25 06:18+0000\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"
@@ -12,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +41,125 @@ 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
@@ -74,16 +196,6 @@ 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
@@ -365,6 +477,17 @@ 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
@@ -503,8 +626,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 ""

@@ -602,71 +725,60 @@ msgstr ""
 msgid "&Remove CA"
 msgstr ""

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -757,41 +869,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

-#: master/lib/TTLS_UI/src/Module.cpp:499
+#: master/lib/TTLS_UI/src/Module.cpp:535
 #, c-format
 msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
@@ -842,95 +935,6 @@ 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,18 +1,20 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\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"
+"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"
 "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 1.8.11\n"
+"X-Generator: Poedit 2.0.8\n"
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/lib/EAPBase_UI\n"
@@ -38,6 +40,125 @@ 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
@@ -74,16 +195,6 @@ 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
@@ -364,6 +475,17 @@ 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
@@ -502,8 +624,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 ""

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

-#: 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
+#: 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
 msgid "Removes selected certificate authorities from the list"
 msgstr ""

-#: 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
+#: 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
 msgid "Acceptable server &names:"
 msgstr ""

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

-#: 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
+#: 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
 msgid "User Certificate"
 msgstr ""

-#: 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
+#: 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
 msgid "Please select your &certificate to use for authentication."
 msgstr ""

-#: 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
+#: 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
 msgid "Client certificate to use for authentication"
 msgstr ""

-#: 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
+#: 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
 msgid "Custom &identity:"
 msgstr ""

-#: 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
+#: 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
 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"
@@ -756,41 +867,22 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""

-#: 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
+#: master/lib/TTLS_UI/src/Module.cpp:394 ver1.1/lib/TTLS_UI/src/Module.cpp:356
 #, c-format
 msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""

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

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

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

-#: ver1.0/lib/EAPBase_UI/src/EAP_UI.cpp:128
-#: master/lib/EAPBase_UI/include/EAP_UI.h:363
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:119
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:367
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:377
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.h:119
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:362
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:119
-msgid "EAP Credentials"
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:285
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:302
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:284
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:285
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:302
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:284
-msgid "Warning"
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:633
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:576
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:632
-msgid "Provider Settings"
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:808
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:747
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:807
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:847
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:788
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:846
-#, c-format
-msgid "<error %u>"
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:851
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:792
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:850
-msgid "<error>"
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:862
-#: master/lib/EAPBase_UI/include/EAP_UI.h:871
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:803
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:812
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:861
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:870
-msgid "<blank ID>"
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:911
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:854
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:910
-msgid "&Remember"
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:912
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:855
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:911
-msgid "Check if you would like to save credentials"
-msgstr ""
-
-#: master/lib/EAPBase_UI/include/EAP_UI.h:1123
-#: ver1.0/lib/EAPBase_UI/include/EAP_UI.h:1000
-#: ver1.1/lib/EAPBase_UI/include/EAP_UI.h:1069
-msgid "<Your Organization>"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:69
-#: ver1.0/lib/EAPBase_UI/res/wxEAP_UI.h:69
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:69
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: master/lib/EAPBase_UI/res/wxEAP_UI.h:336
-#: ver1.1/lib/EAPBase_UI/res/wxEAP_UI.h:314
-msgid "EAP Identity Provider"
-msgstr ""
-
 #: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
--- a/EAPMethods/src/Main_UI.cpp
+++ b/EAPMethods/src/Main_UI.cpp
@@ -51,6 +51,11 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
 #endif
        g_peer.m_instance = hinstDLL;

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

    This file is part of GÉANTLink.
@@ -168,11 +168,11 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
    m_rec_idx(wxETWEVENT_RECORDS_MAX),
    wxListCtrl(parent, id, pos, size, style, validator, name)
 {
-    this->AppendColumn(_("Time"  ), wxLIST_FORMAT_LEFT, 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);
+    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));

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

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

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

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


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

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

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

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

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

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

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

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

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

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

    ///
    /// Destructor
--- a/EventMonitor/MSIBuild/Makefile
+++ b/EventMonitor/MSIBuild/Makefile
--- a/EventMonitor/locale/bg_BG.po
+++ b/EventMonitor/locale/bg_BG.po
@@ -1,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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,10 +1,13 @@
+# Translators:
+# Eric Hoch <eric.hoch@hhu.de>, 2016
+# eduroam_devel <stefan.winter@restena.lu>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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/EventMonitor/locale/el_GR.po
+++ b/EventMonitor/locale/el_GR.po
@@ -1,11 +1,14 @@
+# Translators:
+# Zenon Mousmoulas <zenon@mousmoulas.gr>, 2016
+# Vicky Kons <vickyk@admin.grnet.gr>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Zenon Mousmoulas <zenon@mousmoulas.gr>, 2016\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/EventMonitor/locale/es_ES.po
+++ b/EventMonitor/locale/es_ES.po
@@ -1,11 +1,13 @@
+# 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-06-02 12:27+0200\n"
-"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"Last-Translator: José Manuel Macías, 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
@@ -0,0 +1,348 @@
+# Translators:
+# Indrek Rokk <indrek.rokk@eenet.ee>, 2018
+# Anne M <anne@eenet.ee>, 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: 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/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 seansi: sündmuse jälitusseansi alustamiseks on Sul"
+" vaja administraatoriõigusi (käivita administraatorina, inglise keeles Run "
+"As Administrator) või kuulumist soorituste logi (Performance Log) kasutajate"
+" gruppi"
+
+#: 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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,11 +1,14 @@
+# 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-06-02 12:27+0200\n"
-"Last-Translator: Nunzio Napolitano <nunzio.napolitano@uniparthenope.it>, 2017\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"Last-Translator: Daniele Albrizio <daniele@albrizio.it>, 2018\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/eduroam_devel/teams/11799/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +45,7 @@ msgstr "Monitor delgi eventi"
 #: ver1.1/EventMonitor/ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
-msgstr ""
+msgstr "Errore durante l'apertura dell'event trace (errore %u)."

 #: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
 #: ver1.1/EventMonitor/ETWLog.cpp:171
@@ -76,18 +79,22 @@ 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 ""
+msgstr "La sessione evento %s esiste già."

 #: 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 ""
+msgstr "Errore durante la creazione di una sessione evento (errore %u)."

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

 #: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
 #: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
@@ -108,12 +115,12 @@ msgstr ""
 #: ver1.1/EventMonitor/Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
-msgstr ""
+msgstr "Attiva/disattiva la visualizzazione di %s record"

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

 #: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
 #: ver1.1/EventMonitor/Frame.cpp:65
@@ -134,30 +141,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 ""
+msgstr "Copia i record selezionati negli appunti"

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

 #: 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 ""
+msgstr "Copia tutti i record negli appunti (inclusi quelli nascosti)"

 #: 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 ""
+msgstr "Cancella"

 #: 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 ""
+msgstr "Cancella tutti i record dal registro"

 #: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
 #: ver1.1/EventMonitor/Frame.cpp:90
@@ -167,96 +174,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 ""
+msgstr "Seleziona tutti i record visibili"

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

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

 #: 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 ""
+msgstr "&Modifica"

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

 #: 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 ""
+msgstr "Scorre automaticamente verso i record più recenti mentre arrivano"

 #: 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 ""
+msgstr "Verboso"

 #: 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 ""
+msgstr "Mostra tutti i livelli dei record"

 #: 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 ""
+msgstr "Informativo"

 #: 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 ""
+msgstr "Visualizza tutti i record fino al livello informativo"

 #: 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 ""
+msgstr "Avvertenza"

 #: 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 ""
+msgstr "Visualizza tutti i record fino al livello di avvertenza"

 #: 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 ""
+msgstr "Errore"

 #: 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 ""
+msgstr "Visualizza solo i record a livello di errore"

 #: 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 ""
+msgstr "barra strumenti %s"

 #: 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 ""
+msgstr "Attiva/disattiva la visualizzazione della barra degli strumenti %s"

 #: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
 #: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
@@ -264,38 +271,38 @@ msgstr ""
 #: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
 #: ver1.1/EventMonitor/Frame.cpp:185
 msgid "View"
-msgstr ""
+msgstr "Vista"

 #: 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 ""
+msgstr "&Vista"

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

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

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

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

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

 #: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
@@ -322,7 +329,7 @@ msgstr ""
 #: 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 ""
+msgstr "Visualizzazione degli eventi interni in tempo reale "

 #: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
@@ -337,4 +344,4 @@ msgstr ""
 #: 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 ""
+msgstr "EVENTM~1|GÉANTLink Event Monitor"
--- a/EventMonitor/locale/ko_KR.po
+++ b/EventMonitor/locale/ko_KR.po
@@ -1,227 +1,339 @@
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\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"
+"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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=1; plural=0;\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"
+"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"

-#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
+#: 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 ""

-#: ETWLog.cpp:83
+#: 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 ""

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

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

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

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

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

-#: ETWLog.cpp:228
+#: 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 ""

-#: ETWLog.cpp:231
+#: 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 ""

-#: ETWLog.cpp:235
+#: 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 ""

-#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
+#: 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 ""

-#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
+#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
+#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
+#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
+#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
+#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
+#: 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 ""

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: Frame.cpp:101 Frame.cpp:164
+#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
+#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
+#: 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 ""

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: Frame.cpp:189
+#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
+#: ver1.1/EventMonitor/Frame.cpp:189
 msgid "Trace Log"
 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"
-
-#: 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
+#: 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 ""
+
+#: 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 ""
--- a/EventMonitor/locale/lt_LT.po
+++ b/EventMonitor/locale/lt_LT.po
@@ -1,17 +1,19 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\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 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,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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,11 +1,13 @@
+# 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-06-02 12:27+0200\n"
-"Last-Translator: Pedro Simões <psimoes@fccn.pt>, 2016\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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"
 "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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 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,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-08-27 11:21+0000\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, 5 );
+	bSizerMain->Add( m_log, 1, wxEXPAND, FromDIP(5) );
 	
 	
 	this->SetSizer( bSizerMain );
--- a/GEANTLink.sln
+++ b/GEANTLink.sln
@@ -0,0 +1,352 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2016
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14D5FE5B-9742-4D1F-A1E0-32E694B94AAB}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+		include\Version.h = include\Version.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EAP Methods", "EAP Methods", "{60BAAC3D-DC98-4C19-BC40-1A86963DE86C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\EAPTTLS\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\EAPTTLSUI\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase_UI", "lib\EAPBase_UI\build\EAPBase_UI.vcxproj", "{D4B54856-BE1F-4937-A8F7-495125BE76BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP", "lib\PAP\build\PAP.vcxproj", "{36B0CF8A-7794-46C3-8099-825BA962B4C7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS", "lib\TLS\build\TLS.vcxproj", "{4D40CB8A-812E-4F12-B23A-31AF743878E8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS", "lib\TTLS\build\TTLS.vcxproj", "{EE0EF0D9-A475-4038-8637-5754724F65B0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PAP_UI", "lib\PAP_UI\build\PAP_UI.vcxproj", "{3D309C2E-64AB-4BC4-A16D-468571A2BC1A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLS_UI", "lib\TLS_UI\build\TLS_UI.vcxproj", "{9A25C261-8ADE-4938-8393-E857EF0E37E9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTLS_UI", "lib\TTLS_UI\build\TTLS_UI.vcxproj", "{42F0F0F4-C928-4860-A4E4-94991C2C3D90}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsiUseFeature", "MsiUseFeature\MsiUseFeature.vcxproj", "{679D03C5-CD70-4FFA-93F8-A4AB3637509B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventMonitor", "EventMonitor\EventMonitor.vcxproj", "{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2", "lib\MSCHAPv2\build\MSCHAPv2.vcxproj", "{86A6D6A0-4B7D-4134-BE81-A5755C77584D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2_UI", "lib\MSCHAPv2_UI\build\MSCHAPv2_UI.vcxproj", "{7AF5B922-7C17-428A-97E0-09E3B41A684D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost", "lib\EapHost\build\EapHost.vcxproj", "{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost_UI", "lib\EapHost_UI\build\EapHost_UI.vcxproj", "{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}"
+EndProject
+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
+	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}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7A3D177B-1258-49A3-893B-79C928DB6A25}
+	EndGlobalSection
+EndGlobal
--- a/MSI/Base/Main/Makefile
+++ b/MSI/Base/Main/Makefile
--- a/MSI/Base/locale/bg_BG.po
+++ b/MSI/Base/locale/bg_BG.po
@@ -1,10 +1,13 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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,10 +1,13 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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,17 +1,19 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 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,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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,10 +1,13 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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,10 +1,13 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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,11 +1,14 @@
+# 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-06-02 12:27+0200\n"
-"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\n"
+"Last-Translator: José Manuel Macías, 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
@@ -0,0 +1,81 @@
+# 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,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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/MSI/Base/locale/fr_CA.po
+++ b/MSI/Base/locale/fr_CA.po
@@ -1,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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"
--- a/MSI/Base/locale/fr_FR.po
+++ b/MSI/Base/locale/fr_FR.po
@@ -1,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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"
--- a/MSI/Base/locale/gl_ES.po
+++ b/MSI/Base/locale/gl_ES.po
@@ -1,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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"
--- a/MSI/Base/locale/hr_HR.po
+++ b/MSI/Base/locale/hr_HR.po
@@ -1,10 +1,13 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2016
+# Dubravko Penezic <dpenezic@gmail.com>, 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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/MSI/Base/locale/hu_HU.po
+++ b/MSI/Base/locale/hu_HU.po
@@ -1,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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"
--- a/MSI/Base/locale/is_IS.po
+++ b/MSI/Base/locale/is_IS.po
@@ -1,10 +1,12 @@
+# 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-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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"
--- a/MSI/Base/locale/it_IT.po
+++ b/MSI/Base/locale/it_IT.po
@@ -1,10 +1,13 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2016
+# Nunzio Napolitano <nunzio.napolitano@uniparthenope.it>, 2017
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\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"
--- a/MSI/Base/locale/ko_KR.po
+++ b/MSI/Base/locale/ko_KR.po
@@ -1,35 +1,80 @@
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2016
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2016-09-12 12:16+0200\n"
-"PO-Revision-Date: 2016-09-12 12:17+0200\n"
-"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
+"POT-Creation-Date: 2017-02-02 18:14+0100\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
+"Language-Team: Korean (Korea) (https://www.transifex.com/eduroam_devel/teams/11799/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
-"X-Poedit-Basepath: ../Main\n"
-"Plural-Forms: nplurals=1; plural=0;\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"
+"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/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"

-#: En.Win32.Release.LaunchCondition-2.idtx:4
-#: En.x64.Release.LaunchCondition-2.idtx:4
+#: master/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
+#: master/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
+#: master/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
+#: master/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
+#: 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 ""

-#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3
-msgid "1252"
-msgstr "949"
-
-#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5
-#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5
+#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
+#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
+#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
+#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
+#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
+#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
+#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
+#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
+#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
+#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
+#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
+#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
+#: 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/"

-#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6
+#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
+#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
+#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
+#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
+#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
+#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
+#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
+#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
+#: 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Rozman	d2bf903a49	Update README.md	2018-12-06 08:35:58 +01:00
Simon Rozman	951c765dc1	Force SHA-256 digest for timestamp signatures Comodo timestamp server defaults to SHA-1. To make sure timestamp signatures are SHA-256, add appropriate signtool.exe flag.	2018-11-06 19:56:20 +01:00
Simon Rozman	a419991d9c	Update translations and add Estonian translation	2018-11-06 19:56:20 +01:00
Simon Rozman	6136d3d1e9	Silence the missing shcore.dll warning on Windows 7	2018-11-06 19:56:20 +01:00
Simon Rozman	727ef20a8a	Preset version to 1.1h	2018-11-06 19:55:19 +01:00
Simon Rozman	8ba410eb0b	Update sub-modules	2018-09-30 16:53:22 +02:00
Simon Rozman	f9602b703e	Make GUI DPI-aware	2018-09-17 11:45:50 +02:00
Simon Rozman	f981dfb16b	Clean-up	2018-09-08 01:12:26 +02:00
Simon Rozman	a530618f7f	Run MSBuild tasks in parallel	2018-09-07 12:55:28 +02:00
Simon Rozman	ba9c6d3419	Pre-set version to 1.1g	2018-09-07 12:41:23 +02:00
Simon Rozman	00bf771b5e	Set version to 1.1f	2018-09-07 12:30:45 +02:00
Simon Rozman	56d545baba	Add support for ARM64 platform	2018-09-07 12:29:25 +02:00
Simon Rozman	f637189b90	Fix mess from `59c5fc9d64`	2018-09-05 14:12:29 +02:00
Simon Rozman	75c226a1ef	Switch to Visual Studio 2017	2018-09-05 14:05:09 +02:00
Simon Rozman	96270389cf	Stop using internal unique_ptr::_Myptr member	2018-09-05 13:59:09 +02:00
Simon Rozman	b4de1dd233	Register en_US language in nmake register When "Language" setting is absent in registry, the initialization of wxWidget localization raises asserts.	2018-09-05 12:50:28 +02:00
Simon Rozman	192e1b278c	Add explicit constructors/operators to sanitizing_blob_(z)f Otherwise the compiler might generate default ones - and delete them too.	2018-09-04 15:49:48 +02:00
Simon Rozman	9f13059d66	Review implicit narrowing conversions	2018-09-04 15:46:46 +02:00
Simon Rozman	59c5fc9d64	Distinguish or merge variables with same names ...to resolve C4457 warnings.	2018-09-04 15:25:13 +02:00
Simon Rozman	1f61096c3d	Force disable incremental linking Incremental linking and reference optimization are mutually exclusive. While VC2010 defaulted to non-incremental linking, this conflict was not apparent.	2018-09-04 13:45:01 +02:00
Simon Rozman	5fbfc3dcc8	Fix incorrect template parameter tolerated by VC2010	2018-09-04 12:26:20 +02:00
Simon Rozman	ee012e30c5	Remove MFC dependency	2018-09-04 12:12:48 +02:00
Simon Rozman	1d0410af59	VS10Solution.sln => GEANTLink.sln	2018-09-04 11:37:19 +02:00
Simon Rozman	b5dd5080f5	Update MSIBuild sub-module	2018-09-04 11:29:51 +02:00
Simon Rozman	dd805e7199	Upgrade to wxWidgets 3.1.1 and wxFormBuilder 3.8.1	2018-09-03 13:55:51 +02:00
Simon Rozman	3220e36206	Switch to SHA-256 signing of final MSI files This breaks support for Windows Vista.	2018-07-04 11:15:43 +02:00
Simon Rozman	4767fb9a13	Import translations from Transifex	2018-07-04 10:25:13 +02:00
Simon Rozman	4bfae4a27d	Update sub-module	2018-07-04 10:25:05 +02:00
Simon Rozman	c42b080c31	Update translation template	2018-06-20 15:33:24 +02:00
Simon Rozman	bc7893804e	Stop using <> parentheses to avoid XML/HTML markup Transifex treats strings enclosed in <> as HTML.	2018-06-20 14:53:47 +02:00
Simon Rozman	4597e6c78f	.gitignore output WLANManager.exe properly	2018-06-20 14:40:22 +02:00
Simon Rozman	6eb15355e9	Switch to SHA-256 signing	2018-06-20 14:39:05 +02:00
Simon Rozman	20a9222057	Preset version to 1.1e	2018-06-20 14:38:49 +02:00
Simon Rozman	36d4ff8757	Enable Italian GUI	2018-06-20 14:37:23 +02:00
Simon Rozman	a59147ca1c	Update translations	2018-06-20 14:36:52 +02:00
Simon Rozman	5d6bd7aa52	Auto-detect devenv.com path	2018-06-20 14:36:22 +02:00