Set version to 1.2d

Otherwise the compiler might generate default ones - and delete them
too.

.gitignore

@@ -1,5 +1,2 @@
-/*.opensdf
-/*.suo
-/*.sdf
+/.vs
 /doc
-/ipch

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>

Doxyfile

@@ -794,6 +794,7 @@ EXCLUDE                = \
 	EventMonitor\res \
 	lib\EAPBase_UI\res \
 	lib\EapHost_UI\res \
+	lib\GTC_UI\res \
 	lib\TLS_UI\res \
 	lib\TTLS_UI\res \
 	lib\WinStd \

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>
@@ -97,9 +141,15 @@
     <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
       <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj">
+      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\GTC\build\GTC.vcxproj">
+      <Project>{114a70bb-8698-4a0c-8c90-58f22edd8129}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
       <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
     </ProjectReference>
@@ -112,7 +162,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>

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>
@@ -100,9 +144,21 @@
     <ProjectReference Include="..\..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj">
       <Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj">
+      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\EapHost_UI\build\EapHost_UI.vcxproj">
+      <Project>{13d2d8b5-f6aa-459d-b5f7-29b95dd9d583}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\GTC\build\GTC.vcxproj">
+      <Project>{114a70bb-8698-4a0c-8c90-58f22edd8129}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\GTC_UI\build\GTC_UI.vcxproj">
+      <Project>{34680813-3a52-46fb-b5a8-1e4bbf770855}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
       <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
     </ProjectReference>
@@ -127,10 +183,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>

EAPMethods/locale/bg_BG.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +198,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 +509,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 +668,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 +773,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 +793,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 +832,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 +922,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 +988,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

EAPMethods/locale/ca_ES.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: eduki <ecercos@xtec.cat>, 2016\n"
 "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +196,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 +499,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 +657,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 +761,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 +780,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 +819,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 +910,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 +977,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

EAPMethods/locale/cs_CZ.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Petr Adamec <p.b.adamec@gmail.com>, 2017\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/eduroam_devel/teams/11799/cs_CZ/)\n"
@@ -11,8 +11,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/cy_UK.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Welsh (https://www.transifex.com/eduroam_devel/teams/11799/cy/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/de_DE.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +197,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 +502,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 +661,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 +766,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 +785,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 +825,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 +919,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 +987,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

EAPMethods/locale/el_GR.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Vicky Kons <vickyk@admin.grnet.gr>, 2017\n"
 "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +197,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 +503,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 +665,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 +770,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 +790,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 +832,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 +925,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 +992,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

EAPMethods/locale/es_ES.po

@@ -3,16 +3,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Alberto Martínez <alberto_martinez@deusto.es>, 2017\n"
+"Last-Translator: Alberto Martínez Setién, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +196,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 +503,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 +663,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 +769,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 +788,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 +827,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 +919,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 +987,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

EAPMethods/locale/eu_ES.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Basque (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/eu_ES/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/fi_FI.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/eduroam_devel/teams/11799/fi_FI/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/fr_CA.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: French (Canada) (https://www.transifex.com/eduroam_devel/teams/11799/fr_CA/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/fr_FR.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: French (France) (https://www.transifex.com/eduroam_devel/teams/11799/fr_FR/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr_FR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/gl_ES.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Galician (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/gl_ES/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/hr_HR.po

@@ -3,16 +3,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\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"
 "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 +38,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 +197,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 +217,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 +227,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 +273,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 +282,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 +335,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 +493,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 +602,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 +722,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 +750,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 +769,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 +808,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 +889,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 +903,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 +960,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 +969,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

EAPMethods/locale/hu_HU.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/eduroam_devel/teams/11799/hu/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/is_IS.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Icelandic (https://www.transifex.com/eduroam_devel/teams/11799/is/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/ko_KR.po

@@ -439,7 +439,7 @@ msgid "Use my true user name"
 msgstr ""
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
-msgid "Use &empty outer identity (RFC 4822)"
+msgid "Use &empty outer identity"
 msgstr ""
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
@@ -510,23 +510,23 @@ msgstr ""
 
 #: lib/EAPBase_UI/include/EAP_UI.h:739
 #, c-format
-msgid "<error %u>"
+msgid "(error %u)"
 msgstr ""
 
 #: lib/EAPBase_UI/include/EAP_UI.h:743
-msgid "<error>"
+msgid "(error)"
 msgstr ""
 
 #: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764
-msgid "<empty>"
+msgid "(empty)"
 msgstr ""
 
 #: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764
-msgid "<blank ID>"
+msgid "(blank ID)"
 msgstr ""
 
 #: lib/EAPBase_UI/include/EAP_UI.h:964
-msgid "<Your Organization>"
+msgid "(Your Organization)"
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.h:69

EAPMethods/locale/lt_LT.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Lithuanian (https://www.transifex.com/eduroam_devel/teams/11799/lt/)\n"
@@ -11,8 +11,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=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 +38,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 +194,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 +490,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 +649,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 +751,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 +770,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 +809,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 +901,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 +967,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

EAPMethods/locale/nb_NO.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Tom Ivar Myren <tom.myren@uninett.no>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +196,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 +493,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 +651,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 +754,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 +773,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 +812,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 +903,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 +969,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

EAPMethods/locale/nl_NL.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/eduroam_devel/teams/11799/nl/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/pl_PL.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Polish (Poland) (https://www.transifex.com/eduroam_devel/teams/11799/pl_PL/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_PL\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-"X-Generator: Poedit 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 +38,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 +194,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 +497,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 +658,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 +761,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 +780,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 +821,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 +913,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 +980,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

EAPMethods/locale/pt_PT.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Pedro Simões <psimoes@fccn.pt>, 2017\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/ru_RU.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Russian (Russia) (https://www.transifex.com/eduroam_devel/teams/11799/ru_RU/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/sk_SK.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Slovak (Slovakia) (https://www.transifex.com/eduroam_devel/teams/11799/sk_SK/)\n"
@@ -11,8 +11,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/sl_SI.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl_SI\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 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 +38,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 +196,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 +495,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 +650,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 +753,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 +772,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 +811,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 +901,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 +967,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

EAPMethods/locale/sr_RS.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Marko Eremija <marko.eremija@amres.ac.rs>, 2017\n"
 "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 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 +38,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 +196,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 +500,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 +660,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 +763,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 +783,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 +823,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 +914,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 +988,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

EAPMethods/locale/sv_SE.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/eduroam_devel/teams/11799/sv/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

EAPMethods/locale/tr_TR.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Gokhan Eryol <gokhaneryol@gmail.com>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/eduroam_devel/teams/11799/tr/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +474,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 +623,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 +722,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 +866,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 +932,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

EAPMethods/locale/vi_VN.po

@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2017-02-09 13:15+0100\n"
+"POT-Creation-Date: 2018-06-20 15:30+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Vietnamese (https://www.transifex.com/eduroam_devel/teams/11799/vi/)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 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 +38,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 +193,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 +473,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 +622,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 +721,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 +865,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 +931,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

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.
@@ -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)");
             }
         }
     }

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>

EventMonitor/locale/EventMonitor.pot

@@ -2,217 +2,335 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"POT-Creation-Date: 2017-02-02 18:14+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
-"X-Poedit-Basepath: ..\n"
+"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-Basepath: ../../..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: en_US\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPath-0: master/EventMonitor\n"
+"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
+"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
 
-#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.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_US.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
+#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Real-time display of internal events"
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
+#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
+#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: 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 ""

EventMonitor/locale/cs_CZ.po

@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=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"

EventMonitor/locale/es_ES.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\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"

EventMonitor/locale/it_IT.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Nunzio Napolitano <nunzio.napolitano@uniparthenope.it>, 2017\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 +42,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 +76,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 +100,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 +112,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 +138,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 +171,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 +268,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 +326,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 +341,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"

EventMonitor/locale/lt_LT.po

@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=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"

EventMonitor/locale/sk_SK.po

@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=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"

GEANTLink.sln

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

MSI/Base/locale/MSIBase.pot

@@ -2,31 +2,76 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2016-09-19 11:20+0200\n"
+"POT-Creation-Date: 2017-02-02 18:14+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
-"X-Poedit-Basepath: ../Main\n"
+"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-Basepath: ../../../..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: en_US\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPath-0: master/MSI/Base/Main\n"
+"X-Poedit-SearchPath-1: ver1.1/MSI/Base/Main\n"
+"X-Poedit-SearchPath-2: ver1.0/MSI/Base/Main\n"
 
-#: en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: en_US.x64.Release.LaunchCondition-2.idtx:4
+#: master/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
+#: master/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
+#: master/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
+#: master/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
+#: ver1.0/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
+#: 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_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5
-#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5
+#: 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 ""
 
-#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
+#: master/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
+#: master/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
+#: master/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
+#: master/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
+#: ver1.0/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
+#: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
+#: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
+#: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
+#: 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 ""

MSI/Base/locale/cs_CZ.po

@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=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"

MSI/Base/locale/es_ES.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2017-02-02 18:14+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\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"

MSI/Base/locale/lt_LT.po

@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=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"

MSI/Base/locale/sk_SK.po

@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=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"

MsiUseFeature/MsiUseFeature.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>{679D03C5-CD70-4FFA-93F8-A4AB3637509B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>MsiUseFeature</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
     <Import Project="MsiUseFeature.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\x64.props" />
-    <Import Project="..\include\Debug.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="MsiUseFeature.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
     <Import Project="MsiUseFeature.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Release.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
     <Import Project="MsiUseFeature.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\x64.props" />
-    <Import Project="..\include\Release.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="MsiUseFeature.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
     <Import Project="MsiUseFeature.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemGroup>
     <ClInclude Include="StdAfx.h" />
   </ItemGroup>
@@ -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>
@@ -101,7 +147,7 @@
     <ResourceCompile Include="MsiUseFeature.rc" />
   </ItemGroup>
   <ItemGroup>
-    <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>

README.md

@@ -10,6 +10,9 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X clients for enterpr
 - EAP-TTLS with the following inner methods:
     - PAP
     - MSCHAPv2
+    - EAP-MSCHAPv2
+    - EAP-GTC: Challenge/Response and Password authentication modes
+    - System-installed EAP method chaining (experimental)
 
 ### Security
 - Microsoft Windows Credential Manager stored user credentials
@@ -18,6 +21,7 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X clients for enterpr
 - TLS:
    - Separate trusted root CA list
    - Configurable list of accepted server names
+   - Post-authentication CRL check
 
 ### Diagnostics
 - Reporting to Event Log channels: Operational and Analytic verbosity
@@ -28,14 +32,17 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X clients for enterpr
 - Lockable network profile configuration
 
 ### Deployment
-- Released as multi-lingual 32 and 64-bit MSI packages; Group Policy deployment supported
-- [MsiUseFeature utility](https://github.com/Amebis/GEANTLink/tree/ver1.0/MsiUseFeature) for GÉANTLink install state testing (for embedding GÉANTLink into other setup packages)
-- [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/ver1.0/CredWrite) for automated user credential import to Credential Manager
-- [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/ver1.0/WLANManager) to allow network profile configuration dialog shortcuts
+- Released as multi-lingual x86, x64, and ARM64 MSI packages; Group Policy deployment supported
+- [MsiUseFeature utility](https://github.com/Amebis/GEANTLink/tree/master/MsiUseFeature) for GÉANTLink install state testing (for embedding GÉANTLink into other setup packages)
+- [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/master/CredWrite) for automated user credential import to Credential Manager
+- [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/master/WLANManager) to allow network profile configuration dialog shortcuts
 
 ### Supported operating systems
 - Windows Vista, Windows Server 2008
 - Windows 7, Windows Server 2008 R2
+- Windows 8 Desktop, Windows Server 2012
+- Windows 8.1 Desktop, Windows Server 2012 R2
+- Windows 10 Desktop, Windows Server 2016
 
 ## Download
 Binaries are available for download [here](https://github.com/Amebis/GEANTLink/releases).
@@ -44,29 +51,36 @@ Binaries are available for download [here](https://github.com/Amebis/GEANTLink/r
 
 ### Building Environment Requirements
 - Microsoft Windows Vista or later
-- Microsoft Visual Studio 2010 SP1
+- Microsoft Visual Studio 2017
 - _msgfmt.exe_ from [gettext](https://www.gnu.org/software/gettext/);
   Hint: [Poedit](https://poedit.net/) contains up-to-date binary Win32 compiled gettext-utilities. Install it and add `GettextTools\bin` folder to the system path.
 - _sed.exe_ and _grep.exe_
 - _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's `Bin` folder to the system path.
 
 ### wxWidgets
-GÉANTLink is using wxWidgets v3.0.2 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets).
+GÉANTLink is using wxWidgets static libraries. Since upstream wxWidgets libraries don't support ARM64 yet, a clone with ARM64 support was prepared at [GitHub](https://github.com/Amebis/wxWidgets.git).
 
-#### Compiling wxWidgets Win32 static libraries
-1. Start _Visual Studio Command Prompt (2010)_
+#### Compiling wxWidgets x86 static libraries
+1. Start _x86 Native Tools Command Prompt for VS 2017_
 2. Change working folder to `build\msw`
-3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0`
-4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 BUILD=release`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 BUILD=release`
 
 #### Compiling wxWidgets x64 static libraries
-1. Start _Visual Studio x64 Cross Tools Command Prompt (2010)_
+1. Start _x64 Native Tools Command Prompt for VS 2017_
 2. Change working folder to `build\msw`
-3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64`
-4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64 BUILD=release`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64 BUILD=release`
+
+#### Compiling wxWidgets ARM64 static libraries
+1. Start command prompt
+2. Change working folder to `build\msw`
+3. Run: `"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=ARM64 USE_OPENGL=0`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=ARM64 USE_OPENGL=0 BUILD=release`
 
 #### Specifying wxWidgets path
-GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets\3.0.2`).
+GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets`).
 
 ### Digital Signing of Build Outputs
 In order to have the build process digitally sign output files, one should provide the following:
@@ -74,7 +88,7 @@ In order to have the build process digitally sign output files, one should provi
 1. A signing certificate installed in the current user’s certificate store.
 2. The following variables in the environment:
   - `ManifestCertificateThumbprint` - set the value to certificate’s SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
-  - `ManifestTimestampUrl` - set the value to URL used to perform timestamp signature (i.e. `http://timestamp.verisign.com/scripts/timstamp.dll`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
+  - `ManifestTimestampRFC3161Url` - set the value to URL used to perform RFC3161 timestamp signature (i.e. `http://sha256timestamp.ws.symantec.com/sha256/timestamp`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
 
 Please note that only Release builds are configured for timestamp signing. Debug configurations do not attempt to timestamp sign the resulting DLL and EXE files in order to speed up the building process and enable offline building.
 
@@ -86,7 +100,7 @@ GÉANTLink has some submodules. When cloning Git repository, make sure to use `-
 
 After clone is complete, grant _Users_ local group read and execute permissions to `output` subfolder (when working folder is private). This allows _EapHost_ service to load GÉANTLink's DLL, and Event Viewer to display GÉANTLink events.
 
-GÉANTLink can be build and debugged opening _VS10Solution.sln_ in Visual C++ 2010 IDE.
+GÉANTLink can be build and debugged opening _GEANTLink.sln_ in Visual C++ IDE.
 
 Before one can attempt to debug EAP DLLs, you should run `nmake register` from an elevated command prompt. See _Building in command line_ chapter below.
 
@@ -95,7 +109,7 @@ Next, one must configure a network profile actually using GÉANTLink for the aut
 GÉANTLink EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLSUI.dll_).
 
 ##### Backend DLL
-The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _VS10Solution.sln_, and attach to the running _Eap3Host.exe_ process.
+The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _GEANTLink.sln_, and attach to the running _Eap3Host.exe_ process.
 
 On initial connection attempt _Eap3Host.exe_ will load the DLL and will not release it until _EapHost_ service is restarted. To release our DLL (i.e. for rebuild) you have to restart _EapHost_ service manually or run `nmake register` again.
 
@@ -109,7 +123,7 @@ A few seconds after desired function call has finished, _DllHost.exe_ terminates
 To debug early life of our GUI DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to attach the debugger to _DllHost.exe_ process before our DLL starts.
 
 #### Building in command line
-Use of standard command prompt is recommended, providing that Microsoft Visual Studio 2010 folders containing _nmake.exe_ and _devenv.com_ are added to the system path.
+Open _x64 Native Tools Command Prompt for VS 2017_ for building.
 
 Use Microsoft NMAKE to build the project.
 

VS10Solution.sln

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

WLANManager/README.md

@@ -1,12 +1,13 @@
-#WLANManager
+# WLANManager
 Invokes standard Windows Wireless Network Properties dialog
 
-##Usage
+## Usage
 ```
-WLANManager profile <name> [interface <name>]
+WLANManager profile <profile name> [interface <interface name>]
 ```
 
-- `name` - The name of the network profile (not neccessarely the same as SSID)
+- `profile name`   - The name of the network profile (not neccessarely the same as SSID)
+- `interface name` - The name of the specific network interface to search the profile at
 
 Return codes:
 - -1 = Invalid parameters

WLANManager/WLANManager.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>{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>WLANManager</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
     <Import Project="WLANManager.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\x64.props" />
-    <Import Project="..\include\Debug.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="WLANManager.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
     <Import Project="WLANManager.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Release.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
     <Import Project="WLANManager.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\x64.props" />
-    <Import Project="..\include\Release.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="WLANManager.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
     <Import Project="WLANManager.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemGroup>
     <ClInclude Include="StdAfx.h" />
   </ItemGroup>
@@ -91,14 +135,16 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="WLANManager.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd-15.0.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
   </ItemGroup>

WLANManager/locale/WLANManager.pot

@@ -2,20 +2,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: WLANManager\n"
-"POT-Creation-Date: 2016-09-19 11:22+0200\n"
+"POT-Creation-Date: 2016-11-08 11:51+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
-"X-Poedit-Basepath: ..\n"
+"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-Basepath: ../../..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: en_US\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPath-0: master/WLANManager\n"
+"X-Poedit-SearchPath-1: ver1.1/WLANManager\n"
+"X-Poedit-SearchPath-2: ver1.0/WLANManager\n"
 
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4

WLANManager/locale/cs_CZ.po

@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=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"

WLANManager/locale/es_ES.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: WLANManager\n"
 "POT-Creation-Date: 2016-11-08 11:51+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\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"

WLANManager/locale/lt_LT.po

@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=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"

WLANManager/locale/sk_SK.po

@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=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"

include/ARM64.props

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2016-2018 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of GÉANTLink.
+
+    GÉANTLink is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    GÉANTLink is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Common.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_arm64_lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>wxNO_GL_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Lib>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+      <AdditionalDependencies>advapi32.lib;ole32.lib;oleaut32.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

include/Common.props

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

include/Debug.props

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016 Amebis
+    Copyright 2016-2018 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -26,7 +26,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <SmallerTypeCheck>true</SmallerTypeCheck>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
@@ -39,7 +38,7 @@
   <ItemGroup />
   <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
     <Message Text="Signing output file..." />
-    <SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />
+    <Exec Command="signtool.exe sign /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /q &quot;$(OutDir)$(TargetName)$(TargetExt)&quot;" />
     <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
 </Project>

include/Release.props

@@ -43,7 +43,7 @@
   <ItemGroup />
   <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
     <Message Text="Signing output file..." />
-    <SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />
+    <Exec Command="signtool.exe sign /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /tr &quot;%ManifestTimestampRFC3161Url%&quot; /q &quot;$(OutDir)$(TargetName)$(TargetExt)&quot;" />
     <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
 </Project>

include/Version.h

@@ -29,7 +29,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x01002000
+#define PRODUCT_VERSION          0x01020800
 
 //
 // Product version by components
@@ -38,27 +38,27 @@
 // separately.
 //
 #define PRODUCT_VERSION_MAJ      1
-#define PRODUCT_VERSION_MIN      0
-#define PRODUCT_VERSION_REV      32
+#define PRODUCT_VERSION_MIN      2
+#define PRODUCT_VERSION_REV      8
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "1.0e"
-#define PRODUCT_BUILD_YEAR_STR   "2017"
+#define PRODUCT_VERSION_STR      "1.2d"
+#define PRODUCT_BUILD_YEAR_STR   "2018"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "1.0.32"
+#define PRODUCT_VERSION_INST     "1.2.8"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{F1853107-8610-4A54-A6F8-3B1F308FB177}"
+#define PRODUCT_VERSION_GUID     "{78F6C2FF-9ABF-431F-92D2-10F4AA6D9406}"
 
 //
 // Product vendor

include/Win32.props

@@ -24,7 +24,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <LibraryPath>$(WXWIN)\lib\vc_lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Lib>

include/x64.props

@@ -24,7 +24,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <LibraryPath>$(WXWIN)\lib\vc_x64_lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_x64_lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Lib>

lib/.gitignore

@@ -1,4 +0,0 @@
-/EapHost
-/EapHost_UI
-/GTC
-/GTC_UI

lib/EAPBase/build/EAPBase.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>{AD6816A0-9600-4E01-8C49-39D03D1E791F}</ProjectGuid>
     <RootNamespace>EAPBase</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\Win32.props" />
-    <Import Project="..\..\..\include\Debug.props" />
+    <Import Project="..\..\..\include\$(Platform).props" />
+    <Import Project="..\..\..\include\$(Configuration).props" />
     <Import Project="EAPBase.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\x64.props" />
-    <Import Project="..\..\..\include\Debug.props" />
+    <Import Project="..\..\..\include\$(Platform).props" />
+    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="EAPBase.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\include\$(Platform).props" />
+    <Import Project="..\..\..\include\$(Configuration).props" />
     <Import Project="EAPBase.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\Win32.props" />
-    <Import Project="..\..\..\include\Release.props" />
+    <Import Project="..\..\..\include\$(Platform).props" />
+    <Import Project="..\..\..\include\$(Configuration).props" />
     <Import Project="EAPBase.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\x64.props" />
-    <Import Project="..\..\..\include\Release.props" />
+    <Import Project="..\..\..\include\$(Platform).props" />
+    <Import Project="..\..\..\include\$(Configuration).props" />
+    <Import Project="EAPBase.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\include\$(Platform).props" />
+    <Import Project="..\..\..\include\$(Configuration).props" />
     <Import Project="EAPBase.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemGroup>
     <ClInclude Include="..\include\Config.h" />
     <ClInclude Include="..\include\Credentials.h" />
@@ -85,6 +127,7 @@
     <ClInclude Include="..\include\EAPXML.h" />
     <ClInclude Include="..\include\Method.h" />
     <ClInclude Include="..\include\Module.h" />
+    <ClInclude Include="..\include\UIContext.h" />
     <ClInclude Include="..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
@@ -97,8 +140,11 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="..\src\UIContext.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Events\build\Events.vcxproj">

lib/EAPBase/build/EAPBase.vcxproj.filters

@@ -32,6 +32,9 @@
     <ClInclude Include="..\include\Credentials.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\UIContext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\StdAfx.cpp">
@@ -52,5 +55,8 @@
     <ClCompile Include="..\src\EAP.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\UIContext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

lib/EAPBase/include/Config.h

@@ -24,57 +24,13 @@
 
 namespace eap
 {
-    ///
-    /// Base class for configuration storage
-    ///
     class config;
-
-    ///
-    /// Base class for method configuration storage
-    ///
     class config_method;
-
-    ///
-    /// Base class for method with credentials
-    ///
     class config_method_with_cred;
-
-    ///
-    /// Provider configuration storage
-    ///
     class config_provider;
-
-    ///
-    /// Connection configuration storage
-    ///
     class config_connection;
 }
 
-///
-/// Packs a configuration
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[in]    val     Configuration to pack
-///
-inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config &val);
-
-///
-/// Returns packed size of a configuration
-///
-/// \param[in] val  Configuration to pack
-///
-/// \returns Size of data when packed (in bytes)
-///
-inline size_t pksizeof(const eap::config &val);
-
-///
-/// Unpacks a configuration
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[out]   val     Configuration to unpack to
-///
-inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config &val);
-
 #pragma once
 
 #include "Module.h"
@@ -96,7 +52,16 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config &val);
 
 namespace eap
 {
-    class config
+    ///
+    /// \defgroup EAPBaseConfig  Configuration
+    /// Configuration management
+    ///
+    /// @{
+
+    ///
+    /// Base class for packable and XML-exportable storage
+    ///
+    class config : public packable
     {
     public:
         ///
@@ -139,17 +104,17 @@ namespace eap
         config& operator=(_Inout_ config &&other);
 
         ///
-        /// Clones this configuration
+        /// Clones this object
         ///
-        /// \returns Pointer to cloned configuration
+        /// \returns Pointer to cloned object with identical data
         ///
         virtual config* clone() const = 0;
 
-        /// \name XML configuration management
+        /// \name XML management
         /// @{
 
         ///
-        /// Save to XML document
+        /// Save data to XML document
         ///
         /// \param[in]  pDoc         XML document
         /// \param[in]  pConfigRoot  Suggested root element for saving
@@ -165,40 +130,20 @@ namespace eap
 
         /// @}
 
-        /// \name BLOB management
-        /// @{
-
-        ///
-        /// Packs a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of a configuration
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
-        virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
-        virtual void operator>>(_Inout_ cursor_in &cursor);
-
-        /// @}
-
     public:
-        module &m_module;   ///< EAP module
+        module &m_module;                                   ///< EAP module
 
     protected:
-        static const winstd::bstr namespace_eapmetadata;
+        static const winstd::bstr namespace_eapmetadata;    ///< Reusable BSTR containing "urn:ietf:params:xml:ns:yang:ietf-eap-metadata"
     };
 
 
+    class credentials;
+
+
+    ///
+    /// Base class for method configuration storage
+    ///
     class config_method : public config
     {
     public:
@@ -262,50 +207,17 @@ namespace eap
         ///
         config_method& operator=(_Inout_ config_method &&other);
 
-        /// \name XML configuration management
+        /// \name XML management
         /// @{
-
-        ///
-        /// Save to XML document
-        ///
-        /// \param[in]  pDoc         XML document
-        /// \param[in]  pConfigRoot  Suggested root element for saving
-        ///
         virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-
-        ///
-        /// Load from XML document
-        ///
-        /// \param[in]  pConfigRoot  Root element for loading
-        ///
         virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-
         /// @}
 
         /// \name BLOB management
         /// @{
-
-        ///
-        /// Packs a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of a configuration
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
         virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator>>(_Inout_ cursor_in &cursor);
-
         /// @}
 
         ///
@@ -320,6 +232,11 @@ namespace eap
         ///
         virtual const wchar_t* get_method_str() const = 0;
 
+        ///
+        /// Creates a blank set of credentials suitable for this method
+        ///
+        virtual credentials* make_credentials() const = 0;
+
     public:
         const unsigned int m_level; ///< Config level (0=outer, 1=inner, 2=inner-inner...)
         bool m_allow_save;          ///< Are credentials allowed to be saved to Windows Credential Manager?
@@ -328,9 +245,9 @@ namespace eap
     };
 
 
-    class credentials;
-
-
+    ///
+    /// Base class for method with credentials
+    ///
     class config_method_with_cred : public config_method
     {
     public:
@@ -374,63 +291,28 @@ namespace eap
         ///
         config_method_with_cred& operator=(_Inout_ config_method_with_cred &&other);
 
-        /// \name XML configuration management
+        /// \name XML management
         /// @{
-
-        ///
-        /// Save to XML document
-        ///
-        /// \param[in]  pDoc         XML document
-        /// \param[in]  pConfigRoot  Suggested root element for saving
-        ///
         virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-
-        ///
-        /// Load from XML document
-        ///
-        /// \param[in]  pConfigRoot  Root element for loading
-        ///
         virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-
         /// @}
 
         /// \name BLOB management
         /// @{
-
-        ///
-        /// Packs a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of a configuration
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
         virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator>>(_Inout_ cursor_in &cursor);
-
         /// @}
 
-        ///
-        /// Creates a blank set of credentials suitable for this method
-        ///
-        virtual credentials* make_credentials() const = 0;
-
     public:
         bool m_use_cred;                        ///< Use configured credentials
         std::unique_ptr<credentials> m_cred;    ///< Configured credentials
     };
 
 
+    ///
+    /// Provider configuration storage
+    ///
     class config_provider : public config
     {
     public:
@@ -473,57 +355,19 @@ namespace eap
         ///
         config_provider& operator=(_Inout_ config_provider &&other);
 
-        ///
-        /// Clones configuration
-        ///
-        /// \returns Pointer to cloned configuration
-        ///
         virtual config* clone() const;
 
-        /// \name XML configuration management
+        /// \name XML management
         /// @{
-
-        ///
-        /// Save to XML document
-        ///
-        /// \param[in]  pDoc         XML document
-        /// \param[in]  pConfigRoot  Suggested root element for saving
-        ///
         virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-
-        ///
-        /// Load from XML document
-        ///
-        /// \param[in]  pConfigRoot  Root element for loading
-        ///
         virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-
         /// @}
 
         /// \name BLOB management
         /// @{
-
-        ///
-        /// Packs a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of a configuration
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
         virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator>>(_Inout_ cursor_in &cursor);
-
         /// @}
 
         ///
@@ -556,10 +400,16 @@ namespace eap
     };
 
 
+    ///
+    /// Connection configuration storage
+    ///
     class config_connection : public config
     {
     public:
-        typedef std::list<eap::config_provider> provider_list;
+        ///
+        /// List of configuration providers
+        ///
+        typedef std::list<config_provider> provider_list;
 
     public:
         ///
@@ -601,97 +451,67 @@ namespace eap
         ///
         config_connection& operator=(_Inout_ config_connection &&other);
 
-        ///
-        /// Clones configuration
-        ///
-        /// \returns Pointer to cloned configuration
-        ///
         virtual config* clone() const;
 
-        /// \name XML configuration management
+        /// \name XML management
         /// @{
-
-        ///
-        /// Save to XML document
-        ///
-        /// \param[in]  pDoc         XML document
-        /// \param[in]  pConfigRoot  Suggested root element for saving
-        ///
         virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-
-        ///
-        /// Load from XML document
-        ///
-        /// \param[in]  pConfigRoot  Root element for loading
-        ///
         virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-
         /// @}
 
         /// \name BLOB management
         /// @{
-
-        ///
-        /// Packs a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of a configuration
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
         virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator>>(_Inout_ cursor_in &cursor);
-
         /// @}
 
     public:
-        std::list<eap::config_provider> m_providers;    ///< Provider configurations
+        std::list<config_provider> m_providers;    ///< Provider configurations
     };
+
+    /// @}
 }
 
 
-inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config &val)
-{
-    val.operator<<(cursor);
-}
-
-
-inline size_t pksizeof(const eap::config &val)
-{
-    return val.get_pk_size();
-}
-
-
-inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config &val)
-{
-    val.operator>>(cursor);
-}
-
+/// \addtogroup EAPBaseStream
+/// @{
 
+///
+/// Packs a method status
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[in]    val     Method status to pack
+///
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config_method::status_t &val)
 {
     cursor << (unsigned char)val;
 }
 
 
+///
+/// Returns packed size of a method status
+///
+/// \param[in] val  Method status to pack
+///
+/// \returns Size of data when packed (in bytes)
+///
 inline size_t pksizeof(_In_ const eap::config_method::status_t &val)
 {
     return pksizeof((unsigned char)val);
 }
 
 
+///
+/// Unpacks a method status
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[out]   val     Method status to unpack to
+///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config_method::status_t &val)
 {
     val = (eap::config_method::status_t)0; // Reset higher bytes to zero before reading to lower byte.
     cursor >> (unsigned char&)val;
 }
+
+/// @}

lib/EAPBase/include/Credentials.h

@@ -18,23 +18,10 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <sal.h>
-
 namespace eap
 {
-    ///
-    /// Base class for method credential storage
-    ///
     class credentials;
-
-    ///
-    /// Password based method credentials
-    ///
     class credentials_pass;
-
-    ///
-    /// Connection credentials
-    ///
     class credentials_connection;
 }
 
@@ -58,6 +45,12 @@ namespace eap
 
 namespace eap
 {
+    /// \addtogroup EAPBaseCred
+    /// @{
+
+    ///
+    /// Base class for method credential storage
+    ///
     class credentials : public config
     {
     public:
@@ -68,7 +61,8 @@ namespace eap
             source_unknown = -1, ///< Unknown source
             source_cache = 0,    ///< Credentials were obtained from EapHost cache
             source_config,       ///< Credentials were set by method configuration
-            source_storage       ///< Credentials were loaded from Windows Credential Manager
+            source_storage,      ///< Credentials were loaded from Windows Credential Manager
+            source_lower,        ///< Credentials were set by lower EAP method
         };
 
 
@@ -126,50 +120,17 @@ namespace eap
         ///
         virtual bool empty() const;
 
-        /// \name XML configuration management
+        /// \name XML management
         /// @{
-
-        ///
-        /// Save to XML document
-        ///
-        /// \param[in]  pDoc         XML document
-        /// \param[in]  pConfigRoot  Suggested root element for saving
-        ///
         virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-
-        ///
-        /// Load from XML document
-        ///
-        /// \param[in]  pConfigRoot  Root element for loading
-        ///
         virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-
         /// @}
 
         /// \name BLOB management
         /// @{
-
-        ///
-        /// Packs a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of a configuration
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
         virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator>>(_Inout_ cursor_in &cursor);
-
         /// @}
 
         /// \name Storage
@@ -239,12 +200,14 @@ namespace eap
         /// Combine credentials in the following order:
         ///
         /// 1. Cached credentials
-        /// 2. Pre-configured credentials
+        /// 2. Configured credentials (if \p cfg is derived from `config_method_with_cred`)
         /// 3. Stored credentials
         ///
-        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL, must be the same type of credentials as `this`)
-        /// \param[in] cfg            Method configuration (must be the same type of configuration as `this` credentials belong to)
-        /// \param[in] pszTargetName  The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
+        /// \param[in] dwFlags                A combination of [EAP flags](https://msdn.microsoft.com/en-us/library/windows/desktop/bb891975.aspx) that describe the EAP authentication session behavior
+        /// \param[in] hTokenImpersonateUser  Impersonation token for a logged-on user to collect user-related information
+        /// \param[in] cred_cached            Cached credentials (optional, can be \c NULL, must be the same type of credentials as `this`)
+        /// \param[in] cfg                    Method configuration (must be the same type of configuration as `this` credentials belong to)
+        /// \param[in] pszTargetName          The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
         ///
         /// \returns
         /// - \c source_cache   Credentials were obtained from EapHost cache
@@ -252,15 +215,112 @@ namespace eap
         /// - \c source_storage Credentials were loaded from Windows Credential Manager
         ///
         virtual source_t combine(
-            _In_       const credentials             *cred_cached,
-            _In_       const config_method_with_cred &cfg,
-            _In_opt_z_       LPCTSTR                 pszTargetName) = 0;
+            _In_             DWORD         dwFlags,
+            _In_             HANDLE        hTokenImpersonateUser,
+            _In_opt_   const credentials   *cred_cached,
+            _In_       const config_method &cfg,
+            _In_opt_z_       LPCTSTR       pszTargetName) = 0;
 
     public:
         std::wstring m_identity;    ///< Identity (username\@domain, certificate name etc.)
     };
 
 
+    ///
+    /// Identity-only based method credentials
+    ///
+    class credentials_identity : public credentials
+    {
+    public:
+        ///
+        /// Constructs credentials
+        ///
+        /// \param[in] mod  EAP module to use for global services
+        ///
+        credentials_identity(_In_ module &mod);
+
+        ///
+        /// Copies credentials
+        ///
+        /// \param[in] other  Credentials to copy from
+        ///
+        credentials_identity(_In_ const credentials_identity &other);
+
+        ///
+        /// Moves credentials
+        ///
+        /// \param[in] other  Credentials to move from
+        ///
+        credentials_identity(_Inout_ credentials_identity &&other);
+
+        ///
+        /// Copies credentials
+        ///
+        /// \param[in] other  Credentials to copy from
+        ///
+        /// \returns Reference to this object
+        ///
+        credentials_identity& operator=(_In_ const credentials_identity &other);
+
+        ///
+        /// Moves credentials
+        ///
+        /// \param[in] other  Credentials to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        credentials_identity& operator=(_Inout_ credentials_identity &&other);
+
+        virtual config* clone() const;
+
+        /// \name XML management
+        /// @{
+        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
+        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
+        /// @}
+
+        /// \name Storage
+        /// @{
+        virtual void store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const;
+        virtual void retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level);
+
+        ///
+        /// @copydoc eap::credentials::target_suffix()
+        /// \returns This implementation always returns `_T("pass")`
+        ///
+        virtual LPCTSTR target_suffix() const;
+        /// @}
+
+        ///
+        /// Combine credentials in the following order:
+        ///
+        /// 1. Cached credentials
+        /// 2. Configured credentials (if \p cfg is derived from `config_method_with_cred`)
+        /// 3. Stored credentials
+        ///
+        /// \param[in] dwFlags                A combination of [EAP flags](https://msdn.microsoft.com/en-us/library/windows/desktop/bb891975.aspx) that describe the EAP authentication session behavior
+        /// \param[in] hTokenImpersonateUser  Impersonation token for a logged-on user to collect user-related information
+        /// \param[in] cred_cached            Cached credentials (optional, can be \c NULL)
+        /// \param[in] cfg                    Method configuration (when derived from `config_method_with_cred`, metod attempt to load credentials from \p cfg)
+        /// \param[in] pszTargetName          The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
+        ///
+        /// \returns
+        /// - \c source_cache   Credentials were obtained from EapHost cache
+        /// - \c source_config  Credentials were set by method configuration
+        /// - \c source_storage Credentials were loaded from Windows Credential Manager
+        ///
+        virtual source_t combine(
+            _In_             DWORD         dwFlags,
+            _In_             HANDLE        hTokenImpersonateUser,
+            _In_opt_   const credentials   *cred_cached,
+            _In_       const config_method &cfg,
+            _In_opt_z_       LPCTSTR       pszTargetName);
+    };
+
+
+    ///
+    /// Password based method credentials
+    ///
     class credentials_pass : public credentials
     {
     public:
@@ -314,109 +374,47 @@ namespace eap
         ///
         credentials_pass& operator=(_Inout_ credentials_pass &&other);
 
-        ///
-        /// Clones credentials
-        ///
-        /// \returns Pointer to cloned credentials
-        ///
         virtual config* clone() const;
-
-        ///
-        /// Resets credentials
-        ///
         virtual void clear();
-
-        ///
-        /// Test credentials if blank
-        ///
-        /// \returns
-        /// - \c true if blank
-        /// - \c false otherwise
-        ///
         virtual bool empty() const;
 
-        /// \name XML configuration management
+        /// \name XML management
         /// @{
-
-        ///
-        /// Save to XML document
-        ///
-        /// \param[in]  pDoc         XML document
-        /// \param[in]  pConfigRoot  Suggested root element for saving
-        ///
         virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-
-        ///
-        /// Load from XML document
-        ///
-        /// \param[in]  pConfigRoot  Root element for loading
-        ///
         virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-
         /// @}
 
         /// \name BLOB management
         /// @{
-
-        ///
-        /// Packs a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of a configuration
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
         virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator>>(_Inout_ cursor_in &cursor);
-
         /// @}
 
         /// \name Storage
         /// @{
-
-        ///
-        /// Save credentials to Windows Credential Manager
-        ///
-        /// \param[in]  pszTargetName  The name in Windows Credential Manager to store credentials as
-        /// \param[in]  level          Credential level (0=outer, 1=inner, 2=inner-inner...)
-        ///
         virtual void store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const;
-
-        ///
-        /// Retrieve credentials from Windows Credential Manager
-        ///
-        /// \param[in]  pszTargetName  The name in Windows Credential Manager to retrieve credentials from
-        /// \param[in]  level          Credential level (0=outer, 1=inner, 2=inner-inner...)
-        ///
         virtual void retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level);
 
         ///
-        /// Return target suffix for Windows Credential Manager credential name
+        /// @copydoc eap::credentials::target_suffix()
+        /// \returns This implementation always returns `_T("pass")`
         ///
         virtual LPCTSTR target_suffix() const;
-
         /// @}
 
         ///
         /// Combine credentials in the following order:
         ///
         /// 1. Cached credentials
-        /// 2. Pre-configured credentials
+        /// 2. Configured credentials (if \p cfg is derived from `config_method_with_cred`)
         /// 3. Stored credentials
         ///
-        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL, must be credentials_pass* type)
-        /// \param[in] cfg            Method configuration (must be config_method_pap type)
-        /// \param[in] pszTargetName  The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
+        /// \param[in] dwFlags                A combination of [EAP flags](https://msdn.microsoft.com/en-us/library/windows/desktop/bb891975.aspx) that describe the EAP authentication session behavior
+        /// \param[in] hTokenImpersonateUser  Impersonation token for a logged-on user to collect user-related information
+        /// \param[in] cred_cached            Cached credentials (optional, can be \c NULL)
+        /// \param[in] cfg                    Method configuration (when derived from `config_method_with_cred`, metod attempt to load credentials from \p cfg)
+        /// \param[in] pszTargetName          The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
         ///
         /// \returns
         /// - \c source_cache   Credentials were obtained from EapHost cache
@@ -424,13 +422,15 @@ namespace eap
         /// - \c source_storage Credentials were loaded from Windows Credential Manager
         ///
         virtual source_t combine(
-            _In_       const credentials             *cred_cached,
-            _In_       const config_method_with_cred &cfg,
-            _In_opt_z_       LPCTSTR                 pszTargetName);
+            _In_             DWORD         dwFlags,
+            _In_             HANDLE        hTokenImpersonateUser,
+            _In_opt_   const credentials   *cred_cached,
+            _In_       const config_method &cfg,
+            _In_opt_z_       LPCTSTR       pszTargetName);
 
     public:
-        winstd::sanitizing_wstring m_password;  ///< Password
-        enc_alg_t m_enc_alg;                    ///< Encryption algorithm used for XML password keeping
+        winstd::sanitizing_wstring m_password;      ///< Password
+        enc_alg_t m_enc_alg;                        ///< Encryption algorithm used for XML password keeping
 
     private:
         /// \cond internal
@@ -439,6 +439,9 @@ namespace eap
     };
 
 
+    ///
+    /// Connection credentials
+    ///
     class credentials_connection : public config
     {
     public:
@@ -482,57 +485,19 @@ namespace eap
         ///
         credentials_connection& operator=(_Inout_ credentials_connection &&other);
 
-        ///
-        /// Clones configuration
-        ///
-        /// \returns Pointer to cloned configuration
-        ///
         virtual config* clone() const;
 
-        /// \name XML configuration management
+        /// \name XML management
         /// @{
-
-        ///
-        /// Save to XML document
-        ///
-        /// \param[in]  pDoc         XML document
-        /// \param[in]  pConfigRoot  Suggested root element for saving
-        ///
         virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-
-        ///
-        /// Load from XML document
-        ///
-        /// \param[in]  pConfigRoot  Root element for loading
-        ///
         virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-
         /// @}
 
         /// \name BLOB management
         /// @{
-
-        ///
-        /// Packs a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of a configuration
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
         virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
         virtual void operator>>(_Inout_ cursor_in &cursor);
-
         /// @}
 
         ///
@@ -566,23 +531,48 @@ namespace eap
         std::wstring m_id;                      ///< Provider ID
         std::unique_ptr<credentials> m_cred;    ///< Credentials
     };
+
+    /// @}
 }
 
+/// \addtogroup EAPBaseStream
+/// @{
 
+///
+/// Packs a credential encryption algorithm ID
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[in]    val     Credential encryption algorithm ID to pack
+///
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::credentials_pass::enc_alg_t &val)
 {
     cursor << (unsigned char)val;
 }
 
 
+///
+/// Returns packed size of a credential encryption algorithm ID
+///
+/// \param[in] val  Credential encryption algorithm ID to pack
+///
+/// \returns Size of data when packed (in bytes)
+///
 inline size_t pksizeof(_In_ const eap::credentials_pass::enc_alg_t &val)
 {
     return pksizeof((unsigned char)val);
 }
 
 
+///
+/// Unpacks a credential encryption algorithm ID
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[out]   val     Credential encryption algorithm ID to unpack to
+///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::credentials_pass::enc_alg_t &val)
 {
     val = (eap::credentials_pass::enc_alg_t)0; // Reset higher bytes to zero before reading to lower byte.
     cursor >> (unsigned char&)val;
 }
+
+/// @}

lib/EAPBase/include/EAP.h

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2018 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -21,17 +21,44 @@
 #define IDR_EAP_KEY_PUBLIC  1
 #define IDR_EAP_KEY_PRIVATE 2
 
+///
+/// \defgroup EAPBaseStream  Memory Packaging
+/// Simple serialization/deserialization of data to/from memory opaque BLOBs
+///
+/// @{
 #ifndef EAP_ENCRYPT_BLOBS
+///
+/// Encrypt BLOBs leaving our module
+///
 #define EAP_ENCRYPT_BLOBS 1
 #endif
+/// @}
 
+///
+/// \defgroup EAPBaseModule  Modules
+/// Modules
+///
+/// @{
 #ifndef __DANGEROUS__LOG_CONFIDENTIAL_DATA
+///
+/// Output passwords and other confidential information to event log
+///
 #define __DANGEROUS__LOG_CONFIDENTIAL_DATA 0
 #endif
+/// @}
 
+///
+/// \defgroup EAPBaseCred  Credentials
+/// Credential management
+///
+/// @{
 #ifndef EAP_USE_NATIVE_CREDENTIAL_CACHE
+///
+/// Use EapHost credential cache
+///
 #define EAP_USE_NATIVE_CREDENTIAL_CACHE 0
 #endif
+/// @}
 
 #define _HOST_LOW_ENDIAN
 
@@ -50,15 +77,19 @@
 
 namespace eap
 {
-    ///
-    /// Output BLOB cursor
-    ///
     struct cursor_out;
+    struct cursor_in;
+
+    class packable;
+
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f;
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf;
 
     ///
-    /// Input BLOB cursor
+    /// \defgroup EAPBaseSanitizing  Sanitizing memory
+    /// Secure memory erasing after use
     ///
-    struct cursor_in;
+    /// @{
 
     ///
     /// Sanitizing dynamically allocated BLOB
@@ -66,17 +97,7 @@ namespace eap
     typedef std::vector<unsigned char, winstd::sanitizing_allocator<unsigned char> > sanitizing_blob;
 
     ///
-    /// Sanitizing BLOB of fixed size
-    ///
-    template<size_t N> struct sanitizing_blob_f;
-
-    ///
-    /// Sanitizing BLOB of fixed size (zero initialized)
-    ///
-    template<size_t N> struct sanitizing_blob_zf;
-
-    ///
-    /// Sanitizing BLOB of fixed size (zero initialized in _DEBUG version)
+    /// Sanitizing BLOB of fixed size (zero initialized in _DEBUG version, non-initialized in release version)
     ///
 #ifdef _DEBUG
     #define sanitizing_blob_xf sanitizing_blob_zf
@@ -84,27 +105,55 @@ namespace eap
     #define sanitizing_blob_xf sanitizing_blob_f
 #endif
 
-    ///
-    /// Diameter AVP flags
-    ///
+    /// @}
+
+    /// \addtogroup EAPBaseDiameter
+    /// @{
+
     enum diameter_avp_flags_t;
-
-    ///
-    /// Diameter AVP header
-    ///
     struct diameter_avp_header;
-
-    ///
-    /// Diameter AVP header with Vendor-ID
-    ///
     struct diameter_avp_header_ven;
 
     ///
-    /// EAP packet
+    /// Appends Diameter AVP to response packet
     ///
-    class packet;
+    /// \param[in   ] code    AVP code
+    /// \param[in   ] flags   AVP flags
+    /// \param[in   ] data    AVP data (<16777212B)
+    /// \param[in   ] size    Size of \p data in bytes
+    /// \param[inout] packet  Response packet to append data to
+    ///
+    void diameter_avp_append(
+        _In_                       unsigned int    code,
+        _In_                       unsigned char   flags,
+        _In_bytecount_(size) const void            *data,
+        _In_                       unsigned int    size,
+        _Inout_                    sanitizing_blob &packet);
+
+    ///
+    /// Appends Diameter AVP to response packet
+    ///
+    /// \param[in   ] code       AVP code
+    /// \param[in   ] vendor_id  Vendor-ID
+    /// \param[in   ] flags      AVP flags
+    /// \param[in   ] data       AVP data (<16777212B)
+    /// \param[in   ] size       Size of \p data in bytes
+    /// \param[inout] packet     Response packet to append data to
+    ///
+    void diameter_avp_append(
+        _In_                       unsigned int    code,
+        _In_                       unsigned int    vendor_id,
+        _In_                       unsigned char   flags,
+        _In_bytecount_(size) const void            *data,
+        _In_                       unsigned int    size,
+        _Inout_                    sanitizing_blob &packet);
+
+    /// @}
 }
 
+/// \addtogroup EAPBaseStream
+/// @{
+
 ///
 /// Packs a boolean
 ///
@@ -222,7 +271,7 @@ template<class _Elem, class _Traits, class _Ax> inline void operator<<(_Inout_ e
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Elem, class _Traits, class _Ax> inline size_t pksizeof(const std::basic_string<_Elem, _Traits, _Ax> &val);
+template<class _Elem, class _Traits, class _Ax> inline size_t pksizeof(_In_ const std::basic_string<_Elem, _Traits, _Ax> &val);
 
 ///
 /// Unpacks a string
@@ -247,7 +296,7 @@ template<class _Traits, class _Ax> inline void operator<<(_Inout_ eap::cursor_ou
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Traits, class _Ax> inline size_t pksizeof(const std::basic_string<wchar_t, _Traits, _Ax> &val);
+template<class _Traits, class _Ax> inline size_t pksizeof(_In_ const std::basic_string<wchar_t, _Traits, _Ax> &val);
 
 ///
 /// Unpacks a wide string
@@ -272,7 +321,7 @@ template<class _Ty, class _Ax> inline void operator<<(_Inout_ eap::cursor_out &c
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Ty, class _Ax> inline size_t pksizeof(const std::vector<_Ty, _Ax> &val);
+template<class _Ty, class _Ax> inline size_t pksizeof(_In_ const std::vector<_Ty, _Ax> &val);
 
 ///
 /// Unpacks a vector
@@ -297,7 +346,7 @@ template<class _Ty, class _Ax> inline void operator<<(_Inout_ eap::cursor_out &c
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Ty, class _Ax> inline size_t pksizeof(const std::list<_Ty, _Ax> &val);
+template<class _Ty, class _Ax> inline size_t pksizeof(_In_ const std::list<_Ty, _Ax> &val);
 
 ///
 /// Unpacks a list
@@ -322,16 +371,9 @@ template<class _Ty, class _Dx> inline void operator<<(_Inout_ eap::cursor_out &c
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Ty, class _Dx> inline size_t pksizeof(const std::unique_ptr<_Ty, _Dx> &val);
+template<class _Ty, class _Dx> inline size_t pksizeof(_In_ const std::unique_ptr<_Ty, _Dx> &val);
 
-/////
-///// Unpacks a std::unique_ptr
-/////
-///// \note Not generally unpackable, since we do not know, how to create a new instance of unique_ptr.
-/////
-///// \param[inout] cursor  Memory cursor
-///// \param[out]   val     std::unique_ptr to unpack to
-/////
+// std::unique_ptr<> is generally not unpackable, since we do not know, how to create a new instance of unique_ptr.
 //template<class _Ty, class _Dx> inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::unique_ptr<_Ty, _Dx> &val);
 
 ///
@@ -349,7 +391,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const winstd::cert_
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-inline size_t pksizeof(const winstd::cert_context &val);
+inline size_t pksizeof(_In_ const winstd::cert_context &val);
 
 ///
 /// Unpacks a certificate context
@@ -374,7 +416,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const winstd::eap_t
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-inline size_t pksizeof(const winstd::eap_type_t &val);
+inline size_t pksizeof(_In_ const winstd::eap_type_t &val);
 
 ///
 /// Unpacks an EAP method type
@@ -434,6 +476,64 @@ inline size_t pksizeof(_In_ const GUID &val);
 ///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ GUID &val);
 
+///
+/// Packs a EAP_METHOD_TYPE
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[in]    val     Variable with data to pack
+///
+inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const EAP_METHOD_TYPE &val);
+
+///
+/// Returns packed size of a EAP_METHOD_TYPE
+///
+/// \param[in] val  Data to pack
+///
+/// \returns Size of data when packed (in bytes)
+///
+inline size_t pksizeof(_In_ const EAP_METHOD_TYPE &val);
+
+///
+/// Unpacks a EAP_METHOD_TYPE
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[out]   val     Variable to receive unpacked value
+///
+inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ EAP_METHOD_TYPE &val);
+
+///
+/// Packs a packable object
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[in]    val     Object to pack
+///
+inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::packable &val);
+
+///
+/// Returns packed size of a packable object
+///
+/// \param[in] val  Object to pack
+///
+/// \returns Size of data when packed (in bytes)
+///
+inline size_t pksizeof(_In_ const eap::packable &val);
+
+///
+/// Unpacks a packable object
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[out]   val     Object to unpack to
+///
+inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::packable &val);
+
+/// @}
+
+///
+/// \defgroup EAPBaseConversion  Data conversion
+/// Data conversion
+///
+/// @{
+
 #ifndef htonll
 ///
 /// Converts an unsigned __int64 from host to TCP/IP network byte order.
@@ -446,7 +546,7 @@ inline unsigned __int64 htonll(unsigned __int64 val);
 #endif
 
 ///
-/// Converts an 24-bit integer from host to TCP/IP network byte order.
+/// Converts a 24-bit integer from host to TCP/IP network byte order.
 ///
 /// \param[in ] val  A 24-bit unsigned number in host byte order
 /// \param[out] out  A 24-bit unsigned number in network byte order
@@ -454,7 +554,7 @@ inline unsigned __int64 htonll(unsigned __int64 val);
 inline void hton24(_In_ unsigned int val, _Out_ unsigned char out[3]);
 
 ///
-/// Converts an 24-bit integer from TCP/IP network to host byte order.
+/// Converts a 24-bit integer from TCP/IP network to host byte order.
 ///
 /// \param[in] val  A 24-bit unsigned number in network byte order
 ///
@@ -462,13 +562,24 @@ inline void hton24(_In_ unsigned int val, _Out_ unsigned char out[3]);
 ///
 inline unsigned int ntoh24(_In_ const unsigned char val[3]);
 
+/// @}
+
 #pragma once
 
 
 namespace eap
 {
+    /// \addtogroup EAPBaseStream
+    /// @{
+
+    ///
+    /// Output BLOB cursor
+    ///
     struct cursor_out
     {
+        ///
+        /// Pointer to output data type
+        ///
         typedef unsigned char *ptr_type;
 
         ptr_type ptr;       ///< Pointer to first data unwritten
@@ -476,8 +587,14 @@ namespace eap
     };
 
 
+    ///
+    /// Input BLOB cursor
+    ///
     struct cursor_in
     {
+        ///
+        /// Pointer to input data type
+        ///
         typedef const unsigned char *ptr_type;
 
         ptr_type ptr;       ///< Pointer to first data unread
@@ -485,11 +602,56 @@ namespace eap
     };
 
 
+    ///
+    /// Base class for all packable data classes
+    ///
+    class packable
+    {
+    public:
+        ///
+        /// Constructs configuration
+        ///
+        packable();
+
+        /// \name BLOB management
+        /// @{
+
+        ///
+        /// Packs this object
+        ///
+        /// \param[inout] cursor  Memory cursor
+        ///
+        virtual void operator<<(_Inout_ cursor_out &cursor) const;
+
+        ///
+        /// Returns packed size of this object
+        ///
+        /// \returns Size of data when packed (in bytes)
+        ///
+        virtual size_t get_pk_size() const;
+
+        ///
+        /// Unpacks this object
+        ///
+        /// \param[inout] cursor  Memory cursor
+        ///
+        virtual void operator>>(_Inout_ cursor_in &cursor);
+
+        /// @}
+    };
+
+    /// @}
+
+    /// \addtogroup EAPBaseSanitizing
+    /// @{
+
 #pragma pack(push)
 #pragma pack(1)
 
-    template<size_t N>
-    struct __declspec(novtable) sanitizing_blob_f<N>
+    ///
+    /// Sanitizing BLOB of fixed size
+    ///
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f
     {
         unsigned char data[N]; ///< BLOB data
 
@@ -510,6 +672,16 @@ namespace eap
             memcpy(data, other.data, N);
         }
 
+        ///
+        /// Moves the BLOB
+        ///
+        /// \param[inout] other  BLOB to move from
+        ///
+        inline sanitizing_blob_f(_Inout_ sanitizing_blob_f<N> &&other)
+        {
+            memcpy(data, other.data, N);
+        }
+
         ///
         /// Moves the BLOB
         ///
@@ -546,7 +718,21 @@ namespace eap
         ///
         /// Moves the BLOB
         ///
-        /// \param[inout] other  Zero-initialized BLOB to copy from
+        /// \param[inout] other  BLOB to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        inline sanitizing_blob_f& operator=(_Inout_ sanitizing_blob_f<N> &&other)
+        {
+            if (this != std::addressof(other))
+                memcpy(data, other.data, N);
+            return *this;
+        }
+
+        ///
+        /// Moves the BLOB
+        ///
+        /// \param[inout] other  Zero-initialized BLOB to move from
         ///
         /// \returns Reference to this object
         ///
@@ -612,8 +798,11 @@ namespace eap
         }
     };
 
-    template<size_t N>
-    struct __declspec(novtable) sanitizing_blob_zf<N> : sanitizing_blob_f<N>
+
+    ///
+    /// Sanitizing BLOB of fixed size (zero initialized)
+    ///
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf : sanitizing_blob_f<N>
     {
         ///
         /// Constructor
@@ -623,6 +812,27 @@ namespace eap
             memset(data, 0, N);
         }
 
+        ///
+        /// Copies a BLOB
+        ///
+        /// \param[in] other  Zero-initialized BLOB to copy from
+        ///
+        inline sanitizing_blob_zf(_In_ const sanitizing_blob_zf<N> &other) :
+            sanitizing_blob_f<N>(other)
+        {
+        }
+
+        ///
+        /// Moves the BLOB
+        ///
+        /// \param[inout] other  Zero-initialized BLOB to move from
+        ///
+        inline sanitizing_blob_zf(_Inout_ sanitizing_blob_zf<N> &&other) :
+            sanitizing_blob_f<N>(std::move(other))
+        {
+            memset(other.data, 0, N);
+        }
+
         ///
         /// Copies a BLOB
         ///
@@ -636,16 +846,84 @@ namespace eap
         ///
         /// Moves the BLOB
         ///
-        /// \param[inout] other  Zero-initialized BLOB to move from
+        /// \param[inout] other  BLOB to move from
         ///
-        inline sanitizing_blob_zf(_Inout_ sanitizing_blob_zf<N> &&other) :
+        inline sanitizing_blob_zf(_Inout_ sanitizing_blob_f<N> &&other) :
             sanitizing_blob_f<N>(std::move(other))
         {
         }
+
+        ///
+        /// Copies a BLOB
+        ///
+        /// \param[in] other  Zero-initialized BLOB to copy from
+        ///
+        /// \returns Reference to this object
+        ///
+        inline sanitizing_blob_zf& operator=(_In_ const sanitizing_blob_zf<N> &other)
+        {
+            if (this != std::addressof(other))
+                memcpy(data, other.data, N);
+            return *this;
+        }
+
+        ///
+        /// Moves the BLOB
+        ///
+        /// \param[inout] other  Zero-initialized BLOB to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        inline sanitizing_blob_zf& operator=(_Inout_ sanitizing_blob_zf<N> &&other)
+        {
+            if (this != std::addressof(other)) {
+                memcpy(data, other.data, N);
+                memset(other.data, 0, N);
+            }
+            return *this;
+        }
+
+        ///
+        /// Copies a BLOB
+        ///
+        /// \param[in] other  BLOB to copy from
+        ///
+        /// \returns Reference to this object
+        ///
+        inline sanitizing_blob_zf& operator=(_In_ const sanitizing_blob_f<N> &other)
+        {
+            if (this != std::addressof(other))
+                memcpy(data, other.data, N);
+            return *this;
+        }
+
+        ///
+        /// Moves the BLOB
+        ///
+        /// \param[inout] other  BLOB to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        inline sanitizing_blob_zf& operator=(_Inout_ sanitizing_blob_f<N> &&other)
+        {
+            if (this != std::addressof(other))
+                memcpy(data, other.data, N);
+            return *this;
+        }
     };
 #pragma pack(pop)
 
+    /// @}
 
+    ///
+    /// \defgroup EAPBaseDiameter  Diameter
+    /// Diameter authentication protocol
+    ///
+    /// @{
+
+    ///
+    /// Diameter AVP flags
+    ///
     #pragma warning(suppress: 4480)
     enum diameter_avp_flags_t : unsigned char {
         diameter_avp_flag_vendor    = 0x80, ///< Vendor-ID present
@@ -657,6 +935,9 @@ namespace eap
 #pragma pack(push)
 #pragma pack(1)
 
+    ///
+    /// Diameter AVP header
+    ///
     struct diameter_avp_header
     {
         unsigned char code[4];      ///< AVP Code
@@ -665,6 +946,9 @@ namespace eap
     };
 
 
+    ///
+    /// Diameter AVP header with Vendor-ID
+    ///
     struct diameter_avp_header_ven : public diameter_avp_header
     {
         unsigned char vendor[4];    ///< Vendor-ID
@@ -672,57 +956,7 @@ namespace eap
 
 #pragma pack(pop)
 
-
-    class packet
-    {
-    public:
-        ///
-        /// Constructs an empty packet
-        ///
-        packet();
-
-        ///
-        /// Copies a packet
-        ///
-        /// \param[in] other  Packet to copy from
-        ///
-        packet(_In_ const packet &other);
-
-        ///
-        /// Moves a packet
-        ///
-        /// \param[in] other  Packet to move from
-        ///
-        packet(_Inout_ packet &&other);
-
-        ///
-        /// Copies a packet
-        ///
-        /// \param[in] other  Packet to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        packet& operator=(_In_ const packet &other);
-
-        ///
-        /// Moves a packet
-        ///
-        /// \param[in] other  Packet to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        packet& operator=(_Inout_ packet &&other);
-
-        ///
-        /// Empty the packet
-        ///
-        virtual void clear();
-
-    public:
-        EapCode m_code;         ///< Packet code
-        unsigned char m_id;     ///< Packet ID
-        sanitizing_blob m_data; ///< Packet data
-    };
+    /// @}
 }
 
 
@@ -842,7 +1076,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::basic_st
 
 
 template<class _Elem, class _Traits, class _Ax>
-inline size_t pksizeof(const std::basic_string<_Elem, _Traits, _Ax> &val)
+inline size_t pksizeof(_In_ const std::basic_string<_Elem, _Traits, _Ax> &val)
 {
     return sizeof(_Elem)*(val.length() + 1);
 }
@@ -869,7 +1103,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::basic_st
 
 
 template<class _Traits, class _Ax>
-inline size_t pksizeof(const std::basic_string<wchar_t, _Traits, _Ax> &val)
+inline size_t pksizeof(_In_ const std::basic_string<wchar_t, _Traits, _Ax> &val)
 {
     return sizeof(char)*(WideCharToMultiByte(CP_UTF8, 0, val.c_str(), (int)val.length(), NULL, 0, NULL, NULL) + 1);
 }
@@ -898,7 +1132,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::vector<_
 
 
 template<class _Ty, class _Ax>
-inline size_t pksizeof(const std::vector<_Ty, _Ax> &val)
+inline size_t pksizeof(_In_ const std::vector<_Ty, _Ax> &val)
 {
     // Since we do not know wheter vector elements are primitives or objects, iterate instead of sizeof().
     // For performance critical vectors of flat opaque data types write specialized template instantiation.
@@ -942,7 +1176,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::list<_Ty
 
 
 template<class _Ty, class _Ax>
-inline size_t pksizeof(const std::list<_Ty, _Ax> &val)
+inline size_t pksizeof(_In_ const std::list<_Ty, _Ax> &val)
 {
     // Since we do not know wheter list elements are primitives or objects, iterate instead of sizeof().
     // For performance critical vectors of flat opaque data types write specialized template instantiation.
@@ -981,7 +1215,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::unique_p
 
 
 template<class _Ty, class _Dx>
-inline size_t pksizeof(const std::unique_ptr<_Ty, _Dx> &val)
+inline size_t pksizeof(_In_ const std::unique_ptr<_Ty, _Dx> &val)
 {
     return
         val ?
@@ -1007,7 +1241,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const winstd::cert_
 }
 
 
-inline size_t pksizeof(const winstd::cert_context &val)
+inline size_t pksizeof(_In_ const winstd::cert_context &val)
 {
     return
         val ?
@@ -1111,6 +1345,49 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ GUID &val)
 }
 
 
+inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const EAP_METHOD_TYPE &val)
+{
+    auto ptr_end = cursor.ptr + sizeof(EAP_METHOD_TYPE);
+    assert(ptr_end <= cursor.ptr_end);
+    memcpy(cursor.ptr, &val, sizeof(EAP_METHOD_TYPE));
+    cursor.ptr = ptr_end;
+}
+
+
+inline size_t pksizeof(_In_ const EAP_METHOD_TYPE &val)
+{
+    UNREFERENCED_PARAMETER(val);
+    return sizeof(EAP_METHOD_TYPE);
+}
+
+
+inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ EAP_METHOD_TYPE &val)
+{
+    auto ptr_end = cursor.ptr + sizeof(EAP_METHOD_TYPE);
+    assert(ptr_end <= cursor.ptr_end);
+    memcpy(&val, cursor.ptr, sizeof(EAP_METHOD_TYPE));
+    cursor.ptr = ptr_end;
+}
+
+
+inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::packable &val)
+{
+    val.operator<<(cursor);
+}
+
+
+inline size_t pksizeof(_In_ const eap::packable &val)
+{
+    return val.get_pk_size();
+}
+
+
+inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::packable &val)
+{
+    val.operator>>(cursor);
+}
+
+
 #ifndef htonll
 
 inline unsigned __int64 htonll(unsigned __int64 val)

lib/EAPBase/include/EAPXML.h

@@ -29,39 +29,531 @@
 
 namespace eapxml
 {
+    ///
+    /// \defgroup EAPBaseXML  XML DOM
+    /// Easy interaction with MSXML
+    ///
+    /// @{
+
+    ///
+    /// Returns owner document object for a given node
+    ///
+    /// \param[in ] pXmlNode  XML node
+    /// \param[out] ppXmlDoc  XML document
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_document(_In_ IXMLDOMNode *pXmlNode, _Out_ winstd::com_obj<IXMLDOMDocument2> &ppXmlDoc);
+
+    ///
+    /// Selects single child node by name
+    ///
+    /// \param[in ] pXmlParent    Parent XML node
+    /// \param[in ] bstrNodeName  XML node selection name
+    /// \param[out] ppXmlNode     Child XML node found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT select_node(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrNodeName, _Out_ winstd::com_obj<IXMLDOMNode> &ppXmlNode);
+
+    ///
+    /// Selects child nodes by name
+    ///
+    /// \param[in ] pXmlParent    Parent XML node
+    /// \param[in ] bstrNodeName  XML node selection name
+    /// \param[out] ppXmlNodes    List of child XML nodes found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT select_nodes(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrNodeName, _Out_ winstd::com_obj<IXMLDOMNodeList> &ppXmlNodes);
+
+    ///
+    /// Selects single child element by name
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT select_element(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ winstd::com_obj<IXMLDOMElement> &ppXmlElement);
+
+    ///
+    /// Creates a new element
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT create_element(_In_ IXMLDOMDocument *pDoc, _In_z_ const BSTR bstrElementName, _In_z_ const BSTR bstrNamespace, _Out_ winstd::com_obj<IXMLDOMElement> &ppXmlElement);
+
+    ///
+    /// Creates a new child element if not already present
+    ///
+    /// \param[in ] pDoc                   Owner XML document
+    /// \param[in ] pXmlParent             Parent XML node
+    /// \param[in ] bstrElementNameSelect  XML element selection name
+    /// \param[in ] bstrElementNameCreate  XML element name
+    /// \param[in ] bstrNamespace          XML element namespace
+    /// \param[out] ppXmlElement           XML element found or created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT create_element(_In_ IXMLDOMDocument *pDoc, IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementNameSelect, _In_z_ const BSTR bstrElementNameCreate, _In_z_ const BSTR bstrNamespace, _Out_ winstd::com_obj<IXMLDOMElement> &ppXmlElement);
+
+    ///
+    /// Tests if node has a parent set
+    ///
+    /// \param[in] pXmlNode  XML node
+    ///
+    /// \returns
+    /// - Non zero when \p pXmlNode has a parent set;
+    /// - Zero otherwise.
+    ///
     inline bool has_parent(_In_ IXMLDOMNode *pXmlNode);
+
+    ///
+    /// Returns child element text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] pbstrValue       XML element text
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_element_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ winstd::bstr &pbstrValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] sValue           XML element text
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Traits, class _Ax> inline HRESULT get_element_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &sValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element text converted to number
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] pdwValue         XML element text converted to number
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_element_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ DWORD &pdwValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element text converted to boolean
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] pbValue          XML element text converted to boolean
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_element_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ bool &pbValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element BLOB encoded as Base64 text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] aValue           XML element BLOB
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Ty, class _Ax> inline HRESULT get_element_base64(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ std::vector<_Ty, _Ax> &aValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element BLOB encoded as hexadecimal text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] aValue           XML element BLOB
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Ty, class _Ax> inline HRESULT get_element_hex(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ std::vector<_Ty, _Ax> &aValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element localizable text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[in ] pszLang          Desired localization
+    /// \param[out] pbstrValue       XML element text
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_element_localized(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _In_z_ LPCWSTR pszLang, _Out_ winstd::bstr &pbstrValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element localizable text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[in ] pszLang          Desired localization
+    /// \param[out] sValue           XML element text
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Traits, class _Ax> inline HRESULT get_element_localized(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _In_z_ LPCWSTR pszLang, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &sValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _Out_ winstd::com_obj<IXMLDOMElement> &ppXmlElement);
+
+    ///
+    /// Creates a new child element with text
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] bstrValue        XML element text
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_value(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_z_ const BSTR bstrValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element with text converted from number
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] dwValue          XML element number
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_value(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_ DWORD dwValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element with text converted from boolean
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] bValue           XML element boolean
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_value(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_ bool bValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element with Base64 encoded text from BLOB
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] pValue           Pointer to BLOB data
+    /// \param[in ] nValueLen        Size of \p pValue in bytes
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_base64(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_count_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element with hexadecimal encoded text from BLOB
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] pValue           Pointer to BLOB data
+    /// \param[in ] nValueLen        Size of \p pValue in bytes
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_hex(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_count_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns attribute text
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] pbstrValue         XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_attrib_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ winstd::bstr &pbstrValue);
+
+    ///
+    /// Returns attribute text
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] sValue             XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Traits, class _Ax> inline HRESULT get_attrib_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &sValue);
+
+    ///
+    /// Returns attribute text converted to number
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] pdwValue           XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_attrib_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ DWORD &pdwValue);
+
+    ///
+    /// Returns attribute text converted to boolean
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] pbValue            XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_attrib_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ bool &pbValue);
+
+    ///
+    /// Returns attribute BLOB converted from Base64 encoded text
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] aValue             XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Ty, class _Ax> inline HRESULT get_attrib_base64(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ std::vector<_Ty, _Ax> &aValue);
+
+    ///
+    /// Returns attribute BLOB converted from hexadecimal encoded text
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] aValue             XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Ty, class _Ax> inline HRESULT get_attrib_hex(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ std::vector<_Ty, _Ax> &aValue);
+
+    ///
+    /// Sets node attribute
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[out] bstrValue          XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_value(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_opt_z_ _In_z_ const BSTR bstrValue);
+
+    ///
+    /// Sets node attribute converted from number
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[out] dwValue            XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_value(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_opt_z_ _In_ DWORD dwValue);
+
+    ///
+    /// Sets node attribute converted from boolean
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[out] bValue             XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_value(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_opt_z_ _In_ bool bValue);
+
+    ///
+    /// Sets node attribute to Base64 encoded text from BLOB
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[in ] pValue             Pointer to BLOB data
+    /// \param[in ] nValueLen          Size of \p pValue in bytes
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_base64(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_opt_z_ _In_count_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen);
+    ///
+    /// Sets node attribute to hexadecimal encoded text from BLOB
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[in ] pValue             Pointer to BLOB data
+    /// \param[in ] nValueLen          Size of \p pValue in bytes
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_hex(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_count_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen);
+
+    ///
+    /// Builds XPath for a given node
+    ///
+    /// \param[in] pXmlNode  XML node
+    ///
+    /// \returns String with XPath for a given node up to node terminal parent
+    ///
     inline std::wstring get_xpath(_In_ IXMLDOMNode *pXmlNode);
+
+    /// @}
 }
 
 #pragma once

lib/EAPBase/include/Method.h

@@ -20,15 +20,9 @@
 
 namespace eap
 {
-    ///
-    /// EAP and non-EAP method base class
-    ///
     class method;
-
-    ///
-    /// Non-EAP method base class
-    ///
-    class method_noneap;
+    class method_tunnel;
+    class method_eap;
 }
 
 #pragma once
@@ -49,37 +43,44 @@ extern "C" {
 
 namespace eap
 {
+    ///
+    /// \defgroup EAPBaseMethod  Methods
+    /// Methods
+    ///
+    /// @{
+
+    ///
+    /// Method base class
+    ///
     class method
     {
         WINSTD_NONCOPYABLE(method)
 
     public:
         ///
-        /// Constructs an EAP method
+        /// Constructs a method
         ///
-        /// \param[in] mod   EAP module to use for global services
-        /// \param[in] cfg   Method configuration
-        /// \param[in] cred  User credentials
+        /// \param[in] mod  Module to use for global services
         ///
-        method(_In_ module &module, _In_ config_method &cfg, _In_ credentials &cred);
+        method(_In_ module &mod);
 
         ///
-        /// Moves an EAP method
+        /// Moves a method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  Method to move from
         ///
         method(_Inout_ method &&other);
 
         ///
-        /// Moves an EAP method
+        /// Moves a method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  Method to move from
         ///
         /// \returns Reference to this object
         ///
         method& operator=(_Inout_ method &&other);
 
-        /// \name Packet processing
+        /// \name Session management
         /// @{
 
         ///
@@ -87,6 +88,11 @@ namespace eap
         ///
         /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
         ///
+        /// \param[in] dwFlags                A combination of EAP flags that describe the new EAP authentication session behavior.
+        /// \param[in] pAttributeArray        A pointer to an array structure that specifies the EAP attributes of the entity to authenticate.
+        /// \param[in] hTokenImpersonateUser  Specifies a handle to the user impersonation token to use in this session.
+        /// \param[in] dwMaxSendPacketSize    Specifies the maximum size in bytes of an EAP packet sent during the session. If the method needs to send a packet larger than the maximum size, the method must accommodate fragmentation and reassembly.
+        ///
         virtual void begin_session(
             _In_        DWORD         dwFlags,
             _In_  const EapAttributes *pAttributeArray,
@@ -100,111 +106,266 @@ namespace eap
         ///
         virtual void end_session();
 
+        /// @}
+
+        /// \name Packet processing
+        /// @{
+
         ///
         /// Processes a packet received by EapHost from a supplicant.
         ///
         /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
         ///
-        virtual void process_request_packet(
-            _In_bytecount_(dwReceivedPacketSize) const void                *pReceivedPacket,
-            _In_                                       DWORD               dwReceivedPacketSize,
-            _Out_                                      EapPeerMethodOutput *pEapOutput) = 0;
+        /// \param[in] pReceivedPacket       Received packet data
+        /// \param[in] dwReceivedPacketSize  \p pReceivedPacket size in bytes
+        ///
+        /// \returns Action peer wants EapHost to do next.
+        ///
+        virtual EapPeerMethodResponseAction process_request_packet(
+            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+            _In_                                       DWORD dwReceivedPacketSize) = 0;
 
         ///
         /// Obtains a response packet from the EAP method.
         ///
         /// \sa [EapPeerGetResponsePacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363610.aspx)
         ///
+        /// \param[out] packet    Response packet
+        /// \param[in]  size_max  The maximum size in bytes \p packet must not exceed. If the method needs to send a packet larger than the maximum size, the method must accommodate fragmentation and reassembly.
+        ///
         virtual void get_response_packet(
-            _Inout_bytecap_(*dwSendPacketSize) void  *pSendPacket,
-            _Inout_                            DWORD *pdwSendPacketSize) = 0;
+            _Out_    sanitizing_blob &packet,
+            _In_opt_ DWORD           size_max = MAXDWORD) = 0;
+
+        /// @}
 
         ///
         /// Obtains the result of an authentication session from the EAP method.
         ///
         /// \sa [EapPeerGetResult function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363611.aspx)
         ///
+        /// \param[in ] reason   The reason code for the authentication result returned in \p pResult.
+        /// \param[out] pResult  A pointer to a structure that contains the authentication results.
+        ///
         virtual void get_result(
-            _In_    EapPeerMethodResultReason reason,
-            _Inout_ EapPeerMethodResult       *pResult);
+            _In_  EapPeerMethodResultReason reason,
+            _Out_ EapPeerMethodResult       *pResult);
+
+        /// \name User Interaction
+        /// @{
+
+        ///
+        /// Obtains the user interface context from the EAP method.
+        ///
+        /// \note This function is always followed by the `EapPeerInvokeInteractiveUI()` function, which is followed by the `EapPeerSetUIContext()` function.
+        ///
+        /// \sa [EapPeerGetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363612.aspx)
+        ///
+        /// \param[out] context_data  Supplicant user interface context data from EAPHost.
+        ///
+        virtual void get_ui_context(_Out_ sanitizing_blob &context_data);
+
+        ///
+        /// Provides a user interface context to the EAP method.
+        ///
+        /// \note This function is called after the UI has been raised through the `EapPeerGetUIContext()` function.
+        ///
+        /// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx)
+        ///
+        /// \param[in] pUIContextData       A pointer to an address that contains a byte buffer with the new supplicant UI context data to set on EAPHost.
+        /// \param[in] dwUIContextDataSize  \p pUIContextData size in bytes
+        ///
+        /// \returns Action peer wants EapHost to do next.
+        ///
+        virtual EapPeerMethodResponseAction set_ui_context(
+            _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+            _In_                                  DWORD dwUIContextDataSize);
+
+        /// @}
+
+        /// \name EAP Response Attributes
+        /// @{
+
+        ///
+        /// Obtains an array of EAP response attributes from the EAP method.
+        ///
+        /// \sa [EapPeerGetResponseAttributes function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363609.aspx)
+        ///
+        /// \param[out] pAttribs  A pointer to a structure that contains an array of EAP authentication response attributes for the supplicant.
+        ///
+        virtual void get_response_attributes(_Out_ EapAttributes *pAttribs);
+
+        ///
+        /// Provides an updated array of EAP response attributes to the EAP method.
+        ///
+        /// \sa [EapPeerSetResponseAttributes function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363625.aspx)
+        ///
+        /// \param[in] pAttribs  A pointer to a structure that contains an array of new EAP authentication response attributes to set for the supplicant on EAPHost.
+        ///
+        /// \returns Action peer wants EapHost to do next.
+        ///
+        virtual EapPeerMethodResponseAction set_response_attributes(_In_ const EapAttributes *pAttribs);
 
         /// @}
 
     public:
-        module &m_module;                           ///< EAP module
-        config_method &m_cfg;                       ///< Connection configuration
-        credentials &m_cred;                        ///< User credentials
-        std::vector<winstd::eap_attr> m_eap_attr;   ///< EAP attributes
+        module &m_module;   ///< Module for global services
     };
 
 
-    class method_noneap : public method
+    ///
+    /// Tunnel method base class
+    ///
+    /// This is a base class for all the methods that encapsulate inner methods to provide stacking framework.
+    ///
+    class method_tunnel : public method
     {
-        WINSTD_NONCOPYABLE(method_noneap)
+        WINSTD_NONCOPYABLE(method_tunnel)
 
     public:
         ///
-        /// Constructs an EAP method
+        /// Constructs a method
         ///
-        /// \param[in] mod   EAP module to use for global services
-        /// \param[in] cfg   Method configuration
-        /// \param[in] cred  User credentials
+        /// \param[in] mod    Module to use for global services
+        /// \param[in] inner  Inner method
         ///
-        method_noneap(_In_ module &module, _In_ config_method &cfg, _In_ credentials &cred);
+        method_tunnel(_In_ module &mod, _In_ method *inner);
 
         ///
-        /// Moves an EAP method
+        /// Moves a method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  Method to move from
         ///
-        method_noneap(_Inout_ method_noneap &&other);
+        method_tunnel(_Inout_ method_tunnel &&other);
 
         ///
-        /// Moves an EAP method
+        /// Moves a method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  Method to move from
         ///
         /// \returns Reference to this object
         ///
-        method_noneap& operator=(_Inout_ method_noneap &&other);
+        method_tunnel& operator=(_Inout_ method_tunnel &&other);
+
+        /// \name Session management
+        /// @{
+
+        virtual void begin_session(
+            _In_        DWORD         dwFlags,
+            _In_  const EapAttributes *pAttributeArray,
+            _In_        HANDLE        hTokenImpersonateUser,
+            _In_opt_    DWORD         dwMaxSendPacketSize = MAXDWORD);
+
+        virtual void end_session();
+
+        /// @}
 
         /// \name Packet processing
         /// @{
 
-        ///
-        /// Obtains a response packet from the EAP method.
-        ///
-        /// \sa [EapPeerGetResponsePacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363610.aspx)
-        ///
+        virtual EapPeerMethodResponseAction process_request_packet(
+            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+            _In_                                       DWORD dwReceivedPacketSize);
+
         virtual void get_response_packet(
-            _Inout_bytecap_(*dwSendPacketSize) void  *pSendPacket,
-            _Inout_                            DWORD *pdwSendPacketSize);
+            _Out_    sanitizing_blob &packet,
+            _In_opt_ DWORD           size_max = MAXDWORD);
+
+        /// @}
+
+        virtual void get_result(
+            _In_  EapPeerMethodResultReason reason,
+            _Out_ EapPeerMethodResult       *pResult);
+
+        /// \name User Interaction
+        /// @{
+
+        virtual void get_ui_context(_Out_ sanitizing_blob &context_data);
+
+        virtual EapPeerMethodResponseAction set_ui_context(
+            _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+            _In_                                  DWORD dwUIContextDataSize);
+
+        /// @}
+
+        /// \name EAP Response Attributes
+        /// @{
+
+        virtual void get_response_attributes(_Out_ EapAttributes *pAttribs);
+
+        virtual EapPeerMethodResponseAction set_response_attributes(_In_ const EapAttributes *pAttribs);
 
         /// @}
 
     protected:
+        std::unique_ptr<method> m_inner;    ///< Inner method
+    };
+
+
+    ///
+    /// EAP tunnel method
+    ///
+    /// This method encapsulates inner data in EAP packets.
+    ///
+    class method_eap : public method_tunnel
+    {
+        WINSTD_NONCOPYABLE(method_eap)
+
+    public:
         ///
-        /// Appends Diameter AVP to response packet
+        /// Constructs a method
         ///
-        /// \param[in] code     AVP code
-        /// \param[in] flags    AVP flags
-        /// \param[in] data     AVP data (<16777212B)
-        /// \param[in] size     Size of \p data in bytes
+        /// \param[in] mod         Module to use for global services
+        /// \param[in] eap_method  EAP method type
+        /// \param[in] inner       Inner method
         ///
-        void append_avp(_In_ unsigned int code, _In_ unsigned char flags, _In_bytecount_(size) const void *data, _In_ unsigned int size);
+        method_eap(_In_ module &mod, _In_ winstd::eap_type_t eap_method, _In_ method *inner);
 
         ///
-        /// Appends Diameter AVP to response packet
+        /// Moves a method
         ///
-        /// \param[in] code       AVP code
-        /// \param[in] vendor_id  Vendor-ID
-        /// \param[in] flags      AVP flags
-        /// \param[in] data       AVP data (<16777212B)
-        /// \param[in] size       Size of \p data in bytes
+        /// \param[in] other  Method to move from
         ///
-        void append_avp(_In_ unsigned int code, _In_ unsigned int vendor_id, _In_ unsigned char flags, _In_bytecount_(size) const void *data, _In_ unsigned int size);
+        method_eap(_Inout_ method_eap &&other);
+
+        ///
+        /// Moves a method
+        ///
+        /// \param[in] other  Method to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        method_eap& operator=(_Inout_ method_eap &&other);
+
+        /// \name Session management
+        /// @{
+
+        virtual void begin_session(
+            _In_        DWORD         dwFlags,
+            _In_  const EapAttributes *pAttributeArray,
+            _In_        HANDLE        hTokenImpersonateUser,
+            _In_opt_    DWORD         dwMaxSendPacketSize = MAXDWORD);
+
+        /// @}
+
+        /// \name Packet processing
+        /// @{
+
+        virtual EapPeerMethodResponseAction process_request_packet(
+            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+            _In_                                       DWORD dwReceivedPacketSize);
+
+        virtual void get_response_packet(
+            _Out_    sanitizing_blob &packet,
+            _In_opt_ DWORD           size_max = MAXDWORD);
+
+        /// @}
 
     protected:
-        sanitizing_blob m_packet_res;   ///< Response packet
+        const winstd::eap_type_t m_eap_method;  ///< EAP method type
+        unsigned char m_id;                     ///< Request packet ID
+        bool m_send_nak;                        ///< Are we sending Legacy Nak response?
     };
+
+    /// @}
 }

lib/EAPBase/include/Module.h

@@ -20,18 +20,7 @@
 
 namespace eap
 {
-    ///
-    /// EAP module base class
-    ///
-    /// Provides basic services to EAP methods.
-    ///
     class module;
-
-    ///
-    /// EAP peer base class
-    ///
-    /// A group of methods all EAP peers must or should implement.
-    ///
     class peer;
 }
 
@@ -58,6 +47,14 @@ extern "C" {
 
 namespace eap
 {
+    /// \addtogroup EAPBaseModule
+    /// @{
+
+    ///
+    /// EAP module base class
+    ///
+    /// Provides basic services to EAP methods.
+    ///
     class module
     {
         WINSTD_NONCOPYABLE(module)
@@ -88,6 +85,11 @@ namespace eap
         ///
         EAP_ERROR* make_error(_In_ std::exception &err) const;
 
+        ///
+        /// Allocate a EAP_ERROR and fill it according to another EAP_ERROR
+        ///
+        EAP_ERROR* make_error(_In_ const EAP_ERROR *err) const;
+
         ///
         /// Allocate BLOB
         ///
@@ -104,7 +106,9 @@ namespace eap
         void free_error_memory(_In_ EAP_ERROR *err);
 
         ///
-        /// Makes a new method config
+        /// Makes a new method configuration
+        ///
+        /// \returns New method configuration
         ///
         virtual config_method* make_config_method();
 
@@ -129,6 +133,7 @@ namespace eap
         /// Writes EAPMETHOD_TRACE_EVT_FN_CALL and returns auto event writer class
         ///
         /// \param[in] pszFnName  Function name
+        /// \param[in] result     Reference to function return variable
         ///
         /// \returns A new auto event writer that writes EAPMETHOD_TRACE_EVT_FN_RETURN_DWORD event on destruction
         ///
@@ -223,6 +228,9 @@ namespace eap
         ///
         /// If \c _DEBUG is set the value is masked.
         ///
+        /// \param[in] name   Variable name
+        /// \param[in] value  Variable value
+        ///
         inline void log_config_discrete(_In_z_ LPCWSTR name, _In_z_ LPCWSTR value) const
         {
 #if __DANGEROUS__LOG_CONFIDENTIAL_DATA
@@ -238,6 +246,10 @@ namespace eap
         ///
         /// If \c _DEBUG is set the value is masked.
         ///
+        /// \param[in] name  Variable name
+        /// \param[in] data  Variable data
+        /// \param[in] size  \p data size in bytes
+        ///
         inline void log_config_discrete(_In_z_ LPCWSTR name, _In_bytecount_(size) const void *data, _In_ ULONG size) const
         {
 #if __DANGEROUS__LOG_CONFIDENTIAL_DATA
@@ -251,6 +263,8 @@ namespace eap
         ///
         /// Logs event
         ///
+        /// \param[in] EventDescriptor  Event descriptor
+        ///
         inline void log_event(_In_ PCEVENT_DESCRIPTOR EventDescriptor, ...) const
         {
             va_list arg;
@@ -270,7 +284,6 @@ namespace eap
         /// \param[in ] hProv  Handle of cryptographics provider
         /// \param[in ] data   Pointer to data to encrypt
         /// \param[in ] size   Size of \p data in bytes
-        /// \param[out] enc    Encrypted data
         /// \param[out] hHash  Handle of hashing object
         ///
         /// \returns Encrypted data
@@ -520,11 +533,6 @@ namespace eap
         ///
         /// \param[in   ] pDataIn       Pointer to encrypted BLOB
         /// \param[in   ] dwDataInSize  Size of \p pDataIn
-        /// \param[out  ] ppEapError    Pointer to error descriptor in case of failure. Free using `module::free_error_memory()`.
-        ///
-        /// \returns
-        /// - \c true if succeeded
-        /// - \c false otherwise. See \p ppEapError for details.
         ///
         /// \returns Encrypted BLOB
         ///
@@ -682,6 +690,11 @@ namespace eap
     };
 
 
+    ///
+    /// EAP peer base class
+    ///
+    /// A group of methods all EAP peers must or should implement.
+    ///
     class peer : public module
     {
         WINSTD_NONCOPYABLE(peer)
@@ -713,23 +726,43 @@ namespace eap
         ///
         /// \sa [EapPeerGetIdentity function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363607.aspx)
         ///
+        /// \param[in ] dwFlags                  A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] pConnectionData          Connection data used for the EAP method. If set to \c NULL, the static property of the method, as configured in the registry, is returned.
+        /// \param[in ] dwConnectionDataSize     The size, in bytes, of the connection data buffer provided in \p pConnectionData.
+        /// \param[in ] pUserData                A pointer to a byte buffer that contains the opaque user data BLOB. This parameter can be \c NULL.
+        /// \param[in ] dwUserDataSize           The size, in bytes, of the user data buffer provided in \p pUserData.
+        /// \param[out] ppUserDataOut            A pointer to a pointer to the returned user data. The data is passed to \p EapPeerBeginSession() as input \p pUserData.
+        /// \param[out] pdwUserDataOutSize       Specifies the size, in bytes, of the \p ppUserDataOut buffer.
+        /// \param[in ] hTokenImpersonateUser    A handle to the user impersonation token to use in this session.
+        /// \param[out] pfInvokeUI               Returns \c TRUE if the user identity and user data blob aren't returned successfully, and the method seeks to collect the information from the user through the user interface dialog.
+        /// \param[out] ppwszIdentity            A pointer to the returned user identity. The pointer will be included in the identity response packet and returned to the server.
+        ///
         virtual void get_identity(
             _In_                                   DWORD  dwFlags,
             _In_count_(dwConnectionDataSize) const BYTE   *pConnectionData,
             _In_                                   DWORD  dwConnectionDataSize,
             _In_count_(dwUserDataSize)       const BYTE   *pUserData,
             _In_                                   DWORD  dwUserDataSize,
-            _Inout_                                BYTE   **ppUserDataOut,
-            _Inout_                                DWORD  *pdwUserDataOutSize,
+            _Out_                                  BYTE   **ppUserDataOut,
+            _Out_                                  DWORD  *pdwUserDataOutSize,
             _In_                                   HANDLE hTokenImpersonateUser,
-            _Inout_                                BOOL   *pfInvokeUI,
-            _Inout_                                WCHAR  **ppwszIdentity) = 0;
+            _Out_                                  BOOL   *pfInvokeUI,
+            _Out_                                  WCHAR  **ppwszIdentity) = 0;
 
         ///
         /// Defines the implementation of an EAP method-specific function that retrieves the properties of an EAP method given the connection and user data.
         ///
         /// \sa [EapPeerGetMethodProperties function](https://msdn.microsoft.com/en-us/library/windows/desktop/hh706636.aspx)
         ///
+        /// \param[in ] dwVersion                The version number of the API.
+        /// \param[in ] dwFlags                  A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] hUserImpersonationToken  A handle to the user impersonation token to use in this session.
+        /// \param[in ] pConnectionData          Connection data used for the EAP method. If set to \c NULL, the static property of the method, as configured in the registry, is returned.
+        /// \param[in ] dwConnectionDataSize     The size, in bytes, of the connection data buffer provided in \p pConnectionData.
+        /// \param[in ] pUserData                A pointer to a byte buffer that contains the opaque user data BLOB. This parameter can be \c NULL.
+        /// \param[in ] dwUserDataSize           The size, in bytes, of the user data buffer provided in \p pUserData.
+        /// \param[out] pMethodPropertyArray     A pointer to the method properties array. Caller should free the inner pointers using `EapHostPeerFreeMemory()` starting at the innermost pointer. The caller should free an \c empvtString value only when the type is \c empvtString.
+        ///
         virtual void get_method_properties(
             _In_                                   DWORD                     dwVersion,
             _In_                                   DWORD                     dwFlags,
@@ -738,72 +771,107 @@ namespace eap
             _In_                                   DWORD                     dwConnectionDataSize,
             _In_count_(dwUserDataSize)       const BYTE                      *pUserData,
             _In_                                   DWORD                     dwUserDataSize,
-            _Inout_                                EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray) = 0;
+            _Out_                                  EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray) = 0;
 
         ///
         /// Converts XML into the configuration BLOB. The XML based credentials can come from group policy or from a system administrator.
         ///
         /// \sa [EapPeerCredentialsXml2Blob function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363603.aspx)
         ///
+        /// \param[in ] dwFlags                A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] pConfigRoot            A pointer to an XML node that contains credentials, which are either user or machine credentials depending on the configuration passed in. The XML document is created with the EapHostUserCredentials Schema.
+        /// \param[in ] dwConnectionDataSize   The size of the EAP SSO configuration data pointed to by \p pConnectionData, in bytes.
+        /// \param[in ] pConnectionData        A pointer to an opaque byte buffer that contains the EAP SSO configuration data BLOB.
+        /// \param[out] ppCredentialsOut       A pointer to the byte buffer that receives the credentials BLOB buffer generated by the input XML. The buffer can is of size \p pdwCredentialsOutSize. After consuming the data, this memory must be freed by calling `EapPeerFreeMemory()`.
+        /// \param[out] pdwCredentialsOutSize  The size, in bytes, of the buffer pointed to by \p ppCredentialsOut.
+        ///
         virtual void credentials_xml2blob(
             _In_                                   DWORD       dwFlags,
             _In_                                   IXMLDOMNode *pConfigRoot,
             _In_count_(dwConnectionDataSize) const BYTE        *pConnectionData,
             _In_                                   DWORD       dwConnectionDataSize,
-            _Inout_                                BYTE        **ppCredentialsOut,
-            _Inout_                                DWORD       *pdwCredentialsOutSize) = 0;
+            _Out_                                  BYTE        **ppCredentialsOut,
+            _Out_                                  DWORD       *pdwCredentialsOutSize) = 0;
 
         ///
         /// Defines the implementation of an EAP method-specific function that obtains the EAP Single-Sign-On (SSO) credential input fields for an EAP method.
         ///
         /// \sa [EapPeerQueryCredentialInputFields function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363622.aspx)
         ///
+        /// \param[in ] hUserImpersonationToken     An impersonation token for the user whose credentials are to be requested and obtained.
+        /// \param[in ] dwFlags                     A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] dwConnectionDataSize        The size of the EAP SSO configuration data pointed to by \p pConnectionData, in bytes.
+        /// \param[in ] pConnectionData             A pointer to an opaque byte buffer that contains the EAP SSO configuration data BLOB.
+        /// \param[out] pEapConfigInputFieldsArray  A Pointer to a structure that contains the input fields to display to the supplicant user. The `pwszData` fields in the individual `EAP_CONFIG_INPUT_FIELD_DATA` elements are initialized to \c NULL.
+        ///
         virtual void query_credential_input_fields(
             _In_                                   HANDLE                       hUserImpersonationToken,
             _In_                                   DWORD                        dwFlags,
             _In_                                   DWORD                        dwConnectionDataSize,
             _In_count_(dwConnectionDataSize) const BYTE                         *pConnectionData,
-            _Inout_                                EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray) const;
+            _Out_                                  EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray) const;
 
         ///
         /// Defines the implementation of an EAP method function that obtains the user BLOB data provided in an interactive Single-Sign-On (SSO) UI raised on the supplicant.
         ///
         /// \sa [EapPeerQueryUserBlobFromCredentialInputFields function](https://msdn.microsoft.com/en-us/library/windows/desktop/bb204697.aspx)
         ///
+        /// \param[in ] hUserImpersonationToken    An impersonation token for the user whose credentials are to be requested and obtained.
+        /// \param[in ] dwFlags                    A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] dwConnectionDataSize       The size of the EAP SSO configuration data pointed to by \p pConnectionData, in bytes.
+        /// \param[in ] pConnectionData            A pointer to an opaque byte buffer that contains the EAP SSO configuration data BLOB.
+        /// \param[in ] pEapConfigInputFieldArray  A pointer to a structure that contains the input fields to display to the supplicant user. The `pwszData` fields in the individual `EAP_CONFIG_INPUT_FIELD_DATA` elements are initialized to \c NULL.
+        /// \param[out] pdwUsersBlobSize           A pointer to a buffer that contains the size, in bytes, of the opaque user configuration data BLOB in \p ppUserBlob.
+        /// \param[out] ppUserBlob                 A pointer that contains the opaque user data BLOB.
+        ///
         virtual void query_user_blob_from_credential_input_fields(
             _In_                                   HANDLE                       hUserImpersonationToken,
             _In_                                   DWORD                        dwFlags,
             _In_                                   DWORD                        dwConnectionDataSize,
             _In_count_(dwConnectionDataSize) const BYTE                         *pConnectionData,
             _In_                             const EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldArray,
-            _Inout_                                DWORD                        *pdwUsersBlobSize,
-            _Inout_                                BYTE                         **ppUserBlob) const;
+            _Out_                                  DWORD                        *pdwUsersBlobSize,
+            _Out_                                  BYTE                         **ppUserBlob) const;
 
         ///
         /// Defines the implementation of an EAP method API that provides the input fields for interactive UI components to be raised on the supplicant.
         ///
         /// \sa [EapPeerQueryInteractiveUIInputFields function](https://msdn.microsoft.com/en-us/library/windows/desktop/bb204695.aspx)
         ///
+        /// \param[in ] dwVersion              The version number of the API.
+        /// \param[in ] dwFlags                A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] dwUIContextDataSize    The size of the context data in \p pUIContextData, in bytes.
+        /// \param[in ] pUIContextData         A pointer to a BLOB that contains UI context data, represented as inner pointers to field data. The supplicant obtained these inner pointers from EAPHost run-time APIs.
+        /// \param[out] pEapInteractiveUIData  Pointer that receives a structure that contains configuration information for interactive UI components raised on an EAP supplicant.
+        ///
         virtual void query_interactive_ui_input_fields(
             _In_                                  DWORD                   dwVersion,
             _In_                                  DWORD                   dwFlags,
             _In_                                  DWORD                   dwUIContextDataSize,
             _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
-            _Inout_                               EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData) const;
+            _Out_                                 EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData) const;
 
         ///
         /// Converts user information into a user BLOB that can be consumed by EapHost run-time functions.
         ///
         /// \sa [EapPeerQueryUIBlobFromInteractiveUIInputFields function](https://msdn.microsoft.com/en-us/library/windows/desktop/bb204696.aspx)
         ///
+        /// \param[in ] dwVersion                     The version number of the API.
+        /// \param[in ] dwFlags                       A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] dwUIContextDataSize           The size of the context data in \p pUIContextData, in bytes.
+        /// \param[in ] pUIContextData                A pointer to a BLOB that contains UI context data, represented as inner pointers to field data. The supplicant obtained these inner pointers from EAPHost run-time APIs.
+        /// \param[in ] pEapInteractiveUIData         Pointer with a structure that contains configuration information for interactive user interface components raised on an EAP supplicant.
+        /// \param[out] pdwDataFromInteractiveUISize  A pointer to a `DWORD` that specifies the size of the buffer pointed to by the \p ppDataFromInteractiveUI parameter, in bytes. If this value is not set to \c 0, then a pointer to a buffer of the size specified in this parameter must be supplied in the \p ppDataFromInteractiveUI parameter.
+        /// \param[out] ppDataFromInteractiveUI       A pointer that receives a credentials BLOB that can be used in authentication. The caller should free the inner pointers using the function \p EapPeerFreeMemory(), starting at the innermost pointer. If a non-NULL value is supplied for this parameter, meaning that an existing data BLOB is passed to it, the supplied data BLOB will be updated and returned in this parameter.
+        ///
         virtual void query_ui_blob_from_interactive_ui_input_fields(
             _In_                                  DWORD                   dwVersion,
             _In_                                  DWORD                   dwFlags,
             _In_                                  DWORD                   dwUIContextDataSize,
             _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
             _In_                            const EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData,
-            _Inout_                               DWORD                   *pdwDataFromInteractiveUISize,
-            _Inout_                               BYTE                    **ppDataFromInteractiveUI) const;
+            _Out_                                 DWORD                   *pdwDataFromInteractiveUISize,
+            _Out_                                 BYTE                    **ppDataFromInteractiveUI) const;
 
         /// \name Session management
         /// @{
@@ -813,6 +881,15 @@ namespace eap
         ///
         /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
         ///
+        /// \param[in] dwFlags                A combination of EAP flags that describe the new EAP authentication session behavior.
+        /// \param[in] pAttributeArray        A pointer to an array structure that specifies the EAP attributes of the entity to authenticate.
+        /// \param[in] hTokenImpersonateUser  Specifies a handle to the user impersonation token to use in this session.
+        /// \param[in] pConnectionData        Connection data specific to this method used to decide the user data returned from this API, where the user data depends on certain connection data configuration. When this parameter is NULL the method implementation should use default values for connection.
+        /// \param[in] dwConnectionDataSize   Specifies the size, in bytes, of the connection data buffer provided in \p pConnectionData.
+        /// \param[in] pUserData              A pointer to a byte buffer that contains the opaque user data BLOB.
+        /// \param[in] dwUserDataSize         Specifies the size in bytes of the user data buffer provided in \p pUserData.
+        /// \param[in] dwMaxSendPacketSize    Specifies the maximum size in bytes of an EAP packet sent during the session. If the method needs to send a packet larger than the maximum size, the method must accommodate fragmentation and reassembly.
+        ///
         /// \returns Session handle
         ///
         virtual EAP_SESSION_HANDLE begin_session(
@@ -830,13 +907,25 @@ namespace eap
         ///
         /// \sa [EapPeerEndSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363604.aspx)
         ///
+        /// \param[in] hSession  A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        ///
         virtual void end_session(_In_ EAP_SESSION_HANDLE hSession) = 0;
 
+        /// @}
+
+        /// \name Packet processing
+        /// @{
+
         ///
         /// Processes a packet received by EapHost from a supplicant.
         ///
         /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
         ///
+        /// \param[in] hSession              A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[in] pReceivedPacket       Received packet data
+        /// \param[in] dwReceivedPacketSize  \p pReceivedPacket size in bytes
+        /// \param[in] pEapOutput            A pointer to a structure that contains the output of the packet process operation.
+        ///
         virtual void process_request_packet(
             _In_                                       EAP_SESSION_HANDLE  hSession,
             _In_bytecount_(dwReceivedPacketSize) const EapPacket           *pReceivedPacket,
@@ -848,20 +937,33 @@ namespace eap
         ///
         /// \sa [EapPeerGetResponsePacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363610.aspx)
         ///
+        /// \param[in   ] hSession           A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[inout] pSendPacket        A pointer to a structure that contains the response packet.
+        /// \param[inout] pdwSendPacketSize  A pointer to a value that contains the size in bytes of the buffer allocated for the response packet. On return, this parameter receives a pointer to the actual size in bytes of \p pSendPacket.
+        ///
         virtual void get_response_packet(
             _In_                               EAP_SESSION_HANDLE hSession,
             _Inout_bytecap_(*dwSendPacketSize) EapPacket          *pSendPacket,
             _Inout_                            DWORD              *pdwSendPacketSize) = 0;
 
+        /// @}
+
         ///
         /// Obtains the result of an authentication session from the EAP method.
         ///
         /// \sa [EapPeerGetResult function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363611.aspx)
         ///
+        /// \param[in ] hSession  A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[in ] reason    The reason code for the authentication result returned in \p pResult.
+        /// \param[out] pResult   A pointer to a structure that contains the authentication results.
+        ///
         virtual void get_result(
-            _In_    EAP_SESSION_HANDLE        hSession,
-            _In_    EapPeerMethodResultReason reason,
-            _Inout_ EapPeerMethodResult       *pResult) = 0;
+            _In_  EAP_SESSION_HANDLE        hSession,
+            _In_  EapPeerMethodResultReason reason,
+            _Out_ EapPeerMethodResult       *pResult) = 0;
+
+        /// \name User Interaction
+        /// @{
 
         ///
         /// Obtains the user interface context from the EAP method.
@@ -870,10 +972,14 @@ namespace eap
         ///
         /// \sa [EapPeerGetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363612.aspx)
         ///
+        /// \param[in ] hSession              A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[out] ppUIContextData       A pointer to an address that contains a byte buffer with the supplicant user interface context data from EAPHost.
+        /// \param[out] pdwUIContextDataSize  A pointer to a value that specifies the size of the user interface context data byte buffer returned in \p ppUIContextData.
+        ///
         virtual void get_ui_context(
-            _In_    EAP_SESSION_HANDLE hSession,
-            _Inout_ BYTE               **ppUIContextData,
-            _Inout_ DWORD              *pdwUIContextDataSize) = 0;
+            _In_  EAP_SESSION_HANDLE hSession,
+            _Out_ BYTE               **ppUIContextData,
+            _Out_ DWORD              *pdwUIContextDataSize) = 0;
 
         ///
         /// Provides a user interface context to the EAP method.
@@ -882,26 +988,43 @@ namespace eap
         ///
         /// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx)
         ///
+        /// \param[in] hSession             A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[in] pUIContextData       A pointer to an address that contains a byte buffer with the new supplicant UI context data to set on EAPHost.
+        /// \param[in] dwUIContextDataSize  \p pUIContextData size in bytes
+        /// \param[in] pEapOutput           A pointer to a structure that contains the output of the packet process operation.
+        ///
         virtual void set_ui_context(
             _In_                                  EAP_SESSION_HANDLE  hSession,
             _In_count_(dwUIContextDataSize) const BYTE                *pUIContextData,
             _In_                                  DWORD               dwUIContextDataSize,
             _Out_                                 EapPeerMethodOutput *pEapOutput) = 0;
 
+        /// @}
+
+        /// \name EAP Response Attributes
+        /// @{
+
         ///
         /// Obtains an array of EAP response attributes from the EAP method.
         ///
         /// \sa [EapPeerGetResponseAttributes function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363609.aspx)
         ///
+        /// \param[in ] hSession  A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[out] pAttribs  A pointer to a structure that contains an array of EAP authentication response attributes for the supplicant.
+        ///
         virtual void get_response_attributes(
-            _In_    EAP_SESSION_HANDLE hSession,
-            _Inout_ EapAttributes      *pAttribs) = 0;
+            _In_  EAP_SESSION_HANDLE hSession,
+            _Out_ EapAttributes      *pAttribs) = 0;
 
         ///
         /// Provides an updated array of EAP response attributes to the EAP method.
         ///
         /// \sa [EapPeerSetResponseAttributes function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363625.aspx)
         ///
+        /// \param[in] hSession    A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[in] pAttribs    A pointer to a structure that contains an array of new EAP authentication response attributes to set for the supplicant on EAPHost.
+        /// \param[in] pEapOutput  A pointer to a structure that contains the output of the packet process operation.
+        ///
         virtual void set_response_attributes(
             _In_       EAP_SESSION_HANDLE  hSession,
             _In_ const EapAttributes       *pAttribs,
@@ -909,4 +1032,6 @@ namespace eap
 
         /// @}
     };
+
+    /// @}
 }

lib/EAPBase/include/UIContext.h

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

lib/EAPBase/src/Config.cpp

@@ -77,24 +77,6 @@ void eap::config::load(_In_ IXMLDOMNode *pConfigRoot)
 }
 
 
-void eap::config::operator<<(_Inout_ cursor_out &cursor) const
-{
-    UNREFERENCED_PARAMETER(cursor);
-}
-
-
-size_t eap::config::get_pk_size() const
-{
-    return 0;
-}
-
-
-void eap::config::operator>>(_Inout_ cursor_in &cursor)
-{
-    UNREFERENCED_PARAMETER(cursor);
-}
-
-
 const bstr eap::config::namespace_eapmetadata(L"urn:ietf:params:xml:ns:yang:ietf-eap-metadata");
 
 

lib/EAPBase/src/Credentials.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2018 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -159,7 +159,184 @@ tstring eap::credentials::get_name() const
     tstring identity(std::move(get_identity()));
     return
         !identity.empty() ? identity :
-        empty()           ? _T("<empty>") : _T("<blank ID>");
+        empty()           ? _T("(empty)") : _T("(blank ID)");
+}
+
+
+//////////////////////////////////////////////////////////////////////
+// eap::credentials_identity
+//////////////////////////////////////////////////////////////////////
+
+eap::credentials_identity::credentials_identity(_In_ module &mod) : credentials(mod)
+{
+}
+
+
+eap::credentials_identity::credentials_identity(_In_ const credentials_identity &other) : credentials(other)
+{
+}
+
+
+eap::credentials_identity::credentials_identity(_Inout_ credentials_identity &&other) : credentials(std::move(other))
+{
+}
+
+
+eap::credentials_identity& eap::credentials_identity::operator=(_In_ const credentials_identity &other)
+{
+    if (this != &other)
+        (credentials&)*this = other;
+
+    return *this;
+}
+
+
+eap::credentials_identity& eap::credentials_identity::operator=(_Inout_ credentials_identity &&other)
+{
+    if (this != &other)
+        (credentials&)*this = std::move(other);
+
+    return *this;
+}
+
+
+eap::config* eap::credentials_identity::clone() const
+{
+    return new credentials_identity(*this);
+}
+
+
+void eap::credentials_identity::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
+{
+    assert(pDoc);
+    assert(pConfigRoot);
+
+    // We could have used credentials::save() to save identity,
+    // but that method tolerates absence of <UserName> element,
+    // whereas for this class the absence of <UserName> is fatal.
+    config::save(pDoc, pConfigRoot);
+
+    HRESULT hr;
+
+    // <UserName>
+    if (FAILED(hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"UserName"), namespace_eapmetadata, bstr(m_identity))))
+        throw com_runtime_error(hr, __FUNCTION__ " Error creating <UserName> element.");
+}
+
+
+void eap::credentials_identity::load(_In_ IXMLDOMNode *pConfigRoot)
+{
+    assert(pConfigRoot);
+    HRESULT hr;
+
+    // We could have used credentials::load() to load identity,
+    // but that method tolerates absence of <UserName> element,
+    // whereas for this class the absence of <UserName> is fatal.
+    config::load(pConfigRoot);
+
+    wstring xpath(eapxml::get_xpath(pConfigRoot));
+
+    if (FAILED(hr = eapxml::get_element_value(pConfigRoot, bstr(L"eap-metadata:UserName"), m_identity)))
+        throw com_runtime_error(hr, __FUNCTION__ " Error reading <UserName> element.");
+
+    m_module.log_config((xpath + L"/UserName").c_str(), m_identity.c_str());
+}
+
+
+void eap::credentials_identity::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const
+{
+    assert(pszTargetName);
+
+    tstring target(target_name(pszTargetName, level));
+
+    // Write credentials.
+    assert(m_identity.length() < CRED_MAX_USERNAME_LENGTH);
+    CREDENTIAL cred = {
+        0,                                     // Flags
+        CRED_TYPE_GENERIC,                     // Type
+        const_cast<LPTSTR>(target.c_str()),    // TargetName
+        _T(""),                                // Comment
+        { 0, 0 },                              // LastWritten
+        0,                                     // CredentialBlobSize
+        NULL,                                  // CredentialBlob
+        CRED_PERSIST_ENTERPRISE,               // Persist
+        0,                                     // AttributeCount
+        NULL,                                  // Attributes
+        NULL,                                  // TargetAlias
+        const_cast<LPTSTR>(m_identity.c_str()) // UserName
+    };
+    if (!CredWrite(&cred, 0))
+        throw win_runtime_error(__FUNCTION__ " CredWrite failed.");
+}
+
+
+void eap::credentials_identity::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level)
+{
+    assert(pszTargetName);
+
+    // Read credentials.
+    unique_ptr<CREDENTIAL, CredFree_delete<CREDENTIAL> > cred;
+    if (!CredRead(target_name(pszTargetName, level).c_str(), CRED_TYPE_GENERIC, 0, (PCREDENTIAL*)&cred))
+        throw win_runtime_error(__FUNCTION__ " CredRead failed.");
+
+    if (cred->UserName)
+        m_identity = cred->UserName;
+    else
+        m_identity.clear();
+
+    wstring xpath(pszTargetName);
+    m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str());
+}
+
+
+LPCTSTR eap::credentials_identity::target_suffix() const
+{
+    return _T("id");
+}
+
+
+eap::credentials::source_t eap::credentials_identity::combine(
+    _In_             DWORD         dwFlags,
+    _In_             HANDLE        hTokenImpersonateUser,
+    _In_opt_   const credentials   *cred_cached,
+    _In_       const config_method &cfg,
+    _In_opt_z_       LPCTSTR       pszTargetName)
+{
+    UNREFERENCED_PARAMETER(dwFlags);
+
+    if (cred_cached) {
+        // Using EAP service cached credentials.
+        *this = *dynamic_cast<const credentials_identity*>(cred_cached);
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
+        return source_cache;
+    }
+
+    auto cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg);
+    if (cfg_with_cred && cfg_with_cred->m_use_cred) {
+        // Using configured credentials.
+        *this = *dynamic_cast<const credentials_identity*>(cfg_with_cred->m_cred.get());
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
+        return source_config;
+    }
+
+    if (pszTargetName) {
+        // Switch user context.
+        user_impersonator impersonating(hTokenImpersonateUser);
+
+        try {
+            credentials_identity cred_loaded(m_module);
+            cred_loaded.retrieve(pszTargetName, cfg.m_level);
+
+            // Using stored credentials.
+            *this = std::move(cred_loaded);
+            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
+            return source_storage;
+        } catch (...) {
+            // Not actually an error.
+        }
+    }
+
+    return source_unknown;
 }
 
 
@@ -425,32 +602,40 @@ LPCTSTR eap::credentials_pass::target_suffix() const
 
 
 eap::credentials::source_t eap::credentials_pass::combine(
-    _In_       const credentials             *cred_cached,
-    _In_       const config_method_with_cred &cfg,
-    _In_opt_z_       LPCTSTR                 pszTargetName)
+    _In_             DWORD         dwFlags,
+    _In_             HANDLE        hTokenImpersonateUser,
+    _In_opt_   const credentials   *cred_cached,
+    _In_       const config_method &cfg,
+    _In_opt_z_       LPCTSTR       pszTargetName)
 {
+    UNREFERENCED_PARAMETER(dwFlags);
+
     if (cred_cached) {
         // Using EAP service cached credentials.
         *this = *dynamic_cast<const credentials_pass*>(cred_cached);
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank);
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
         return source_cache;
     }
 
-    if (cfg.m_use_cred) {
+    auto cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg);
+    if (cfg_with_cred && cfg_with_cred->m_use_cred) {
         // Using configured credentials.
-        *this = *dynamic_cast<const credentials_pass*>(cfg.m_cred.get());
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank);
+        *this = *dynamic_cast<const credentials_pass*>(cfg_with_cred->m_cred.get());
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
         return source_config;
     }
 
     if (pszTargetName) {
+        // Switch user context.
+        user_impersonator impersonating(hTokenImpersonateUser);
+
         try {
             credentials_pass cred_loaded(m_module);
             cred_loaded.retrieve(pszTargetName, cfg.m_level);
 
             // Using stored credentials.
             *this = std::move(cred_loaded);
-            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank);
+            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
             return source_storage;
         } catch (...) {
             // Not actually an error.
@@ -461,6 +646,7 @@ eap::credentials::source_t eap::credentials_pass::combine(
 }
 
 
+/// \cond internal
 const unsigned char eap::credentials_pass::s_entropy[1024] = {
     0x40, 0x88, 0xd3, 0x13, 0x81, 0x8a, 0xf6, 0x74, 0x55, 0x8e, 0xcc, 0x73, 0x2c, 0xf8, 0x93, 0x37,
     0x4f, 0xeb, 0x1d, 0x66, 0xb7, 0xfb, 0x47, 0x75, 0xb4, 0xfd, 0x07, 0xbb, 0xf6, 0xb3, 0x05, 0x30,
@@ -527,6 +713,7 @@ const unsigned char eap::credentials_pass::s_entropy[1024] = {
     0x30, 0x29, 0x39, 0x9a, 0xd6, 0xab, 0x2e, 0xc6, 0x42, 0x47, 0x5e, 0x54, 0xbb, 0x90, 0xe6, 0x98,
     0xe6, 0x52, 0x58, 0x58, 0x1e, 0xd0, 0x00, 0x9c, 0x8f, 0x4a, 0x17, 0x7e, 0x8a, 0x5a, 0xef, 0x3e,
 };
+/// \endcond
 
 
 //////////////////////////////////////////////////////////////////////
@@ -651,8 +838,7 @@ void eap::credentials_connection::load(_In_ IXMLDOMNode *pConfigRoot)
                 // Matching provider found. Create matching blank credential set, then load.
                 if (cfg_prov->m_methods.empty())
                     throw invalid_argument(string_printf(__FUNCTION__ " %ls provider has no methods.", cfg_prov->get_id().c_str()));
-                const config_method_with_cred *cfg_method = dynamic_cast<const config_method_with_cred*>(cfg_prov->m_methods.front().get());
-                m_cred.reset(cfg_method->make_credentials());
+                m_cred.reset(cfg_prov->m_methods.front().get()->make_credentials());
                 m_cred->load(pXmlElClientSideCredential);
                 break;
             }
@@ -694,8 +880,7 @@ void eap::credentials_connection::operator>>(_Inout_ cursor_in &cursor)
                 // Matching provider found. Create matching blank credential set, then read.
                 if (cfg_prov->m_methods.empty())
                     throw invalid_argument(string_printf(__FUNCTION__ " %ls provider has no methods.", cfg_prov->get_id().c_str()));
-                const config_method_with_cred *cfg_method = dynamic_cast<const config_method_with_cred*>(cfg_prov->m_methods.front().get());
-                m_cred.reset(cfg_method->make_credentials());
+                m_cred.reset(cfg_prov->m_methods.front().get()->make_credentials());
                 cursor >> *m_cred;
                 break;
             }
@@ -734,8 +919,8 @@ inline static basic_string<_Elem, _Traits, _Ax> kph_encode(_In_ unsigned char da
 {
     // Encode one byte of data.
     _Elem str[3] = {
-        'A' + (data >> 4       ),
-        'a' + (data      & 0x0f),
+        static_cast<_Elem>('A' + (data >> 4       )),
+        static_cast<_Elem>('a' + (data      & 0x0f)),
     };
     return str;
 } 

lib/EAPBase/src/EAP.cpp

@@ -20,64 +20,106 @@
 
 #include "StdAfx.h"
 
+#pragma comment(lib, "Ws2_32.lib")
+
 using namespace std;
 using namespace winstd;
 
 
 //////////////////////////////////////////////////////////////////////
-// eap::packet
+// eap::packable
 //////////////////////////////////////////////////////////////////////
 
-eap::packet::packet() :
-    m_code((EapCode)0),
-    m_id(0)
+eap::packable::packable()
 {
 }
 
 
-eap::packet::packet(_In_ const packet &other) :
-    m_code(other.m_code),
-    m_id  (other.m_id  ),
-    m_data(other.m_data)
+void eap::packable::operator<<(_Inout_ cursor_out &cursor) const
 {
+    UNREFERENCED_PARAMETER(cursor);
 }
 
 
-eap::packet::packet(_Inout_ packet &&other) :
-    m_code(std::move(other.m_code)),
-    m_id  (std::move(other.m_id  )),
-    m_data(std::move(other.m_data))
+size_t eap::packable::get_pk_size() const
 {
+    return 0;
 }
 
 
-eap::packet& eap::packet::operator=(_In_ const packet &other)
+void eap::packable::operator>>(_Inout_ cursor_in &cursor)
 {
-    if (this != std::addressof(other)) {
-        m_code = other.m_code;
-        m_id   = other.m_id  ;
-        m_data = other.m_data;
-    }
-
-    return *this;
+    UNREFERENCED_PARAMETER(cursor);
 }
 
 
-eap::packet& eap::packet::operator=(_Inout_ packet &&other)
-{
-    if (this != std::addressof(other)) {
-        m_code = std::move(other.m_code);
-        m_id   = std::move(other.m_id  );
-        m_data = std::move(other.m_data);
-    }
+//////////////////////////////////////////////////////////////////////
+// eap::diameter_avp_append
+//////////////////////////////////////////////////////////////////////
 
-    return *this;
+void eap::diameter_avp_append(
+    _In_                       unsigned int    code,
+    _In_                       unsigned char   flags,
+    _In_bytecount_(size) const void            *data,
+    _In_                       unsigned int    size,
+    _Inout_                    sanitizing_blob &packet)
+{
+    unsigned int
+        padding = (unsigned int)((4 - size) % 4),
+        size_outer;
+
+    packet.reserve(
+        packet.size() + 
+        (size_outer = 
+        sizeof(diameter_avp_header) + // Diameter header
+        size)                       + // Data
+        padding);                     // Data padding
+
+    // Diameter AVP header
+    diameter_avp_header hdr;
+    *reinterpret_cast<unsigned int*>(hdr.code) = htonl(code);
+    hdr.flags = flags;
+    hton24(size_outer, hdr.length);
+    packet.insert(packet.end(), reinterpret_cast<const unsigned char*>(&hdr), reinterpret_cast<const unsigned char*>(&hdr + 1));
+
+    // Data
+    packet.insert(packet.end(), reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + size);
+    packet.insert(packet.end(), padding, 0);
 }
 
 
-void eap::packet::clear()
+//////////////////////////////////////////////////////////////////////
+// eap::diameter_avp_append
+//////////////////////////////////////////////////////////////////////
+
+void eap::diameter_avp_append(
+    _In_                       unsigned int    code,
+    _In_                       unsigned int    vendor_id,
+    _In_                       unsigned char   flags,
+    _In_bytecount_(size) const void            *data,
+    _In_                       unsigned int    size,
+    _Inout_                    sanitizing_blob &packet)
 {
-    m_code = (EapCode)0;
-    m_id   = 0;
-    m_data.clear();
+    unsigned int
+        padding = (unsigned int)((4 - size) % 4),
+        size_outer;
+
+    packet.reserve(
+        packet.size() + 
+        (size_outer = 
+        sizeof(diameter_avp_header_ven) + // Diameter header
+        size)                           + // Data
+        padding);                         // Data padding
+
+    // Diameter AVP header
+    diameter_avp_header_ven hdr;
+    *reinterpret_cast<unsigned int*>(hdr.code) = htonl(code);
+    hdr.flags = flags | diameter_avp_flag_vendor;
+    hton24(size_outer, hdr.length);
+    *reinterpret_cast<unsigned int*>(hdr.vendor) = htonl(vendor_id);
+    packet.insert(packet.end(), reinterpret_cast<const unsigned char*>(&hdr), reinterpret_cast<const unsigned char*>(&hdr + 1));
+
+    // Data
+    packet.insert(packet.end(), reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + size);
+    packet.insert(packet.end(), padding, 0);
 }

lib/EAPBase/src/Method.cpp

@@ -28,19 +28,14 @@ using namespace winstd;
 // eap::method
 //////////////////////////////////////////////////////////////////////
 
-eap::method::method(_In_ module &module, _In_ config_method &cfg, _In_ credentials &cred) :
-    m_module(module),
-    m_cfg(cfg),
-    m_cred(cred)
+eap::method::method(_In_ module &mod) :
+    m_module(mod)
 {
 }
 
 
 eap::method::method(_Inout_ method &&other) :
-    m_module  (          other.m_module   ),
-    m_cfg     (          other.m_cfg      ),
-    m_cred    (          other.m_cred     ),
-    m_eap_attr(std::move(other.m_eap_attr))
+    m_module(other.m_module)
 {
 }
 
@@ -49,9 +44,6 @@ eap::method& eap::method::operator=(_Inout_ method &&other)
 {
     if (this != std::addressof(other)) {
         assert(std::addressof(m_module) == std::addressof(other.m_module)); // Move method within same module only!
-        assert(std::addressof(m_cfg   ) == std::addressof(other.m_cfg   )); // Move method with same configuration only!
-        assert(std::addressof(m_cred  ) == std::addressof(other.m_cred  )); // Move method with same credentials only!
-        m_eap_attr = std::move(other.m_eap_attr);
     }
 
     return *this;
@@ -68,11 +60,6 @@ void eap::method::begin_session(
     UNREFERENCED_PARAMETER(pAttributeArray);
     UNREFERENCED_PARAMETER(hTokenImpersonateUser);
     UNREFERENCED_PARAMETER(dwMaxSendPacketSize);
-
-    // Presume authentication will fail with generic protocol failure. (Pesimist!!!)
-    // We will reset once we get get_result(Success) call.
-    m_cfg.m_last_status = config_method::status_auth_failed;
-    m_cfg.m_last_msg.clear();
 }
 
 
@@ -85,123 +72,282 @@ void eap::method::get_result(
     _In_    EapPeerMethodResultReason reason,
     _Inout_ EapPeerMethodResult       *pResult)
 {
-    assert(pResult);
+    UNREFERENCED_PARAMETER(reason);
+    UNREFERENCED_PARAMETER(pResult);
+}
 
-    switch (reason) {
-    case EapPeerMethodResultSuccess: {
-        m_module.log_event(&EAPMETHOD_METHOD_SUCCESS, event_data((unsigned int)m_cfg.get_method_id()), event_data::blank);
-        m_cfg.m_last_status  = config_method::status_success;
-        break;
-    }
 
-    case EapPeerMethodResultFailure:
-        m_module.log_event(&EAPMETHOD_METHOD_FAILURE_ERROR2, event_data((unsigned int)m_cfg.get_method_id()), event_data((unsigned int)m_cfg.m_last_status), event_data::blank);
-        break;
+void eap::method::get_ui_context(_Out_ sanitizing_blob &context_data)
+{
+    // Default implementation returns blank context data.
+    context_data.clear();
+}
 
-    default:
-        throw win_runtime_error(ERROR_NOT_SUPPORTED, __FUNCTION__ " Not supported.");
-    }
 
-    // Always ask EAP host to save the connection data. And it will save it *only* when we report "success".
-    // Don't worry. EapHost is well aware of failed authentication condition.
-    pResult->fSaveConnectionData = TRUE;
-    pResult->fIsSuccess          = TRUE;
+EapPeerMethodResponseAction eap::method::set_ui_context(
+    _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+    _In_                                  DWORD dwUIContextDataSize)
+{
+    UNREFERENCED_PARAMETER(pUIContextData);
+    UNREFERENCED_PARAMETER(dwUIContextDataSize);
+
+    // Default implementation does nothing with context data.
+    return EapPeerMethodResponseActionNone;
+}
+
+
+void eap::method::get_response_attributes(_Inout_ EapAttributes *pAttribs)
+{
+    assert(pAttribs);
+
+    // Default implementation returns no EAP attributes.
+    pAttribs->dwNumberOfAttributes = 0;
+    pAttribs->pAttribs             = NULL;
+}
+
+
+EapPeerMethodResponseAction eap::method::set_response_attributes(_In_ const EapAttributes *pAttribs)
+{
+    UNREFERENCED_PARAMETER(pAttribs);
+
+    // Default implementation does nothing with EAP attributes.
+    return EapPeerMethodResponseActionNone;
 }
 
 
 //////////////////////////////////////////////////////////////////////
-// eap::method_noneap
+// eap::method_tunnel
 //////////////////////////////////////////////////////////////////////
 
-eap::method_noneap::method_noneap(_In_ module &module, _In_ config_method &cfg, _In_ credentials &cred) : method(module, cfg, cred)
+eap::method_tunnel::method_tunnel(_In_ module &mod, _In_ method *inner) :
+    m_inner(inner),
+    method(mod)
 {
 }
 
 
-eap::method_noneap::method_noneap(_Inout_ method_noneap &&other) :
-    m_packet_res(std::move(other.m_packet_res)),
-    method      (std::move(other             ))
+eap::method_tunnel::method_tunnel(_Inout_ method_tunnel &&other) :
+    m_inner(std::move(other.m_inner)),
+    method (std::move(other        ))
 {
 }
 
 
-eap::method_noneap& eap::method_noneap::operator=(_Inout_ method_noneap &&other)
+eap::method_tunnel& eap::method_tunnel::operator=(_Inout_ method_tunnel &&other)
 {
     if (this != std::addressof(other)) {
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move method with same credentials only!
-        (method&)*this = std::move(other             );
-        m_packet_res   = std::move(other.m_packet_res);
+        (method&)*this = std::move(other        );
+        m_inner        = std::move(other.m_inner);
     }
 
     return *this;
 }
 
 
-void eap::method_noneap::get_response_packet(
-    _Inout_bytecap_(*dwSendPacketSize) void  *pSendPacket,
-    _Inout_                            DWORD *pdwSendPacketSize)
+void eap::method_tunnel::begin_session(
+    _In_        DWORD         dwFlags,
+    _In_  const EapAttributes *pAttributeArray,
+    _In_        HANDLE        hTokenImpersonateUser,
+    _In_opt_    DWORD         dwMaxSendPacketSize)
 {
-    assert(pdwSendPacketSize);
-    assert(pSendPacket);
+    method::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
 
-    size_t size_packet = m_packet_res.size();
-    if (size_packet > *pdwSendPacketSize)
-        throw invalid_argument(string_printf(__FUNCTION__ " This method does not support packet fragmentation, but the data size is too big to fit in one packet (packet: %u, maximum: %u).", size_packet, *pdwSendPacketSize));
-
-    memcpy(pSendPacket, m_packet_res.data(), size_packet);
-    *pdwSendPacketSize = (DWORD)size_packet;
-    m_packet_res.clear();
+    assert(m_inner);
+    m_inner->begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
 }
 
 
-void eap::method_noneap::append_avp(_In_ unsigned int code, _In_ unsigned char flags, _In_bytecount_(size) const void *data, _In_ unsigned int size)
+void eap::method_tunnel::end_session()
 {
-    unsigned int
-        padding = (unsigned int)((4 - size) % 4),
-        size_outer;
+    assert(m_inner);
+    m_inner->end_session();
 
-    m_packet_res.reserve(
-        m_packet_res.size() + 
-        (size_outer = 
-        sizeof(diameter_avp_header) + // Diameter header
-        size)                       + // Data
-        padding);                     // Data padding
-
-    // Diameter AVP header
-    diameter_avp_header hdr;
-    *reinterpret_cast<unsigned int*>(hdr.code) = htonl(code);
-    hdr.flags = flags;
-    hton24(size_outer, hdr.length);
-    m_packet_res.insert(m_packet_res.end(), reinterpret_cast<const unsigned char*>(&hdr), reinterpret_cast<const unsigned char*>(&hdr + 1));
-
-    // Data
-    m_packet_res.insert(m_packet_res.end(), reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + size);
-    m_packet_res.insert(m_packet_res.end(), padding, 0);
+    method::end_session();
 }
 
 
-void eap::method_noneap::append_avp(_In_ unsigned int code, _In_ unsigned int vendor_id, _In_ unsigned char flags, _In_bytecount_(size) const void *data, _In_ unsigned int size)
+EapPeerMethodResponseAction eap::method_tunnel::process_request_packet(
+    _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+    _In_                                       DWORD dwReceivedPacketSize)
 {
-    unsigned int
-        padding = (unsigned int)((4 - size) % 4),
-        size_outer;
-
-    m_packet_res.reserve(
-        m_packet_res.size() + 
-        (size_outer = 
-        sizeof(diameter_avp_header_ven) + // Diameter header
-        size)                           + // Data
-        padding);                         // Data padding
-
-    // Diameter AVP header
-    diameter_avp_header_ven hdr;
-    *reinterpret_cast<unsigned int*>(hdr.code) = htonl(code);
-    hdr.flags = flags | diameter_avp_flag_vendor;
-    hton24(size_outer, hdr.length);
-    *reinterpret_cast<unsigned int*>(hdr.vendor) = htonl(vendor_id);
-    m_packet_res.insert(m_packet_res.end(), reinterpret_cast<const unsigned char*>(&hdr), reinterpret_cast<const unsigned char*>(&hdr + 1));
-
-    // Data
-    m_packet_res.insert(m_packet_res.end(), reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + size);
-    m_packet_res.insert(m_packet_res.end(), padding, 0);
+    assert(m_inner);
+    return m_inner->process_request_packet(pReceivedPacket, dwReceivedPacketSize);
+}
+
+
+void eap::method_tunnel::get_response_packet(
+    _Out_    sanitizing_blob &packet,
+    _In_opt_ DWORD           size_max)
+{
+    assert(m_inner);
+    m_inner->get_response_packet(packet, size_max);
+}
+
+
+void eap::method_tunnel::get_result(
+    _In_    EapPeerMethodResultReason reason,
+    _Inout_ EapPeerMethodResult       *pResult)
+{
+    assert(m_inner);
+    m_inner->get_result(reason, pResult);
+}
+
+
+void eap::method_tunnel::get_ui_context(_Out_ sanitizing_blob &context_data)
+{
+    assert(m_inner);
+
+    // Default implementation forwards UI context handling to the inner method.
+    m_inner->get_ui_context(context_data);
+}
+
+
+EapPeerMethodResponseAction eap::method_tunnel::set_ui_context(
+    _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+    _In_                                  DWORD dwUIContextDataSize)
+{
+    assert(m_inner);
+
+    // Default implementation forwards UI context handling to the inner method.
+    return m_inner->set_ui_context(pUIContextData, dwUIContextDataSize);
+}
+
+
+void eap::method_tunnel::get_response_attributes(_Inout_ EapAttributes *pAttribs)
+{
+    assert(m_inner);
+    m_inner->get_response_attributes(pAttribs);
+}
+
+
+EapPeerMethodResponseAction eap::method_tunnel::set_response_attributes(_In_ const EapAttributes *pAttribs)
+{
+    assert(m_inner);
+    return m_inner->set_response_attributes(pAttribs);
+}
+
+
+//////////////////////////////////////////////////////////////////////
+// eap::method_eap
+//////////////////////////////////////////////////////////////////////
+
+eap::method_eap::method_eap(_In_ module &mod, _In_ winstd::eap_type_t eap_method, _In_ method *inner) :
+    m_eap_method(eap_method),
+    m_id(0),
+    m_send_nak(false),
+    method_tunnel(mod, inner)
+{
+}
+
+
+eap::method_eap::method_eap(_Inout_ method_eap &&other) :
+    m_eap_method (std::move(other.m_eap_method)),
+    m_id         (std::move(other.m_id        )),
+    m_send_nak   (std::move(other.m_send_nak  )),
+    method_tunnel(std::move(other             ))
+{
+}
+
+
+eap::method_eap& eap::method_eap::operator=(_Inout_ method_eap &&other)
+{
+    if (this != std::addressof(other)) {
+        assert(m_eap_method == other.m_eap_method); // Move method within same EAP method type only!
+        (method_tunnel&)*this = std::move(other           );
+        m_id                  = std::move(other.m_id      );
+        m_send_nak            = std::move(other.m_send_nak);
+    }
+
+    return *this;
+}
+
+
+void eap::method_eap::begin_session(
+    _In_        DWORD         dwFlags,
+    _In_  const EapAttributes *pAttributeArray,
+    _In_        HANDLE        hTokenImpersonateUser,
+    _In_opt_    DWORD         dwMaxSendPacketSize)
+{
+    // Initialize tunnel method session only.
+    method::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
+
+    // Inner method can generate packets of up to 64kB (less the EAP packet header).
+    // Initialize inner method with appropriately less packet size maximum.
+    if (dwMaxSendPacketSize < sizeof(EapPacket))
+        throw invalid_argument(string_printf(__FUNCTION__ " Maximum packet size too small (minimum: %u, available: %u).", sizeof(EapPacket) + 1, dwMaxSendPacketSize));
+    assert(m_inner);
+    m_inner->begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, std::min<DWORD>(dwMaxSendPacketSize, MAXWORD) - sizeof(EapPacket));
+}
+
+
+EapPeerMethodResponseAction eap::method_eap::process_request_packet(
+    _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+    _In_                                       DWORD dwReceivedPacketSize)
+{
+    assert(dwReceivedPacketSize >= sizeof(EapPacket)); // Request packet should contain an EAP packet header at least.
+    auto hdr = reinterpret_cast<const EapPacket*>(pReceivedPacket);
+
+    // This must be an EAP-Request packet.
+    if (hdr->Code != EapCodeRequest)
+        throw invalid_argument(string_printf(__FUNCTION__ " Unknown EAP packet received (expected: %u, received: %u).", EapCodeRequest, (int)hdr->Code));
+
+    // Check packet size.
+    DWORD size_packet = ntohs(*reinterpret_cast<const unsigned short*>(hdr->Length));
+    if (size_packet > dwReceivedPacketSize)
+        throw invalid_argument(string_printf(__FUNCTION__ " Incorrect EAP packet length (expected: %uB, received: %uB).", size_packet, dwReceivedPacketSize));
+
+    // Save request packet ID to make matching response packet in get_response_packet() later.
+    m_id = hdr->Id;
+
+    if (hdr->Data[0] != m_eap_method) {
+        // Unsupported EAP method. Respond with Legacy Nak.
+        m_send_nak = true;
+        return EapPeerMethodResponseActionSend;
+    } else {
+        // Process the data with underlying method.
+        m_send_nak = false;
+        return method_tunnel::process_request_packet(hdr->Data + 1, size_packet - sizeof(EapPacket));
+    }
+}
+
+
+void eap::method_eap::get_response_packet(
+    _Out_    sanitizing_blob &packet,
+    _In_opt_ DWORD           size_max)
+{
+    assert(size_max >= sizeof(EapPacket)); // We should be able to respond with at least an EAP packet header.
+    if (size_max > MAXWORD) size_max = MAXWORD; // EAP packets maximum size is 64kB.
+
+    // Prepare EAP packet header.
+    EapPacket hdr;
+    hdr.Code = (BYTE)EapCodeResponse;
+    hdr.Id = m_id;
+
+    if (!m_send_nak) {
+        hdr.Data[0] = m_eap_method;
+
+        packet.reserve(size_max); // To avoid reallocation when inserting EAP packet header later.
+
+        // Get data from underlying method.
+        method_tunnel::get_response_packet(packet, size_max - sizeof(EapPacket));
+    } else {
+        // Respond with Legacy Nak suggesting our EAP method to continue.
+        hdr.Data[0] = eap_type_nak;
+
+        // Check packet size. We will suggest one EAP method alone, so we need one byte for data.
+        size_t size_packet = sizeof(EapPacket) + 1;
+        if (size_packet > size_max)
+            throw invalid_argument(string_printf(__FUNCTION__ " This method does not support packet fragmentation, but the data size is too big to fit in one packet (packet: %u, maximum: %u).", size_packet, size_max));
+        packet.reserve(size_packet); // To avoid reallocation when inserting EAP packet header later.
+
+        // Data of Legacy Nak packet is a list of supported EAP types: our method alone.
+        packet.assign(1, m_eap_method);
+    }
+
+    size_t size_packet = packet.size() + sizeof(EapPacket);
+    assert(size_packet <= MAXWORD); // Packets spanning over 64kB are not supported.
+    *reinterpret_cast<unsigned short*>(hdr.Length) = htons((unsigned short)size_packet);
+
+    // Insert EAP packet header before data.
+    packet.insert(packet.begin(), reinterpret_cast<const unsigned char*>(&hdr), reinterpret_cast<const unsigned char*>(&hdr + 1));
 }

lib/EAPBase/src/Module.cpp

@@ -90,6 +90,12 @@ EAP_ERROR* eap::module::make_error(_In_ std::exception &err) const
     wstring what;
     MultiByteToWideChar(CP_ACP, 0, err.what(), -1, what);
 
+    {
+        eap_runtime_error *e = dynamic_cast<eap_runtime_error*>(&err);
+        if (e)
+            return make_error(e->number(), e->root_cause(), e->repair(), e->reason(), &e->root_cause_id(), &e->repair_id(), &e->help_link_id());
+    }
+
     {
         win_runtime_error *e = dynamic_cast<win_runtime_error*>(&err);
         if (e)
@@ -122,6 +128,19 @@ EAP_ERROR* eap::module::make_error(_In_ std::exception &err) const
 }
 
 
+EAP_ERROR* eap::module::make_error(_In_ const EAP_ERROR *err) const
+{
+    return make_error(
+        err->dwWinError,
+        err->pRootCauseString,
+        err->pRepairString,
+        err->dwReasonCode,
+        &(err->rootCauseGuid),
+        &(err->repairGuid),
+        &(err->helpLinkGuid));
+}
+
+
 BYTE* eap::module::alloc_memory(_In_ size_t size)
 {
     BYTE *p = (BYTE*)HeapAlloc(m_heap, 0, size);
@@ -251,7 +270,7 @@ void eap::peer::query_credential_input_fields(
     _In_                                   DWORD                        dwFlags,
     _In_                                   DWORD                        dwConnectionDataSize,
     _In_count_(dwConnectionDataSize) const BYTE                         *pConnectionData,
-    _Inout_                                EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray) const
+    _Out_                                  EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray) const
 {
     UNREFERENCED_PARAMETER(hUserImpersonationToken);
     UNREFERENCED_PARAMETER(dwFlags);
@@ -269,8 +288,8 @@ void eap::peer::query_user_blob_from_credential_input_fields(
     _In_                                   DWORD                        dwConnectionDataSize,
     _In_count_(dwConnectionDataSize) const BYTE                         *pConnectionData,
     _In_                             const EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldArray,
-    _Inout_                                DWORD                        *pdwUsersBlobSize,
-    _Inout_                                BYTE                         **ppUserBlob) const
+    _Out_                                  DWORD                        *pdwUsersBlobSize,
+    _Out_                                  BYTE                         **ppUserBlob) const
 {
     UNREFERENCED_PARAMETER(hUserImpersonationToken);
     UNREFERENCED_PARAMETER(dwFlags);
@@ -289,7 +308,7 @@ void eap::peer::query_interactive_ui_input_fields(
     _In_                                  DWORD                   dwFlags,
     _In_                                  DWORD                   dwUIContextDataSize,
     _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
-    _Inout_                               EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData) const
+    _Out_                                 EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData) const
 {
     UNREFERENCED_PARAMETER(dwVersion);
     UNREFERENCED_PARAMETER(dwFlags);
@@ -307,8 +326,8 @@ void eap::peer::query_ui_blob_from_interactive_ui_input_fields(
     _In_                                  DWORD                   dwUIContextDataSize,
     _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
     _In_                            const EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData,
-    _Inout_                               DWORD                   *pdwDataFromInteractiveUISize,
-    _Inout_                               BYTE                    **ppDataFromInteractiveUI) const
+    _Out_                                 DWORD                   *pdwDataFromInteractiveUISize,
+    _Out_                                 BYTE                    **ppDataFromInteractiveUI) const
 {
     UNREFERENCED_PARAMETER(dwVersion);
     UNREFERENCED_PARAMETER(dwFlags);

lib/EAPBase/src/StdAfx.h

@@ -24,6 +24,7 @@
 #include "../include/Credentials.h"
 #include "../include/Method.h"
 #include "../include/Module.h"
+#include "../include/UIContext.h"
 
 #include "../include/EAP.h"
 #include "../include/EAPXML.h"