Version set to 1.0-beta8

.gitignore

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

CredWrite/CredWrite.props

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

CredWrite/CredWrite.vcxproj

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -30,92 +22,76 @@
     <ProjectGuid>{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CredWrite</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
+    <Import Project="CredWrite.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
+    <Import Project="CredWrite.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
+    <Import Project="CredWrite.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
+    <Import Project="CredWrite.props" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
   <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>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <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="PCH.h" />
+    <ClInclude Include="StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
-    <ClCompile Include="PCH.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
+    <ClCompile Include="StdAfx.cpp">
+      <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)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -134,7 +110,7 @@
     <ProjectReference Include="..\lib\TLS\build\TLS.vcxproj">
       <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
   </ItemGroup>

CredWrite/CredWrite.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -15,12 +15,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="PCH.h">
+    <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="PCH.cpp">
+    <ClCompile Include="StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Main.cpp">

CredWrite/Main.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,14 +18,12 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "PCH.h"
+#include "StdAfx.h"
 
 using namespace std;
 using namespace winstd;
 
-class module_dummy : public eap::module {
-    virtual eap::config_method* make_config() { return nullptr; }
-} g_module;
+eap::module g_module;
 
 
 static int CredWrite()
@@ -118,8 +116,7 @@ static int CredWrite()
 }
 
 
-_Use_decl_annotations_
-int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nCmdShow)
 {
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);

CredWrite/README.md

@@ -1,9 +1,7 @@
-# CredWrite
-
-Imports given credentials to Windows Credential Manager for GÉANTLink use
-
-## Usage
+#CredWrite
+Imports given credentials to Windows Credential Manager for G<>ANTLink use
 
+##Usage
 ```
 CredWrite <username> <password> [<realm> [level]]
 ```
@@ -15,15 +13,8 @@ CredWrite <username> <password> [<realm> [level]]
 
 The credentials are stored to Windows Credential Manager in invoking user's roaming profile.
 
-### Return codes
-
+Return codes:
 - -1 = Invalid parameters
 - 0  = Success
 - 1  = Error parsing command line
 - 2  = Error encrypting password or writing credentials
-
-### Example
-
-```
-CredWrite dXNlckBjb250b3NvLmNvbQ== cGFzc3dvcmQxMjM= urn:RFC4282:realm:contoso.com 1
-```

CredWrite/StdAfx.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,4 +18,4 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "PCH.h"
+#include "StdAfx.h"

CredWrite/StdAfx.h

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "../lib/EAPBase/include/Config.h"
 #include "../lib/EAPBase/include/Credentials.h"
 #include "../lib/EAPBase/include/Module.h"
 
@@ -30,7 +29,6 @@
 
 #include <Windows.h>
 #include <eaptypes.h> // Must include after <Windows.h>
-#include <shellapi.h>
 #include <tchar.h>
 
 #include <memory>

Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.7
+# Doxyfile 1.8.7
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -44,14 +44,14 @@ PROJECT_NUMBER         =
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X clients for enterprise network authentication"
+PROJECT_BRIEF          = "EAP Supplicant for Windows"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is included in
 # the documentation. The maximum height of the logo should not exceed 55 pixels
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           = include\icon_ui.ico
+PROJECT_LOGO           =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -694,7 +694,7 @@ CITE_BIB_FILES         =
 # messages are off.
 # The default value is: NO.
 
-QUIET                  = YES
+QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
@@ -718,7 +718,7 @@ WARN_IF_UNDOCUMENTED   = YES
 # markup commands wrongly.
 # The default value is: YES.
 
-WARN_IF_DOC_ERROR      = YES
+WARN_IF_DOC_ERROR      = NO
 
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
@@ -790,17 +790,11 @@ RECURSIVE              = YES
 # run.
 
 EXCLUDE                = \
-	CredWrite\README.md \
 	EventMonitor\res \
 	lib\EAPBase_UI\res \
-	lib\EapHost_UI\res \
-	lib\GTC_UI\res \
 	lib\TLS_UI\res \
 	lib\TTLS_UI\res \
-	lib\WinStd \
-	lib\wxExtend \
-	MsiUseFeature\README.md \
-	WLANManager\README.md
+	lib\WinStd
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded

EAPMethods/Common.props

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_PropertySheetDisplayName>EAP Method Common</_PropertySheetDisplayName>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\lib\EAPBase\build\EAPBase.vcxproj">
-      <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
-      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
-  </ItemGroup>
-</Project>

EAPMethods/EAP-TTLS_UI.vcxproj

@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <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>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DD7A97CA-F18E-43B7-95C4-D06E6A291624}</ProjectGuid>
-    <RootNamespace>EAP-TTLS_UI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="EAPMethod_UI.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <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>
-    <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\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>
-    <ProjectReference Include="..\lib\MSCHAPv2_UI\build\MSCHAPv2_UI.vcxproj">
-      <Project>{7af5b922-7c17-428a-97e0-09e3b41a684d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\PAP\build\PAP.vcxproj">
-      <Project>{36b0cf8a-7794-46c3-8099-825ba962b4c7}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\PAP_UI\build\PAP_UI.vcxproj">
-      <Project>{3d309c2e-64ab-4bc4-a16d-468571a2bc1a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\TLS\build\TLS.vcxproj">
-      <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\TLS_UI\build\TLS_UI.vcxproj">
-      <Project>{9a25c261-8ade-4938-8393-e857ef0e37e9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\TTLS\build\TTLS.vcxproj">
-      <Project>{ee0ef0d9-a475-4038-8637-5754724f65b0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\TTLS_UI\build\TTLS_UI.vcxproj">
-      <Project>{42f0f0f4-c928-4860-a4e4-94991c2c3d90}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\include\xgettext.targets" />
-  </ImportGroup>
-</Project>

EAPMethods/EAPMethod.props

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <Link>
-      <ModuleDefinitionFile>EAPMethod.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="PCH.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="PCH.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EAPMethod.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\EAPMethod.rc" />
-  </ItemGroup>
-</Project>

EAPMethods/EAPMethod_UI.props

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeaderFile>PCH_UI.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>EAPMethod_UI.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="PCH_UI.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Main_UI.cpp" />
-    <ClCompile Include="PCH_UI.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EAPMethod_UI.def" />
-    <None Include="locale\EAPMethods.pot" />
-  </ItemGroup>
-  <ItemGroup>
-    <POCompile Include="locale\bg_BG.po" />
-    <POCompile Include="locale\ca_ES.po" />
-    <POCompile Include="locale\cs_CZ.po" />
-    <POCompile Include="locale\cy_UK.po" />
-    <POCompile Include="locale\de_DE.po" />
-    <POCompile Include="locale\el_GR.po" />
-    <POCompile Include="locale\es_ES.po" />
-    <POCompile Include="locale\et_EE.po" />
-    <POCompile Include="locale\eu_ES.po" />
-    <POCompile Include="locale\fi_FI.po" />
-    <POCompile Include="locale\fr_CA.po" />
-    <POCompile Include="locale\fr_FR.po" />
-    <POCompile Include="locale\gl_ES.po" />
-    <POCompile Include="locale\hr_HR.po" />
-    <POCompile Include="locale\hu_HU.po" />
-    <POCompile Include="locale\is_IS.po" />
-    <POCompile Include="locale\it_IT.po" />
-    <POCompile Include="locale\ko_KR.po" />
-    <POCompile Include="locale\lt_LT.po" />
-    <POCompile Include="locale\nb_NO.po" />
-    <POCompile Include="locale\nl_NL.po" />
-    <POCompile Include="locale\pl_PL.po" />
-    <POCompile Include="locale\pt_PT.po" />
-    <POCompile Include="locale\ru_RU.po" />
-    <POCompile Include="locale\sk_SK.po" />
-    <POCompile Include="locale\sl_SI.po" />
-    <POCompile Include="locale\sr_RS.po" />
-    <POCompile Include="locale\sv_SE.po" />
-    <POCompile Include="locale\tr_TR.po" />
-    <POCompile Include="locale\vi_VN.po" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\EAPMethod_UI.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj">
-      <Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib-16.0.vcxproj">
-      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
-    </ProjectReference>
-  </ItemGroup>
-</Project>

EAPMethods/EAPTTLS/EAPTTLS.props

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="..\build\Common.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>..\build\EAPMethod.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

EAPMethods/EAPTTLS/EAPTTLS.vcxproj

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -28,99 +20,104 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{331B6077-E3E2-4867-B93E-9D3F57280DE7}</ProjectGuid>
-    <RootNamespace>EAP-TTLS</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <RootNamespace>EAPTTLS</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets">
+  <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="EAPMethod.props" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Debug.props" />
+    <Import Project="EAPTTLS.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Debug.props" />
+    <Import Project="EAPTTLS.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\include\Win32.props" />
+    <Import Project="..\..\include\Release.props" />
+    <Import Project="EAPTTLS.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\include\x64.props" />
+    <Import Project="..\..\include\Release.props" />
+    <Import Project="EAPTTLS.props" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
   <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>
-    <ProjectReference Include="..\lib\EapHost\build\EapHost.vcxproj">
-      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
+    <ClInclude Include="StdAfx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\Main.cpp" />
+    <ClCompile Include="StdAfx.cpp">
+      <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)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="EAPTTLS.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
+      <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\GTC\build\GTC.vcxproj">
-      <Project>{114a70bb-8698-4a0c-8c90-58f22edd8129}</Project>
+    <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
+      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
+    <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
       <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\PAP\build\PAP.vcxproj">
+    <ProjectReference Include="..\..\lib\PAP\build\PAP.vcxproj">
       <Project>{36b0cf8a-7794-46c3-8099-825ba962b4c7}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\TLS\build\TLS.vcxproj">
+    <ProjectReference Include="..\..\lib\TLS\build\TLS.vcxproj">
       <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\TTLS\build\TTLS.vcxproj">
+    <ProjectReference Include="..\..\lib\TTLS\build\TTLS.vcxproj">
       <Project>{ee0ef0d9-a475-4038-8637-5754724f65b0}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\build\EAPMethod.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -15,25 +15,25 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="PCH.h">
+    <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="PCH.cpp">
+    <ClCompile Include="StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Main.cpp">
+    <ClCompile Include="..\src\Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="res\EAPMethod.rc">
+    <ResourceCompile Include="EAPTTLS.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="EAPMethod.def">
+    <None Include="..\build\EAPMethod.def">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>

EAPMethods/EAPTTLS/StdAfx.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,4 +18,4 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "PCH.h"
+#include "StdAfx.h"

EAPMethods/EAPTTLS/StdAfx.h

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -20,8 +20,5 @@
 
 #pragma once
 
-#include "../include/EapHost_UI.h"
-
-#include <WinStd/EAP.h>
-
-#include <eaphostpeerconfigapis.h>
+#include "../../lib/TTLS/include/Method.h"
+#include "../../lib/TTLS/include/Module.h"

EAPMethods/EAPTTLSUI/EAPTTLSUI.props

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="..\build\Common.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>..\build\EAPMethodUI.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DD7A97CA-F18E-43B7-95C4-D06E6A291624}</ProjectGuid>
+    <RootNamespace>EAPTTLSUI</RootNamespace>
+  </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>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </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="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="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="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="EAPTTLSUI.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemGroup>
+    <ClInclude Include="StdAfx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\Main_UI.cpp" />
+    <ClCompile Include="StdAfx.cpp">
+      <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)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="EAPTTLSUI.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
+      <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj">
+      <Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
+      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
+      <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\MSCHAPv2_UI\build\MSCHAPv2_UI.vcxproj">
+      <Project>{7af5b922-7c17-428a-97e0-09e3b41a684d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\PAP\build\PAP.vcxproj">
+      <Project>{36b0cf8a-7794-46c3-8099-825ba962b4c7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\PAP_UI\build\PAP_UI.vcxproj">
+      <Project>{3d309c2e-64ab-4bc4-a16d-468571a2bc1a}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TLS\build\TLS.vcxproj">
+      <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TLS_UI\build\TLS_UI.vcxproj">
+      <Project>{9a25c261-8ade-4938-8393-e857ef0e37e9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TTLS\build\TTLS.vcxproj">
+      <Project>{ee0ef0d9-a475-4038-8637-5754724f65b0}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TTLS_UI\build\TTLS_UI.vcxproj">
+      <Project>{42f0f0f4-c928-4860-a4e4-94991c2c3d90}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib.vcxproj">
+      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\build\EAPMethodUI.def" />
+    <None Include="..\locale\EAPMethods.pot" />
+  </ItemGroup>
+  <ItemGroup>
+    <POCompile Include="..\locale\bg_BG.po" />
+    <POCompile Include="..\locale\ca_ES.po" />
+    <POCompile Include="..\locale\cs_CZ.po" />
+    <POCompile Include="..\locale\cy_UK.po" />
+    <POCompile Include="..\locale\de_DE.po" />
+    <POCompile Include="..\locale\el_GR.po" />
+    <POCompile Include="..\locale\es_ES.po" />
+    <POCompile Include="..\locale\eu_ES.po" />
+    <POCompile Include="..\locale\fi_FI.po" />
+    <POCompile Include="..\locale\fr_CA.po" />
+    <POCompile Include="..\locale\fr_FR.po" />
+    <POCompile Include="..\locale\gl_ES.po" />
+    <POCompile Include="..\locale\hr_HR.po" />
+    <POCompile Include="..\locale\hu_HU.po" />
+    <POCompile Include="..\locale\is_IS.po" />
+    <POCompile Include="..\locale\it_IT.po" />
+    <POCompile Include="..\locale\ko_KR.po" />
+    <POCompile Include="..\locale\lt_LT.po" />
+    <POCompile Include="..\locale\nb_NO.po" />
+    <POCompile Include="..\locale\nl_NL.po" />
+    <POCompile Include="..\locale\pl_PL.po" />
+    <POCompile Include="..\locale\pt_PT.po" />
+    <POCompile Include="..\locale\ru_RU.po" />
+    <POCompile Include="..\locale\sk_SK.po" />
+    <POCompile Include="..\locale\sl_SI.po" />
+    <POCompile Include="..\locale\sr_RS.po" />
+    <POCompile Include="..\locale\sv_SE.po" />
+    <POCompile Include="..\locale\tr_TR.po" />
+    <POCompile Include="..\locale\vi_VN.po" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\include\xgettext.targets" />
+  </ImportGroup>
+</Project>

EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -19,120 +19,117 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="PCH_UI.h">
+    <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="PCH_UI.cpp">
+    <ClCompile Include="StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Main_UI.cpp">
+    <ClCompile Include="..\src\Main_UI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="res\EAPMethod_UI.rc">
+    <ResourceCompile Include="EAPTTLSUI.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="EAPMethod_UI.def">
+    <None Include="..\build\EAPMethodUI.def">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="locale\EAPMethods.pot">
+    <None Include="..\locale\EAPMethods.pot">
       <Filter>Resource Files\Localization</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <POCompile Include="locale\sl_SI.po">
+    <POCompile Include="..\locale\sl_SI.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\bg_BG.po">
+    <POCompile Include="..\locale\bg_BG.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\ca_ES.po">
+    <POCompile Include="..\locale\ca_ES.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\cs_CZ.po">
+    <POCompile Include="..\locale\cs_CZ.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\cy_UK.po">
+    <POCompile Include="..\locale\cy_UK.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\de_DE.po">
+    <POCompile Include="..\locale\de_DE.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\el_GR.po">
+    <POCompile Include="..\locale\el_GR.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\es_ES.po">
+    <POCompile Include="..\locale\es_ES.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\eu_ES.po">
+    <POCompile Include="..\locale\eu_ES.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\fi_FI.po">
+    <POCompile Include="..\locale\fi_FI.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\fr_CA.po">
+    <POCompile Include="..\locale\fr_CA.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\fr_FR.po">
+    <POCompile Include="..\locale\fr_FR.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\gl_ES.po">
+    <POCompile Include="..\locale\gl_ES.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\hr_HR.po">
+    <POCompile Include="..\locale\hr_HR.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\hu_HU.po">
+    <POCompile Include="..\locale\hu_HU.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\is_IS.po">
+    <POCompile Include="..\locale\is_IS.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\it_IT.po">
+    <POCompile Include="..\locale\it_IT.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\lt_LT.po">
+    <POCompile Include="..\locale\lt_LT.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\nb_NO.po">
+    <POCompile Include="..\locale\nb_NO.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\nl_NL.po">
+    <POCompile Include="..\locale\nl_NL.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\pl_PL.po">
+    <POCompile Include="..\locale\pl_PL.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\pt_PT.po">
+    <POCompile Include="..\locale\pt_PT.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\ru_RU.po">
+    <POCompile Include="..\locale\ru_RU.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\sk_SK.po">
+    <POCompile Include="..\locale\sk_SK.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\sr_RS.po">
+    <POCompile Include="..\locale\sr_RS.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\sv_SE.po">
+    <POCompile Include="..\locale\sv_SE.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\tr_TR.po">
+    <POCompile Include="..\locale\tr_TR.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\vi_VN.po">
+    <POCompile Include="..\locale\vi_VN.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\ko_KR.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-    <POCompile Include="locale\et_EE.po">
+    <POCompile Include="..\locale\ko_KR.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
   </ItemGroup>

EAPMethods/EAPTTLSUI/StdAfx.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,4 +18,4 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "PCH.h"
+#include "StdAfx.h"

EAPMethods/EAPTTLSUI/StdAfx.h

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -20,4 +20,4 @@
 
 #pragma once
 
-#include "../include/GTC_UI.h"
+#include "../../lib/TTLS_UI/include/Module.h"

EAPMethods/MSIBuild.EAP-TTLS/.gitignore

@@ -1,9 +0,0 @@
-/*-1.idt
-/*-2.idt
-/*-2.idtx
-/*.Binary-1
-/*.Binary-2
-/*.Icon-1
-/*.Icon-2
-/*.lst
-/*.msm

EAPMethods/Main.cpp

@@ -1,905 +0,0 @@
-/*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "PCH.h"
-
-#pragma comment(lib, "Ws2_32.lib")
-
-using namespace std;
-using namespace winstd;
-
-
-EAPMETHOD_PEER g_peer;
-
-
-///
-/// DLL main entry point
-///
-/// \sa [DllMain entry point](https://msdn.microsoft.com/en-us/library/windows/desktop/ms682583.aspx)
-///
-BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved)
-{
-    UNREFERENCED_PARAMETER(lpvReserved);
-
-    if (fdwReason == DLL_PROCESS_ATTACH) {
-#ifdef _DEBUG
-        //Sleep(10000);
-#endif
-        g_peer.m_instance = hinstDLL;
-    } else if (fdwReason == DLL_PROCESS_DETACH)
-        assert(!_CrtDumpMemoryLeaks());
-
-    return TRUE;
-}
-
-
-///
-/// Releases all memory associated with an opaque user interface context data buffer.
-///
-/// \sa [EapPeerFreeMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363606.aspx)
-///
-_Use_decl_annotations_
-VOID WINAPI EapPeerFreeMemory(void *pUIContextData)
-{
-    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));
-
-    if (pUIContextData)
-        g_peer.free_memory((BYTE*)pUIContextData);
-}
-
-
-///
-/// Releases error-specific memory allocated by the EAP peer method.
-///
-/// \sa [EapPeerFreeErrorMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363605.aspx)
-///
-_Use_decl_annotations_
-VOID WINAPI EapPeerFreeErrorMemory(EAP_ERROR *ppEapError)
-{
-    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));
-
-    if (ppEapError)
-        g_peer.free_error_memory(ppEapError);
-}
-
-
-///
-/// Obtains a set of function pointers for an implementation of the EAP peer method currently loaded on the EapHost service.
-///
-/// \sa [EapPeerGetInfo function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363608.aspx)
-///
-_Use_decl_annotations_
-DWORD WINAPI EapPeerGetInfo(EAP_TYPE* pEapType, EAP_PEER_METHOD_ROUTINES* pEapPeerMethodRoutines, EAP_ERROR **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pEapPeerMethodRoutines)
-        memset(pEapPeerMethodRoutines, 0, sizeof(*pEapPeerMethodRoutines));
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!pEapType || !pEapPeerMethodRoutines)
-        return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->type != EAPMETHOD_TYPE)
-        return dwResult = ERROR_NOT_SUPPORTED;
-
-    pEapPeerMethodRoutines->dwVersion                    = PRODUCT_VERSION;
-    pEapPeerMethodRoutines->pEapType                     = NULL;
-
-    pEapPeerMethodRoutines->EapPeerInitialize            = EapPeerInitialize;
-    pEapPeerMethodRoutines->EapPeerShutdown              = EapPeerShutdown;
-    pEapPeerMethodRoutines->EapPeerBeginSession          = EapPeerBeginSession;
-    pEapPeerMethodRoutines->EapPeerEndSession            = EapPeerEndSession;
-    pEapPeerMethodRoutines->EapPeerSetCredentials        = NULL;    // Always NULL unless we want to use generic credential UI
-    pEapPeerMethodRoutines->EapPeerGetIdentity           = EapPeerGetIdentity;
-    pEapPeerMethodRoutines->EapPeerProcessRequestPacket  = EapPeerProcessRequestPacket;
-    pEapPeerMethodRoutines->EapPeerGetResponsePacket     = EapPeerGetResponsePacket;
-    pEapPeerMethodRoutines->EapPeerGetResult             = EapPeerGetResult;
-    pEapPeerMethodRoutines->EapPeerGetUIContext          = EapPeerGetUIContext;
-    pEapPeerMethodRoutines->EapPeerSetUIContext          = EapPeerSetUIContext;
-    pEapPeerMethodRoutines->EapPeerGetResponseAttributes = EapPeerGetResponseAttributes;
-    pEapPeerMethodRoutines->EapPeerSetResponseAttributes = EapPeerSetResponseAttributes;
-
-    return dwResult;
-}
-
-
-#pragma warning(push)
-#pragma warning(disable: 4702) // Compiler is smart enough to find out the initialize() method is empty => never throws an exception.
-
-///
-/// Initializes an EAP peer method for EapHost.
-///
-/// \sa [EapPeerInitialize function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363613.aspx)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerInitialize(EAP_ERROR **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    try {
-        g_peer.initialize();
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-#pragma warning(pop)
-
-
-#pragma warning(push)
-#pragma warning(disable: 4702) // Compiler is smart enough to find out the shutdown() method is empty => never throws an exception.
-
-///
-/// Shuts down the EAP method and prepares to unload its corresponding DLL.
-///
-/// \sa [EapPeerShutdown function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363627.aspx)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerShutdown(EAP_ERROR **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    try {
-        g_peer.shutdown();
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-#pragma warning(pop)
-
-
-///
-/// Returns the user data and user identity after being called by EapHost.
-///
-/// \sa [EapPeerGetIdentity function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363607.aspx)
-///
-_Use_decl_annotations_
-DWORD APIENTRY EapPeerGetIdentity(
-          DWORD     dwFlags,
-          DWORD     dwConnectionDataSize,
-    const BYTE      *pConnectionData,
-          DWORD     dwUserDataSize,
-    const BYTE      *pUserData,
-          HANDLE    hTokenImpersonateUser,
-          BOOL      *pfInvokeUI,
-          DWORD     *pdwUserDataOutSize,
-          BYTE      **ppUserDataOut,
-          WCHAR     **ppwszIdentity,
-          EAP_ERROR **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pfInvokeUI)
-        *pfInvokeUI = FALSE;
-    if (pdwUserDataOutSize)
-        *pdwUserDataOutSize = 0;
-    if (ppUserDataOut)
-        *ppUserDataOut = NULL;
-    if (ppwszIdentity)
-        *ppwszIdentity = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!pConnectionData && dwConnectionDataSize || !pUserData && dwUserDataSize || !pfInvokeUI || !pdwUserDataOutSize || !ppUserDataOut || !ppwszIdentity)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.get_identity(dwFlags, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, ppUserDataOut, pdwUserDataOutSize, hTokenImpersonateUser, pfInvokeUI, ppwszIdentity);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// Starts an EAP authentication session on the peer EapHost using the EAP method.
-///
-/// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerBeginSession(
-              DWORD              dwFlags,
-      const   EapAttributes      *pAttributeArray,
-              HANDLE             hTokenImpersonateUser,
-              DWORD              dwConnectionDataSize,
-    /*const*/ BYTE               *pConnectionData,
-              DWORD              dwUserDataSize,
-    /*const*/ BYTE               *pUserData,
-              DWORD              dwMaxSendPacketSize,
-              EAP_SESSION_HANDLE *phSession,
-              EAP_ERROR          **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (phSession)
-        *phSession = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!pConnectionData && dwConnectionDataSize || !pUserData && dwUserDataSize || !phSession)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        *phSession = g_peer.begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, dwMaxSendPacketSize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// Ends an EAP authentication session for the EAP method.
-///
-/// \sa [EapPeerEndSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363604.aspx)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerEndSession(
-    EAP_SESSION_HANDLE hSession,
-    EAP_ERROR          **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!hSession)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.end_session(hSession);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// Processes a packet received by EapHost from a supplicant.
-///
-/// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerProcessRequestPacket(
-              EAP_SESSION_HANDLE  hSession,
-              DWORD               dwReceivedPacketSize,
-    /*const*/ EapPacket           *pReceivedPacket,
-              EapPeerMethodOutput *pEapOutput,
-              EAP_ERROR           **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pEapOutput)
-        memset(pEapOutput, 0, sizeof(*pEapOutput));
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!hSession || !pReceivedPacket || dwReceivedPacketSize < sizeof(EapPacket) || pReceivedPacket->Data[0] != EAPMETHOD_TYPE || !pEapOutput)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.process_request_packet(hSession, pReceivedPacket, dwReceivedPacketSize, pEapOutput);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// Obtains a response packet from the EAP method.
-///
-/// \sa [EapPeerGetResponsePacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363610.aspx)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerGetResponsePacket(
-    EAP_SESSION_HANDLE hSession,
-    DWORD              *pdwSendPacketSize,
-    EapPacket          *pSendPacket,
-    EAP_ERROR          **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!hSession || !pdwSendPacketSize || !pSendPacket && *pdwSendPacketSize)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.get_response_packet(hSession, pSendPacket, pdwSendPacketSize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerGetResult(
-    EAP_SESSION_HANDLE        hSession,
-    EapPeerMethodResultReason reason,
-    EapPeerMethodResult       *pResult,
-    EAP_ERROR                 **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!hSession || !pResult)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.get_result(hSession, reason, pResult);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerGetUIContext(
-    EAP_SESSION_HANDLE hSession,
-    DWORD              *pdwUIContextDataSize,
-    BYTE               **ppUIContextData,
-    EAP_ERROR          **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pdwUIContextDataSize)
-        *pdwUIContextDataSize = 0;
-    if (ppUIContextData)
-        *ppUIContextData = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!hSession || !pdwUIContextDataSize || !ppUIContextData)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.get_ui_context(hSession, ppUIContextData, pdwUIContextDataSize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerSetUIContext(
-          EAP_SESSION_HANDLE  hSession,
-          DWORD               dwUIContextDataSize,
-    const BYTE                *pUIContextData,
-          EapPeerMethodOutput *pEapOutput,
-          EAP_ERROR           **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pEapOutput)
-        memset(pEapOutput, 0, sizeof(*pEapOutput));
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!hSession || !pUIContextData && dwUIContextDataSize || !pEapOutput)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.set_ui_context(hSession, pUIContextData, dwUIContextDataSize, pEapOutput);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerGetResponseAttributes(
-    EAP_SESSION_HANDLE hSession,
-    EapAttributes      *pAttribs,
-    EAP_ERROR          **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pAttribs)
-        memset(pAttribs, 0, sizeof(*pAttribs));
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!hSession || !pAttribs)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.get_response_attributes(hSession, pAttribs);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-//_Use_decl_annotations_
-DWORD APIENTRY EapPeerSetResponseAttributes(
-              EAP_SESSION_HANDLE  hSession,
-    /*const*/ EapAttributes       *pAttribs,
-              EapPeerMethodOutput *pEapOutput,
-              EAP_ERROR           **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pEapOutput)
-        memset(pEapOutput, 0, sizeof(*pEapOutput));
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!hSession || !pEapOutput)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.set_response_attributes(hSession, pAttribs, pEapOutput);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-_Use_decl_annotations_
-DWORD WINAPI EapPeerGetMethodProperties(
-              DWORD                     dwVersion,
-              DWORD                     dwFlags,
-              EAP_METHOD_TYPE           eapMethodType,
-              HANDLE                    hUserImpersonationToken,
-              DWORD                     dwConnectionDataSize,
-    /*const*/ BYTE                      *pConnectionData,
-              DWORD                     dwUserDataSize,
-    /*const*/ BYTE                      *pUserData,
-              EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray,
-              EAP_ERROR                 **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pMethodPropertyArray)
-        memset(pMethodPropertyArray, 0, sizeof(*pMethodPropertyArray));
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
-        return dwResult = ERROR_NOT_SUPPORTED;
-    if (!pConnectionData && dwConnectionDataSize || !pUserData && dwUserDataSize || !pMethodPropertyArray)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.get_method_properties(dwVersion, dwFlags, hUserImpersonationToken, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, pMethodPropertyArray);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-_Use_decl_annotations_
-DWORD WINAPI EapPeerCredentialsXml2Blob(
-          DWORD            dwFlags,
-          EAP_METHOD_TYPE  eapMethodType,
-          IXMLDOMDocument2 *pCredentialsDoc,
-    const BYTE             *pConnectionData,
-          DWORD            dwConnectionDataSize,
-          BYTE             **ppCredentialsOut,
-          DWORD            *pdwCredentialsOutSize,
-          EAP_ERROR        **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (ppCredentialsOut)
-        *ppCredentialsOut = NULL;
-    if (pdwCredentialsOutSize)
-        *pdwCredentialsOutSize = 0;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
-        return dwResult = ERROR_NOT_SUPPORTED;
-    if (!pCredentialsDoc || !pConnectionData && dwConnectionDataSize || !ppCredentialsOut || !pdwCredentialsOutSize)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    // <Credentials>
-    com_obj<IXMLDOMNode> pXmlElCredentials;
-    if (FAILED(eapxml::select_node(pCredentialsDoc, bstr(L"//EapHostUserCredentials/Credentials"), pXmlElCredentials)))
-        return dwResult = g_peer.log_error(ppEapError, ERROR_NOT_FOUND, _T(__FUNCTION__) _T(" Error selecting <EapHostUserCredentials><Credentials> element."));
-
-    // Load credentials.
-    pCredentialsDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
-    try {
-        g_peer.credentials_xml2blob(dwFlags, pXmlElCredentials, pConnectionData, dwConnectionDataSize, ppCredentialsOut, pdwCredentialsOutSize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-_Use_decl_annotations_
-DWORD WINAPI EapPeerQueryCredentialInputFields(
-              HANDLE                       hUserImpersonationToken,
-              EAP_METHOD_TYPE              eapMethodType,
-              DWORD                        dwFlags,
-              DWORD                        dwConnectionDataSize,
-    /*const*/ BYTE                         *pConnectionData,
-              EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray,
-              EAP_ERROR                    **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pEapConfigInputFieldsArray)
-        memset(pEapConfigInputFieldsArray, 0, sizeof(*pEapConfigInputFieldsArray));
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
-        return dwResult = ERROR_NOT_SUPPORTED;
-    if (!pConnectionData && dwConnectionDataSize || !pEapConfigInputFieldsArray)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.query_credential_input_fields(hUserImpersonationToken, dwFlags, dwConnectionDataSize, pConnectionData, pEapConfigInputFieldsArray);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-#pragma warning(suppress: 6101) // Function is incorrectly annotated and code analysis gets confused
-_Use_decl_annotations_
-DWORD WINAPI EapPeerQueryUserBlobFromCredentialInputFields(
-              HANDLE                       hUserImpersonationToken,
-              EAP_METHOD_TYPE              eapMethodType,
-              DWORD                        dwFlags,
-              DWORD                        dwConnectionDataSize,
-    /*const*/ BYTE                         *pConnectionData,
-      const   EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldArray,
-              DWORD                        *pdwUsersBlobSize,
-              BYTE                         **ppUserBlob,
-              EAP_ERROR                    **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
-        return dwResult = ERROR_NOT_SUPPORTED;
-    if (!pConnectionData && dwConnectionDataSize || !pEapConfigInputFieldArray || !pdwUsersBlobSize || !ppUserBlob)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.query_user_blob_from_credential_input_fields(hUserImpersonationToken, dwFlags, dwConnectionDataSize, pConnectionData, pEapConfigInputFieldArray, pdwUsersBlobSize, ppUserBlob);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-_Use_decl_annotations_
-DWORD WINAPI EapPeerQueryInteractiveUIInputFields(
-          DWORD                   dwVersion,
-          DWORD                   dwFlags,
-          DWORD                   dwUIContextDataSize,
-    const BYTE                    *pUIContextData,
-          EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData,
-          EAP_ERROR               **ppEapError,
-          LPVOID                  *ppvReserved)
-{
-    UNREFERENCED_PARAMETER(ppvReserved);
-
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pEapInteractiveUIData)
-        memset(pEapInteractiveUIData, 0, sizeof(*pEapInteractiveUIData));
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!pUIContextData && dwUIContextDataSize || !pEapInteractiveUIData)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.query_interactive_ui_input_fields(dwVersion, dwFlags, dwUIContextDataSize, pUIContextData, pEapInteractiveUIData);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// 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)
-///
-#pragma warning(suppress: 6387) // Function is incorrectly annotated and code analysis gets confused
-#pragma warning(suppress: 28196)
-_Use_decl_annotations_
-DWORD WINAPI EapPeerQueryUIBlobFromInteractiveUIInputFields(
-          DWORD                   dwVersion,
-          DWORD                   dwFlags,
-          DWORD                   dwUIContextDataSize,
-    const BYTE                    *pUIContextData,
-    const EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData,
-          DWORD                   *pdwDataFromInteractiveUISize,
-          BYTE                    **ppDataFromInteractiveUI,
-          EAP_ERROR               **ppEapError,
-          LPVOID                  *ppvReserved)
-{
-    UNREFERENCED_PARAMETER(ppvReserved);
-
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pdwDataFromInteractiveUISize)
-        *pdwDataFromInteractiveUISize = 0;
-    if (ppDataFromInteractiveUI)
-        *ppDataFromInteractiveUI = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!pUIContextData && dwUIContextDataSize || !pEapInteractiveUIData || !pdwDataFromInteractiveUISize || !ppDataFromInteractiveUI)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    try {
-        g_peer.query_ui_blob_from_interactive_ui_input_fields(dwVersion, dwFlags, dwUIContextDataSize, pUIContextData, pEapInteractiveUIData, pdwDataFromInteractiveUISize, ppDataFromInteractiveUI);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}

EAPMethods/Main_UI.cpp

@@ -1,376 +0,0 @@
-/*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "PCH_UI.h"
-
-#pragma comment(lib, "msxml6.lib")
-
-using namespace std;
-using namespace winstd;
-
-
-HANDLE g_act_ctx = NULL;
-EAPMETHOD_PEER_UI g_peer;
-
-
-///
-/// DLL main entry point
-///
-/// \sa [DllMain entry point](https://msdn.microsoft.com/en-us/library/windows/desktop/ms682583.aspx)
-///
-BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved)
-{
-    UNREFERENCED_PARAMETER(lpvReserved);
-
-    if (fdwReason == DLL_PROCESS_ATTACH) {
-#ifdef _DEBUG
-        //Sleep(10000);
-#endif
-        g_peer.m_instance = hinstDLL;
-
-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
-        // Declare our DllHost process as DPI-aware.
-        SetProcessDPIAware();
-#endif
-
-        // Save current activation context, as proper activation context is set at this time only (LoadLibrary() call).
-        GetCurrentActCtx(&g_act_ctx);
-    } else if (fdwReason == DLL_PROCESS_DETACH) {
-        if (g_act_ctx)
-            ReleaseActCtx(g_act_ctx);
-
-        // wxWidgets library has some global objects allocating data on heap in constructors,
-        // causing false-positive memory leak reports.
-        //assert(!_CrtDumpMemoryLeaks());
-    }
-
-    return TRUE;
-}
-
-
-///
-/// Releases all memory associated with an opaque user interface context data buffer.
-///
-/// \sa [EapPeerFreeMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363606.aspx)
-///
-_Use_decl_annotations_
-VOID WINAPI EapPeerFreeMemory(void *pUIContextData)
-{
-    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));
-
-    if (pUIContextData)
-        g_peer.free_memory((BYTE*)pUIContextData);
-}
-
-
-///
-/// Releases error-specific memory allocated by the EAP peer method.
-///
-/// \sa [EapPeerFreeErrorMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363605.aspx)
-///
-_Use_decl_annotations_
-VOID WINAPI EapPeerFreeErrorMemory(EAP_ERROR *ppEapError)
-{
-    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));
-
-    if (ppEapError)
-        g_peer.free_error_memory(ppEapError);
-}
-
-
-///
-/// Converts XML into the configuration BLOB.
-///
-/// \sa [EapPeerConfigXml2Blob function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363602.aspx)
-///
-_Use_decl_annotations_
-DWORD WINAPI EapPeerConfigXml2Blob(
-    DWORD            dwFlags,
-    EAP_METHOD_TYPE  eapMethodType,
-    IXMLDOMDocument2 *pConfigDoc,
-    BYTE             **pConnectionDataOut,
-    DWORD            *pdwConnectionDataOutSize,
-    EAP_ERROR        **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pConnectionDataOut)
-        *pConnectionDataOut = NULL;
-    if (pdwConnectionDataOutSize)
-        *pdwConnectionDataOutSize = 0;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
-        return dwResult = ERROR_NOT_SUPPORTED;
-    if (!pConfigDoc || !pConnectionDataOut || !pdwConnectionDataOutSize)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    // Configure XML selection namespaces used.
-    pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
-
-    // <Config>
-    com_obj<IXMLDOMElement> pXmlElConfig;
-    if (FAILED(eapxml::select_element(pConfigDoc, bstr(L"//eaphostconfig:Config"), pXmlElConfig)))
-        return dwResult = g_peer.log_error(ppEapError, ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" Error reading <Config> element."));
-
-    // Load configuration.
-    try {
-        g_peer.config_xml2blob(dwFlags, pXmlElConfig, pConnectionDataOut, pdwConnectionDataOutSize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// Converts the configuration BLOB to XML.
-///
-/// The configuration BLOB is returned in the ppConnectionDataOut parameter of the EapPeerInvokeConfigUI function.
-///
-/// \sa [EapPeerConfigBlob2Xml function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363601.aspx)
-///
-_Use_decl_annotations_
-DWORD WINAPI EapPeerConfigBlob2Xml(
-          DWORD            dwFlags,
-          EAP_METHOD_TYPE  eapMethodType,
-    const BYTE             *pConnectionData,
-          DWORD            dwConnectionDataSize,
-          IXMLDOMDocument2 **ppConfigDoc,
-          EAP_ERROR        **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (ppConfigDoc)
-        *ppConfigDoc = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
-        return dwResult = ERROR_NOT_SUPPORTED;
-    if (!pConnectionData && dwConnectionDataSize || !ppConfigDoc)
-        return dwResult = ERROR_INVALID_PARAMETER;
-
-    HRESULT hr;
-
-    // Create configuration XML document.
-    com_obj<IXMLDOMDocument2> pConfigDoc;
-    if (FAILED(hr = pConfigDoc.create(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER)))
-        return dwResult = g_peer.log_error(ppEapError, HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error creating XML document."));
-
-    pConfigDoc->put_async(VARIANT_FALSE);
-
-    // Load empty XML configuration.
-    VARIANT_BOOL isSuccess = VARIANT_FALSE;
-    if (FAILED((hr = pConfigDoc->loadXML(L"<Config xmlns=\"http://www.microsoft.com/provisioning/EapHostConfig\"></Config>", &isSuccess))))
-        return dwResult = g_peer.log_error(ppEapError, HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error loading XML document template."));
-    if (!isSuccess)
-        return dwResult = g_peer.log_error(ppEapError, ERROR_XML_PARSE_ERROR, _T(__FUNCTION__) _T(" Loading XML template failed."));
-
-    // Configure XML selection namespaces used.
-    pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
-
-    // Select <Config> node.
-    com_obj<IXMLDOMNode> pXmlElConfig;
-    if (FAILED(eapxml::select_node(pConfigDoc, bstr(L"eaphostconfig:Config"), pXmlElConfig)))
-        return dwResult = g_peer.log_error(ppEapError, ERROR_NOT_FOUND, _T(__FUNCTION__) _T(" Error selecting <Config> element."));
-
-    // Save configuration.
-    pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
-    try {
-        g_peer.config_blob2xml(dwFlags, pConnectionData, dwConnectionDataSize, pConfigDoc, pXmlElConfig);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        return dwResult = ERROR_INVALID_DATA;
-    }
-
-    *ppConfigDoc = pConfigDoc.detach();
-
-    return dwResult;
-}
-
-
-///
-/// Raises the EAP method's specific connection configuration user interface dialog on the client.
-///
-/// \sa [EapPeerInvokeConfigUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363614.aspx)
-///
-//_Use_decl_annotations_
-DWORD WINAPI EapPeerInvokeConfigUI(
-    const EAP_METHOD_TYPE *pEapType,
-          HWND            hwndParent,
-          DWORD           dwFlags,
-          DWORD           dwConnectionDataInSize,
-    const BYTE            *pConnectionDataIn,
-          DWORD           *pdwConnectionDataOutSize,
-          BYTE            **ppConnectionDataOut,
-          EAP_ERROR       **ppEapError)
-{
-    UNREFERENCED_PARAMETER(dwFlags);
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-    actctx_activator actctx(g_act_ctx);
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pdwConnectionDataOutSize)
-        *pdwConnectionDataOutSize = 0;
-    if (ppConnectionDataOut)
-        *ppConnectionDataOut = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!pEapType || !pConnectionDataIn && dwConnectionDataInSize || !pdwConnectionDataOutSize || !ppConnectionDataOut)
-        return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != EAPMETHOD_AUTHOR_ID)
-        return dwResult = ERROR_NOT_SUPPORTED;
-
-    try {
-        g_peer.invoke_config_ui(hwndParent, pConnectionDataIn, dwConnectionDataInSize, ppConnectionDataOut, pdwConnectionDataOutSize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// Raises a custom interactive user interface dialog to obtain user identity information for the EAP method on the client.
-///
-/// \sa [EapPeerInvokeIdentityUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363615.aspx)
-///
-//_Use_decl_annotations_
-DWORD WINAPI EapPeerInvokeIdentityUI(
-    const EAP_METHOD_TYPE *pEapType,
-          DWORD           dwFlags,
-          HWND            hwndParent,
-          DWORD           dwConnectionDataSize,
-    const BYTE            *pConnectionData,
-          DWORD           dwUserDataSize,
-    const BYTE            *pUserData,
-          DWORD           *pdwUserDataOutSize,
-          BYTE            **ppUserDataOut,
-          LPWSTR          *ppwszIdentity,
-          EAP_ERROR       **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-    actctx_activator actctx(g_act_ctx);
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pdwUserDataOutSize)
-        *pdwUserDataOutSize = 0;
-    if (ppUserDataOut)
-        *ppUserDataOut = NULL;
-    if (ppwszIdentity)
-        *ppwszIdentity = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!pEapType || !pConnectionData && dwConnectionDataSize || !pUserData && dwUserDataSize || !pdwUserDataOutSize || !ppUserDataOut || !ppwszIdentity)
-        return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != EAPMETHOD_AUTHOR_ID)
-        return dwResult = ERROR_NOT_SUPPORTED;
-
-    try {
-        g_peer.invoke_identity_ui(hwndParent, dwFlags, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, ppUserDataOut, pdwUserDataOutSize, ppwszIdentity);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}
-
-
-///
-/// Raises a custom interactive user interface dialog for the EAP method on the client.
-///
-/// \sa [EapPeerInvokeInteractiveUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363616.aspx)
-///
-//_Use_decl_annotations_
-DWORD WINAPI EapPeerInvokeInteractiveUI(
-    const EAP_METHOD_TYPE *pEapType,
-          HWND            hwndParent,
-          DWORD           dwUIContextDataSize,
-    const BYTE            *pUIContextData,
-          DWORD           *pdwDataFromInteractiveUISize,
-          BYTE            **ppDataFromInteractiveUI,
-          EAP_ERROR       **ppEapError)
-{
-    DWORD dwResult = ERROR_SUCCESS;
-    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
-    actctx_activator actctx(g_act_ctx);
-#ifdef _DEBUG
-    //Sleep(10000);
-#endif
-
-    // Initialize output parameters.
-    if (pdwDataFromInteractiveUISize)
-        *pdwDataFromInteractiveUISize = 0;
-    if (ppDataFromInteractiveUI)
-        *ppDataFromInteractiveUI = NULL;
-    if (ppEapError)
-        *ppEapError = NULL;
-
-    // Parameter check
-    if (!pEapType || !pUIContextData && dwUIContextDataSize || !pdwDataFromInteractiveUISize || !ppDataFromInteractiveUI)
-        return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != EAPMETHOD_AUTHOR_ID)
-        return dwResult = ERROR_NOT_SUPPORTED;
-
-    try {
-        g_peer.invoke_interactive_ui(hwndParent, pUIContextData, dwUIContextDataSize, ppDataFromInteractiveUI, pdwDataFromInteractiveUISize);
-    } catch (std::exception &err) {
-        dwResult = g_peer.log_error(ppEapError, err);
-    } catch (...) {
-        dwResult = ERROR_INVALID_DATA;
-    }
-
-    return dwResult;
-}

EAPMethods/PCH.h

@@ -1,29 +0,0 @@
-/*
-    Copyright 2015-2020 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/>.
-*/
-
-#pragma once
-
-#if EAPMETHOD_TYPE == 21
-#include "../lib/TTLS/include/Method.h"
-#include "../lib/TTLS/include/Module.h"
-#define EAPMETHOD_PEER eap::peer_ttls
-#else
-#error Unknown EAP Method type.
-#endif

EAPMethods/PCH_UI.cpp

@@ -1,21 +0,0 @@
-/*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 G<>ANT
-
-    This file is part of G<>ANTLink.
-
-    G<>ANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    G<>ANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with G<>ANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "PCH_UI.h"

EAPMethods/PCH_UI.h

@@ -1,31 +0,0 @@
-/*
-    Copyright 2015-2020 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/>.
-*/
-
-#pragma once
-
-// Prevent warnings from wxWidgets headers
-#define _CRT_SECURE_NO_WARNINGS
-
-#if EAPMETHOD_TYPE == 21
-#include "../lib/TTLS_UI/include/Module.h"
-#define EAPMETHOD_PEER_UI eap::peer_ttls_ui
-#else
-#error Unknown EAP Method type.
-#endif

EAPMethods/build/Common.props

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_PropertySheetDisplayName>EAP Method Common</_PropertySheetDisplayName>
+    <OutDir>..\..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\include;..\..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

EAPMethods/locale/EAPMethods.pot

@@ -2,93 +2,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, c-format
-msgid "Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr ""
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
@@ -114,357 +44,233 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr ""
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
+msgid "Use credentials from Credential &Manager:"
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid "Select this option if you would like to use credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid "Select this option if you would like to store credentials as a part of  profile configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid "Describe your organization to customize user prompts.  When organization is introduced, end-users find program messages easier to understand and act."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid "Assign your organization a unique ID to allow sharing the same credential set across different network profiles."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid "Your configuration can be locked to prevent accidental modification by end-users. Users will only be allowed to enter credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid "&Lock this configuration and prevent any further modification via user interface."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid "%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid "The %s version installed on this computer logs credentials in visible and easy to read way."
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr ""
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr ""
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr ""
@@ -478,7 +284,7 @@ msgid "Server Trust"
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid "Describe the servers you trust to prevent credential interception in case of man-in-the-middle attacks."
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
@@ -509,143 +315,223 @@ msgstr ""
 msgid "&Remove CA"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid "A semicolon delimited list of acceptable server FQDN names; blank to skip name check; Unicode characters allowed"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid "Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr ""
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, c-format
+msgid "Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
 msgstr ""
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr ""

EAPMethods/locale/ca_ES.po

@@ -1,113 +1,35 @@
-# Translators:
-# eduki <ecercos@xtec.cat>, 2018
-# jmontane, 2019
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, 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ó?"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Alerta"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "Credencials EAP"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Ajustos del proveidor"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s Credencials d'usuari"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, 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)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Ha fallat l'escriptura de les credencials."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Ha fallat l'esborrat de credencials (error %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(error %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(error)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr "(ID buit)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Recordar"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Marqueu si voleu desar les credencials"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(La vostra organització)"
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 msgid "Adds new provider"
-msgstr "Afegeix un proveïdor nou"
+msgstr "Afegir nou proveidor"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
 msgid "-"
@@ -115,7 +37,7 @@ msgstr "-"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 msgid "Removes selected provider"
-msgstr "Esborra el proveïdor seleccionat"
+msgstr "Esborrar proveidor seleccionat"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
 msgid "Advanced..."
@@ -123,16 +45,20 @@ msgstr "Avançat..."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:48
 msgid "Opens dialog with provider settings"
-msgstr "Obre formulari de configuració de proveidor"
+msgstr "Obre formulari amb ajustos de proveidor"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Credencials d'usuari"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
-msgstr ""
-"Selecciona la font on es desen les credencials de connexió utilitzades"
+msgstr "Selecciona la font on les credencials utilitzades es desen"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr ""
+msgid "Use credentials from Credential &Manager:"
+msgstr "Utilitzar credencials del Credential &Manager: "
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
@@ -142,20 +68,16 @@ msgstr ""
 "Seleccioneu aquesta opció si voleu utilitzar les credencials desades a "
 "l'Administrador de Credencials de Windows"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identitat:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 "Les vostres credencials actuals a l'Administrador de Credencials de Windows"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
-msgstr "&Esborra les credencials"
+msgstr "&Esborrar Credencials"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
@@ -163,19 +85,19 @@ msgstr ""
 "Cliqueu per a esborrar les credencials de l'Administrador de Credencials.\n"
 "Nota: Se us demanaran noves credencials en connectar."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
-msgstr "&Desa les credencials..."
+msgstr "&Desar Credencials..."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr "Cliqueu aquí per a desar o modificar les vostres credencials"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
+msgstr "Utilitzeu les credencials de la configuració del vostre &perfil:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -183,49 +105,41 @@ msgstr ""
 "Escolliu aquesta opció si voleu desar les credencials com a part del perfil "
 "de configuració"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr "Configuració de credencials del perfil"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr "ID d'usuari i contrasenya"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
-msgstr "Introduïu el vostre ID d'usuari i contrasenya"
+msgstr "Sisplau introduiu el vostre ID d'usuari i contrasenya"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr "ID d'usuari:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
-"Introduïu el vostre identificador aquí (identificador@domini.org, "
+"Introduiu el vostre identificador aquí (identificador@domini.org, "
 "DOMINI\\identificador, etc.)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
-msgstr "Introduïu la vostra contrasenya aquí"
+msgstr "Introduiu la vostra contrasenya aquí"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "ID d'usuari"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr "Introduïu el vostre ID."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr "La vostra organització"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -233,54 +147,54 @@ msgstr ""
 "Descriviu la vostra organització per personalitzar la interfície. Quan s'hi "
 "introdueix, l'usuari troba missatges més comprensibles i senzills de seguir."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr "El &nom de la vostra organització:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "El nom de la vostra organització tal i com apareixerà en les notificacions "
 "de contacte del SAU"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
-msgstr "(Sigueu breu)"
+msgstr "(Sigueu breus, sisplau)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr "Contacte d'ajuda i &informació:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr "Adreça web del centre de suport"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr "Adreça de correu del centre de suport"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr "Telèfon del centre de suport"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr "Identificador únic del proveidor"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -288,33 +202,33 @@ msgstr ""
 "Assigneu a la vostra organització un ID únic per a comparit el mateix joc de"
 " credencials entre diferents perfils de xarxa."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr "&Identificador únic del proveidor:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "L'ID de la vostra organització per assignar les mateixes credencials des "
 "d'altres perfils"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr "Bloqueig de configuració"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -322,7 +236,7 @@ msgstr ""
 "Podeu bloquejar la configuració per prevenir modificacions accidentals dels "
 "usuaris finals. Els usuaris només podran introduir credencials."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -330,83 +244,43 @@ msgstr ""
 "&Bloqueja la configuració i preveniu qualsevol modificació via interfície "
 "d'usuari."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Alerta: un cop bloquejada, no ho podeu revertir des d'aquesta finestra!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-"Seleccioneu l'ID d'usuari que presenta el propi client a l'autentitcador:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "Identitat &real"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Utitlitza el meu usuari real"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr "Omet el meu identificador i utilitza només @elmeudomini.org"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "Configuració de la connexió EAP"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "Proveïdor d'Identitat EAP"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "%s Credencials"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Credencials EAP"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr "Per instruccions i ajuda, sisplau contacteu amb %s a:"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr "el vostre proveidor"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr "Obriu el navegador per defecte"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr "Obriu el programa de correu"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Marqueu el telèfon"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
@@ -415,117 +289,35 @@ msgstr ""
 "%s ha preconfigurat parts d'aquesta configuració. Aquestes parts estan "
 "bloquejades per evitar modificacions accidentals."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr "El vostre proveidor"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr "L'intent de connexió anterior ha informat de credencials no vàlides."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr "L'intent de connexió anterior indica que les credencials han caducat."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 "L'intent de connexió anterior indica que les credencials han estat "
 "modificades."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr "L'intent de connexió anterior ha fallat."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 "Sisplau assegureu-vos que les vostres credencials són correctes, o proveu-ho"
 " més tard."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-"La versió de %s instal.lada en aquest ordinador registra les credencials en "
-"pla."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr "Reconsidereu la necessitat d'introduir les vostres credencials."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Mètode EAP intern"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Seleccioneu i configureu el mètode EAP intern"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "&Ajustos"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Ha fallat el llistat de mètodes EAP (error %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Ha fallat el llistat de mètodes EAP (error %u)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Ha fallat la configuració dels mètodes EAP (error %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "Ha fallat la configuració dels mètodes EAP (error %u)."
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr "Repte GTC"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr "Indiqueu la vostra resposta."
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr "Repte del servidor"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr "Introduïu aquí la vostra resposta"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr "&Mètode d'autenticació EAP-GTC:"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr "Seleccioneu el mode d'autenticació EAP-GTC de la llista"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr "Repte/Resposta"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr "Contrasenya"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr "Repte %s"
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr "ID d'usuari i contrasenya MSCHAPv2"
@@ -539,8 +331,12 @@ msgid "Server Trust"
 msgstr "Servidors de confiança"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
+"Descriu els servidors en que hi confieu per prevenir la intercepció de "
+"credencials en cas d'atacs 'man-in-the-middle'."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -566,7 +362,7 @@ msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:52
 msgid "Add CA from File..."
-msgstr "Afegeix CA des d'un fitxer..."
+msgstr "Afegir CA des d'un fitxer..."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:53
 msgid "Adds a new certificate authority from the file to the list"
@@ -574,17 +370,17 @@ msgstr "Afegeix una nova autoritat de certificació des de d'un arxiu"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:57
 msgid "&Remove CA"
-msgstr "&Elimina CA"
+msgstr "&Eliminar CA"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Elimina les autoritats de certificació seleccionades"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "&Noms de servidors acceptats:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -592,27 +388,27 @@ msgstr ""
 "Llista de noms de servidors acceptats, separats per ;, en blanc per no "
 "comprovar noms. S'admeten caracters Unicode"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Per exemple: foo.bar.com;server2.bar.com)"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr "Certificat d'usuari"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Sisplau escolliu el vostre &certificat per a l'autenticació."
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Certificat de client per a l'autenticació"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
-msgstr "Personalitza la &identitat:"
+msgstr "Personalitzar la &identitat:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -620,108 +416,192 @@ msgstr ""
 "La vostra identitat (identificador@domini) per substituir la indicada en el "
 "certificat; o en blanc per fer servir la continguda en el mateix"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
-msgid "Add Certificate"
-msgstr "Afegeix un certificat"
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr "S'ha trobat un caracter invàlid en el nom de servidor: %c"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Conflicte de validació"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr "<buit>"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
+msgid "Add Certificate"
+msgstr "Afegir Certificat"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Fitxers de certificat (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "Fitxers de certificat X.509 (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "Fitxers de certificat PKCS #7 (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr "Tots els fitxers (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Fitxer de certificat no vàlid o no suportat %s"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr "Error"
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
+msgstr "Identitat externa"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
-"Ha fallat la interfície d'usuari de la identitat EAP  (error %u, %s, %s)."
+"Seleccioneu l'ID d'usuari que presenta el propi client a l'autentitcador:"
 
-#: lib/TTLS_UI/src/Module.cpp:252
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
+msgstr "Identitat &real"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr "Utitlitza el meu usuari real"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr "Utilitza una identitat externa &buida (RFC 4822)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr "Omet el meu identificador i utilitza només @elmeudomini.org"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr "Identitat externa &personalitzada:"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr "Especifiqueu la identitat externa personalitzada"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr "Identitat externa a utilitzar"
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "Ha fallat la interfície d'usuari de la identitat EAP  (error %u)."
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Error escrivint les credencial a l'Administrador de credencials: %hs (error "
+"%u)"
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, 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)."
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr "Ha fallat l'escriptura de les credencials."
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr "Ha fallat la interfície d'usuari interactiva EAP  (error %u)."
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr "Autenticació interna"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr "Escolliu de la llista el mètode d'autenticació externa"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr "Autenticació externa"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr "Escolliu de la llista el mètode d'autenticació externa"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr "PAP"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Altres mètodes EAP..."
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, 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ó?"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr "Alerta"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr "Ajustos del proveidor"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Ha fallat l'esborrat de credencials (error %u)."
+
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr "<error %u>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr "<error>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr "<blank ID>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "&Recordar"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr "Marqueu si voleu desar les credencials"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr "<La vostra organització>"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr "Configuració de la connexió EAP"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr "Mètodes EAP"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr "Móduls per soportar mètodes EAP individuals"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr "TTLS"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/de_DE.po

@@ -1,105 +1,28 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Eric Hoch <eric.hoch@hhu.de>, 2016\n"
 "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, 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?"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Warnung"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "EAP Nutzerdaten"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Identitätsprovider Einstellungen"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s Benutzername"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Fehler beim Speichern der Nutzerdaten in der Anmeldeinformationsverwaltung: "
-"%hs (Fehler %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Speichern der Nutzerdaten fehlgeschlagen."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Löschen der Nutzerdaten fehlgeschlagen (Fehler %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(Fehler %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(Fehler)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr "(leere ID)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Speichern"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Klicken Sie hier um ihre Anmeldedaten zu speichern"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(Ihre Organisation)"
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
@@ -124,13 +47,18 @@ msgstr "Fortgeschritten..."
 msgid "Opens dialog with provider settings"
 msgstr "Öffnet den Dialog mit den Einstellungen für den Anbieter"
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Benutzername"
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr "Wählen sie die Datei in der ihre Anmeldedateien gespeichert sind"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr ""
+msgid "Use credentials from Credential &Manager:"
+msgstr "Benutze die Daten aus dem Schlüsselbund"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
@@ -140,19 +68,15 @@ msgstr ""
 "Wählen sie diese Option aus um die Daten aus der Windowsanmeldung zu "
 "verwenden. "
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr "Ihre aktuell für die Windowsanmeldung gespeicherten Daten"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr "Nutzerdaten &löschen"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
@@ -161,19 +85,19 @@ msgstr ""
 " zu löschen. Hinweis: Sie werden dann bei der nächsten Verbindung zur "
 "Eingabe Ihrer Nutzerdaten aufgefordert."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr "Nutzerdaten &festlegen..."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr "Klicken Sie hier um Ihre Anmeldedaten einzugeben oder zu ändern"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
+msgstr "Verwende die Anmeldedaten aus der &Profilkonfiguration"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -181,49 +105,41 @@ msgstr ""
 "Wählren Sie diese Option, wenn sie ihre Anmeldedaten als Teil der "
 "Profilkonfiguration speichern wollen"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr "Profilkonfiguration"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr "Benutzername und Passwort"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr "Bitte geben Sie Ihren Benutzernamen und das Passwort ein."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr "Benutzername:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 "Geben Sie hier Ihren Benutzernamen ein (z.B nutzer@domain.org, "
 "DOMAIN\\nutzer, ...)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Passwort:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr "Geben Sie hier Ihr Passwort ein"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "Benutzername"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr "Ihre Organisation"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -232,54 +148,54 @@ msgstr ""
 "gestalten. Die organisationsspezifische Anpassung macht es Ihren Nutzern "
 "leichter, das Programm zu benutzen."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr "&Name der Organisation:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "Der Name Ihrer Organisation, so wie er dem Nutzer bei den Hilfe- und "
 "Kontaktmöglichkeiten angezeigt wird"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr "(fassen Sie sich bitte kurz)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr "&Hilfe und Kontaktmöglichkeiten:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr "Webseite für Hilfe und Kontakt"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr "E-Mail Adresse für Hilfe und Kontakt"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr "Telefonnummer für Hilfe und Kontakt"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr "Eindeutige Kennzeichnung des Identitätsproviders"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -287,33 +203,33 @@ msgstr ""
 "Geben Sie Ihrem Identitätsprovider eine eindeutige Bezeichnung damit er von "
 "anderen Konfigurationsdateien unterschieden werden kann."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr "Namens&raum:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr "&Identifikation im Namensraum:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "Eindeutige Kennzeichnung Ihrer Organisation um Nutzerdaten "
 "profilübergreifend nutzen zu können"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr "Konfiguration sperren"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -322,7 +238,7 @@ msgstr ""
 "den Nutzer zu verhindern. Der Nutzer kann dann nur seinen Benutzernamen und "
 "Passwort ändern."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -330,86 +246,44 @@ msgstr ""
 "Konfiguration s&perren und weitere Änderungen durch die "
 "Benutzerschnittstelle verhindern."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Warnung: sobald die Konfiguration gesperrt ist, können Sie sie hier nicht "
 "mehr verändern!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-"Wählen Sie einen anonymen Nutzernamen für die unverschlüsselte Übertragung:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "Echten Nutzernamen &verwenden"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Im unverschlüsselten Teil der Anmeldung den echten Nutzernamen senden"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr ""
-"Im unverschlüsselten Teil den Nutzernamen weglassen und nur den @domain Teil"
-" senden"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "EAP Verbindungseinstellungen"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "EAP Identitätsprovider"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "%s Nutzerdaten"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP Nutzerdaten"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr "Für Hilfe und weitere Anleitungen kontaktieren Sie bitte %s via:"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr "ihren Identitätsprovider"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr "Öffnen Sie im Webbrowser"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr "Öffnen Sie Ihr E-Mail Programm"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Wählen Sie die Telefonnummer"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
@@ -418,119 +292,36 @@ msgstr ""
 "%s hat einige der Konfigurationsdaten voreingestellt. Diese Daten sind "
 "gesperrt um unbeabsichtigte Änderungen zu vermeiden."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr "Ihr Identitätsprovider"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr "Der vorige Anmeldeversuch schlug fehl wegen falscher Nutzerdaten."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 "Der vorige Anmeldeversuch schlug fehl weil die Nutzerdaten abgelaufen sind."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 "Der vorige Anmeldeversuch meldete dass Ihre Nutzerdaten geändert werden "
 "müssen."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr "Der vorige Anmeldeversuch schlug fehl."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 "Bitte stellen Sie sicher dass ihre Nutzerdaten korrekt sind, oder versuchen "
 "Sie es später noch einmal."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-"Die Version von %s die auf diesem Rechner installiert ist speichert "
-"Passwörter in Klartext an einer leicht lesbaren Stelle."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr ""
-"Bitte überlegen Sie sich ganz genau, ob Sie hier Ihre Passwörter eingeben."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Innere EAP Methode"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Innere EAP Methode auswählen und konfigurieren"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "Einstellun&gen"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Auflisten der EAP Methoden fehlgeschlagen (Fehler %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Auflisten der EAP Methoden fehlgeschlagen (Fehler %u)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Konfigurieren der EAP Methode fehlgeschlagen (Fehler %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "Konfigurieren der EAP Methode fehlgeschlagen (Fehler %u)."
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr ""
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr "Benutzername und Passwort für MSCHAPv2"
@@ -544,8 +335,12 @@ msgid "Server Trust"
 msgstr "Vertrauenseinstellungen: Server"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
+"Definieren Sie welche Server vertrauenswürdig sind um das Abgreifen von "
+"Nutzerdaten durch Man-in-the-Middle Angriffe zu verhindern."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -582,15 +377,15 @@ msgstr "Fügt eine Zertifizierungsstelle aus einer Datei zur Liste hinzu"
 msgid "&Remove CA"
 msgstr "&CA entfernen"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Entfernt die ausgewählte Zertifizierungsstelle aus der Liste"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "&Akzeptable Servernamen:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -598,27 +393,27 @@ msgstr ""
 "Eine durch Semikola getrennte Liste der akzeptablen Servernamen; wenn leer, "
 "wird die Namensüberprüfung übersrungen; Unicode Buchstaben sind erlaubt"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Beispiel: foo.bar.com;server2.bar.com)"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr "Benutzerzertifikat"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Bitte wählen Sie ihr Benutzer&zertifikat für die Identifizierung aus"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Nutzerzertifikat für Anmeldung"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Ab&weichender Nutzername:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -627,109 +422,197 @@ msgstr ""
 "Benutzerzertifikat; oder leer lassen um den Namen im Benutzerzertifikat zu "
 "verwenden"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr "Ungültiger Buchstabe im Servernamen gefunden: %c"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Fehler bei der Validierung"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr "<leer>"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr "Zertifikat hinzufügen"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Zertifikatsdateien (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "X.509 Zertifikatsdateien (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "PKCS #7 Zertifikatsdateien (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr "Alle Dateien (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Ungültige oder nicht unterstützte Zertifikatsdatei %s"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
+msgstr "Äußere (anonyme) Identität"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
-"Anzeigen des Dialogs für EAP Identität fehlgeschlagen (Fehler %u, %s, %s)."
+"Wählen Sie einen anonymen Nutzernamen für die unverschlüsselte Übertragung:"
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "Anzeigen des Dialogs für EAP Identität fehlgeschlagen (Fehler %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
+msgstr "Echten Nutzernamen &verwenden"
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr "Im unverschlüsselten Teil der Anmeldung den echten Nutzernamen senden"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr "Leeren N&utzernamen verwenden (gemäß RFC 4822)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
 msgstr ""
+"Im unverschlüsselten Teil den Nutzernamen weglassen und nur den @domain Teil"
+" senden"
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr "Ei&genen Nutzernamen verwenden:"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
 msgstr ""
+"Im unverschlüsselten Teil einen selbst festgelegten Nutzernamen verwenden"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr "Zu verwendender Nutzername"
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Fehler beim Speichern der Nutzerdaten in der Anmeldeinformationsverwaltung: "
+"%hs (Fehler %u)"
+
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr "Speichern der Nutzerdaten fehlgeschlagen."
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr "Verschlüsselte Anmeldungsphase"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
+msgid "Outer Authentication"
+msgstr "Unverschlüsselte Anmeldungsphase"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
 msgid "Select inner authentication method from the list"
 msgstr ""
 "Wählen Sie die Anmeldemethode im verschlüsselten Teil der Verbindung aus"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Unverschlüsselte Anmeldungsphase"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr "PAP"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Andere EAP Methoden..."
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, 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?"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr "Warnung"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr "Identitätsprovider Einstellungen"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Löschen der Nutzerdaten fehlgeschlagen (Fehler %u)."
+
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr "<Fehler %u>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr "<Fehler>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr "<leere ID>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "&Speichern"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr "Klicken Sie hier um ihre Anmeldedaten zu speichern"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr "<Ihre Organisation>"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr "EAP Verbindungseinstellungen"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr "EAP Methoden"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr "Module zur Unterstützung einzelner EAP Methoden"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr "TTLS"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/el_GR.po

@@ -1,108 +1,28 @@
-# Translators:
-# Zenon Mousmoulas <zenon@mousmoulas.gr>, 2017
-# Vicky Kons <vickyk@admin.grnet.gr>, 2017
-# Simon Rozman <simon@rozman.si>, 2020
-# Halil Adem <hadem@noc.grnet.gr>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Halil Adem <hadem@noc.grnet.gr>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Zenon Mousmoulas <zenon@mousmoulas.gr>, 2016\n"
 "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %s από τη "
-"διαμόρφωση;"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Προειδοποίηση"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "Διαπιστευτήρια EAP"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Ρυθμίσεις παρόχων"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s Διαπιστευτήρια Χρήστη"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Σφάλμα κατά την εγγραφή των διαπιστευτηρίων στο Credential Manager: %hs "
-"(σφάλμα %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Η εγγραφή των διαπιστευτηρίων απέτυχε."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Η διαγραφή των διαπιστευτηρίων απέτυχε (σφάλμα %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(σφάλμα %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(σφάλμα)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr "(κανένα)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr "(κενό ID)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Υπενθύμιση"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Ελέγξτε αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(Ο Φορέας σας)"
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
@@ -127,6 +47,11 @@ msgstr "Προχωρημένο..."
 msgid "Opens dialog with provider settings"
 msgstr "Ανοίγει ένα παράθυρο διαλόγου με τις ρυθμίσεις του παρόχου"
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Διαπιστευτήρια Χρήστη"
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
@@ -134,8 +59,8 @@ msgstr ""
 "χρησιμοποιείται για τη σύνδεση."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από τον Credential &Manager"
+msgid "Use credentials from Credential &Manager:"
+msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από τον Credential &Manager:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
@@ -145,20 +70,16 @@ msgstr ""
 "Επιλέξτε αυτήν την επιλογή αν θέλετε να χρησιμοποιήσετε τα διαπιστευτήρια "
 "που αποθηκεύονται στο Windows Credential Manager"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Ταυτότητα:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 "Τα παρόντα διαπιστευτήρια είναι αποθηκευμένα στο Windows Credential Manager"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr "&Καθαρίσμος διαπιστευτηρίων"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
@@ -166,20 +87,20 @@ msgstr ""
 "Επιλέξτε να καθαρίσετε τα διαπιστευτήρια σας από τον Credential Manager\n"
 "Σημείωση: Θα σας ζητηθεί να εισαγάγετε τις πιστοποιήσεις σας κατά τη σύνδεση."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr "&Ρυθμίση των διαπιστευτηρίων..."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr ""
 "Κάντε κλικ εδώ για να ρυθμίσετε ή να τροποποιήσετε τα διαπιστευτήριά σας"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
 msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από το &προφίλ ρύθμισης παραμέτρων:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -187,47 +108,39 @@ msgstr ""
 "Επιλέξτε αυτήν την επιλογή αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια ως "
 "μέρος της διαμόρφωσης προφίλ"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr "Προφίλ ρύθμισης διαπιστευτηρίων"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr "ID χρήστη και κωδικός πρόσβασης"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr "Παρακαλείσθε να δώσετε το όνομα χρήστη και τον κωδικό πρόσβασής σας."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr "ID Χρήστη:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr "Εισάγετε εδώ το όνομα χρήστη (user@domain.org, DOMAIN\\User,etc.)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Κωδικός Πρόσβασης:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr "Εισάγετε τον κωδικό πρόσβασης σας εδώ"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "ID Χρήστη"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr "Παρακαλείσθε να δώσετε το όνομα χρήστη"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr "Ο Φορέας σας"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -236,54 +149,54 @@ msgstr ""
 "παρουσιάζεται ο φορέας, οι τελικοί χρήστες κατανοούν πιο εύκολα τα μηνύματα "
 "των προγραμμάτων και τις ενέργειές τους."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr "Το όνομα &του Φορέα σας:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "Το όνομα του φορέα σας, όπως αυτό θα εμφανίζεται στις ειδοποιήσεις των "
 "επαφών του helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr "(Παρακαλώ, περιοριστείτε)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr "Πληροφορίες& επικοινωνίας Helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr "H διεύθυνση της ιστοσελίδας του Helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr "Tο e-mail του Helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr "Ο αριθμός τηλεφώνου του Helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr "Πάροχος Μοναδικoύ Αναγνωριστικού"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -291,33 +204,33 @@ msgstr ""
 "Αναθέστε στον φορέα σας ένα μοναδικό αναγνωριστικό για να επιτρέπεται να "
 "μοιράζεται τα ίδια διαπιστευτήρια σε διαφορετικά προφίλ του δικτύου."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr "&Περιοχή:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr "Πάροχος μοναδικού &αναγνωριστικού:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "Το αναγνωριστικό του φορέα σας για να παρέχετε ίδια διαπιστευτήρια από άλλα "
 "προφίλ"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr "Διαμόρφωση κλειδώματος"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -326,7 +239,7 @@ msgstr ""
 "αλλαγές από τους τελικούς χρήστες. Στους  χρήστες θα επιτρέπεται μόνο να "
 "εισαγουν τα διαπιστευτήρια."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -334,88 +247,46 @@ msgstr ""
 "&Αποκλεισμός αυτής της διαμόρφωσης και αποτρέψτε οποιαδήποτε περαιτέρω "
 "τροποποίηση μέσω της διεπαφής χρήστη."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Προσοχή: Μόλις κλειδωθεί, δεν μπορείτε να το επαναφέρετε χρησιμοποιώντας "
 "αυτό το διάλογο!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr "Ταυτότητα"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-"Επιλέξτε το αιτούμενο αναγνωριστικό χρήστη να εισάγει τον εαυτο του ως  "
-"πιστοποιητικό:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "&Επαληθευμένη Ταυτότητα"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Χρησιμοποιήσε το αληθινό όνομα χρήστη μου"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr "Χρησιμοποιήστε &κενή ταυτότητα"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr ""
-"Παραλείψτε το όνομα χρήστη μου και χρησιμοποιήστε μόνο το @mydomain.org"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr "&Προσαρμοσμένη ταυτότητα:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr "Καθορίστε τη διαμόρφωση της ταυτότητας"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr "Χρήση της προσαρμοσμένης ταυτότητας"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "Διαμόρφωση σύνδεσης EAP"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "Πάροχος υπηρεσιών EAP"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "%s Διαπιστευτήρια"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Διαπιστευτήρια EAP"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""
 "Για περισσότερη βοήθεια και οδηγίες, παρακαλούμε επικοινωνήστε μαζί μας %s "
 "στο:"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr "ο πάροχος σας"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr "Ανοίξτε ένα προεπιλεγμένο φυλλομετρητή"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr "Ανοίξτε το πρόγραμμα του e-mail σας"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Πληκτρολογήστε το αριθμό τηλεφώνου"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
@@ -424,120 +295,38 @@ msgstr ""
 "%s έχει προ-ρυθμισεί τμήματα αυτής της διαμόρφωσης. Τα μέρη αυτά είναι "
 "κλειδωμένα για να εμποδίστει η τυχαία τροποποίηση."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr "Ο πάροχός σας"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 "Η προηγούμενη προσπάθεια για να συνδεθείτε ανέφερε μη έγκυρα διαπιστευτήρια."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 "Η προηγούμενη προσπάθεια για να συνδεθείτε ανέφερε ότι τα διαπιστευτήριά σας"
 " έχουν λήξει."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 "Η προηγούμενη προσπάθεια να συνδεθείτε ανέφερε ότι τα διαπιστευτήρια σας "
 "έχουν αλλάξει."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr "Η προηγούμενη προσπάθεια σύνδεσης απέτυχε."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 "Παρακαλώ, βεβαιωθείτε ότι τα διαπιστευτήρια σας είναι σωστά ή δοκιμάστε ξανά"
 " αργότερα."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-"Η %s εγκατεστημένη έκδοση σε αυτόν τον υπολογιστή συνδέει τα  διαπιστευτήρια"
-" με ορατό και ευανάγνωστο τρόπο."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr "Παρακαλούμε, θεωρείτε απαραίτητο να εισαγάγετε τα διαπιστευτήριά σας."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Εσωτερικοί μέθοδοι EAP"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Επιλέξτε και ρυθμίστε την εσωτερική μέθοδο EAP"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "&Ρυθμίσεις"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Αποτυχία απαρίθμησης των μεθόδων EAP (σφάλμα %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Αποτυχία απαρίθμησης των μεθόδων EAP (σφάλμα %u)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Απέτυχε η διαμόρφωση της μεθόδου EAP (σφάλμα %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "Απέτυχε η διαμόρφωση της μεθόδου EAP (σφάλμα %u)."
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr "GTC Challenge"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr "Παρακαλώ δώστε την απάντησή σας."
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr "Server challenge"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr "Εισάγετε την απάντησή σας εδώ"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr "EAP-GTC πιστοποίηση &μέθοδος:"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr "Επιλέξτε την EAP-GTC ταυτοποίηση από τη λίστα"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr "Διαταραχή/Ανταπόκριση"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr "Κωδικός πρόσβασης"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr "%s Challenge"
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr "MSCHAPv2 ID χρήστη και κωδικός πρόσβασης"
@@ -551,10 +340,12 @@ msgid "Server Trust"
 msgstr "Εμπιστευτικό Διακομιστή"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
-"Περιγράψτε τους διακομιστές που εμπιστεύεστε για την πρόληψη επιθέσεων man-"
-"in-the-middle."
+"Περιγράψτε τους διακομιστές που εμπιστεύεστε για την πρόληψη υποκλοπἠς των "
+"διαπιστευτηρίων σε περίπτωση επιθέσεων man-in-the-middle."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -591,15 +382,15 @@ msgstr "Προσθέτει μια νέα αρχή πιστοποιητικού
 msgid "&Remove CA"
 msgstr "&Αφαιρέστε CA"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Αφαιρεί επιλεγμένα πιστοποιητικά από τη λίστα"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Αποδεκτά &ονόματα server:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -608,30 +399,30 @@ msgstr ""
 "εξυπηρετητών· αφήστε κενό για να παρακάμψετε την επιλογή ονόματος· "
 "επιτρέπονται οι χαρακτήρες unicode"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Παράδειγμα: foo.bar.com;server2.bar.com)"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr "Πιστοποιητικό χρήστη"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
 "Επιλέξτε το &πιστοποιητικό σας που θα χρησιμοποιηθεί για τον έλεγχο "
 "ταυτότητας."
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr ""
 "Το πιστοποιητικό πελάτη που θα χρησιμοποιηθεί για τον έλεγχο της ταυτότητας"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Προσαρμοσμένη &ταυτότητα:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -639,108 +430,195 @@ msgstr ""
 "Η ταυτότητά σας (username@domain) για να παρακάμψετε ένα πιστοποιητικό· ή "
 "κενό για να χρησιμοποιήσετε όποια ταυτότητα παρέχεται από πιστοποιητικό"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr "Βρέθηκε μη έγκυρος χαρακτήρας στο hostname: %c"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Πρόβλημα επικύρωσης"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr "<κενό>"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr "Προσθήκη Πιστοποιητικού"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Αρχεία Πιστοποιητικών  (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "X.509 Αρχεία Πιστοποιητικών (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "PKCS #7 Αρχεία Πιστοποιητικών (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr "Όλα τα αρχεία (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Άκυρο ή μη υποστηριζόμενο αρχείο πιστοποιητικού %s"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
-msgstr "Απέτυχη η επίκληση της EAP UI ταυτότητας (σφάλμα %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
+msgstr "Εξωτερική ταυτότητα"
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "Απέτυχη η επίκληση της EAP UI ταυτότητας (σφάλμα %u)."
-
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
-"Η επίκληση της διαδραστικότητας του EAP UI απέτυχε (error %u, %s, %s)."
+"Επιλέξτε το αιτούμενο αναγνωριστικό χρήστη να εισάγει τον εαυτο του ως  "
+"πιστοποιητικό:"
 
-#: lib/TTLS_UI/src/Module.cpp:379
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
+msgstr "&Επαληθευμένη Ταυτότητα"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr "Χρησιμοποιήσε το αληθινό όνομα χρήστη μου"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr "Χρησιμοποιήστε &κενή εξωτερική ταυτότητα (RFC 4822)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr ""
+"Παραλείψτε το όνομα χρήστη μου και χρησιμοποιήστε μόνο το @mydomain.org"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr "&Διαμόρφωση της εξωτερικής ταυτότητας:"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr "Καθορίστε τη διαμόρφωση της εξωτερικής ταυτότητας"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr "Προσαρμόστε την εξωτερική ταυτότητα για να την χρησιμοποιήσετε"
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr "Η επίκληση της διαδραστικότητας του EAP UI απέτυχε (error %u)."
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Σφάλμα κατά την εγγραφή των διαπιστευτηρίων στο Credential Manager: %hs "
+"(σφάλμα %u)"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr "Η εγγραφή των διαπιστευτηρίων απέτυχε."
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr "Ταυτοποίηση εσωτερικής ταυτότητας"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr "Επιλέξτε την μέθοδο ταυτοποίησης εσωτερικής ταυτότητας από τη λίστα"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr "Ταυτοποίηση εξωτερικής ταυτότητας"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr "Επιλέξτε την μέθοδο ταυτοποίησης εσωτερικής ταυτότητας από τη λίστα"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr "PAP"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %s από τη "
+"διαμόρφωση;"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr "Προειδοποίηση"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Άλλοι μέθοδοι EAP..."
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr "Ρυθμίσεις παρόχων"
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Η διαγραφή των διαπιστευτηρίων απέτυχε (σφάλμα %u)."
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
-msgstr "Μέθοδος EAP-TTLS"
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr "<σφάλμα %u>"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr "<σφάλμα>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr "<κενό ID>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "&Υπενθύμιση"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr "Ελέγξτε αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr "<Ο Φορέας σας>"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr "Διαμόρφωση σύνδεσης EAP"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr "Μέθοδοι EAP"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr "Ενότητες για την ενίσχυση μεμονωμένων μεθόδων EAP"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr "TTLS"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/es_ES.po

@@ -1,105 +1,28 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2020
-# Alberto Martínez Setién, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Alberto Martínez Setién, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Alberto Martínez <alberto_martinez@deusto.es>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, 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?"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Advertencia"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "Credenciales EAP"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Configuración del proveedor"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "Credenciales %s de usuario"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Error escribiendo credenciales en el Gestor de Credenciales: %hs (error %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Fallo escribiendo credenciales."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Fallo al borrar credenciales (error %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(error %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(error)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr "(ninguno)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr "(ID en blanco)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Recordar"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Marca si quieres guardar las credenciales"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(Su organización)"
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
@@ -124,14 +47,19 @@ msgstr "Avanzado..."
 msgid "Opens dialog with provider settings"
 msgstr "Abrir diálogo configuración de proveedores"
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr "Credenciales %s de usuario"
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
 "Selecciona el repositorio en el que se guardan las credenciales de conexión."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr "Usar desde el &Administrador de Credenciales"
+msgid "Use credentials from Credential &Manager:"
+msgstr "Usa credenciales del &Administrador de Credenciales:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
@@ -141,21 +69,17 @@ msgstr ""
 "Selecciona esta opción si quieres usar credenciales guardadas en el "
 "Administrador de Credenciales de Windows"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identidad:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 "Sus credenciales actuales guardadas en el Administrador de Credenciales de "
 "Windows"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr "&Limpiar Credenciales"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
@@ -163,19 +87,19 @@ msgstr ""
 "Clicar para limpiar sus credenciales del Administrador de Credenciales.\n"
 "Nota: Se le pedirá introducir credenciales al conectarse."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr "&Establecer Credenciales..."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr "Haga clic aquí para establecer o modificar sus credenciales"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr "Usar desde la configuración del &perfil"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
+msgstr "Usa las credenciales de la configuración del &perfil:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -183,49 +107,41 @@ msgstr ""
 "Selecciona esta opción si quieres guardar credenciales como parte de la "
 "configuración del perfil"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr "Credenciales de la configuración del perfil"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr "Identificador de usuario y contraseña"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr "Por favor proporciones su ID de usuario y contraseña."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 "Introduzca su nombre de usuario aquí (usuario@dominio.org, DOMAIN\\User, "
 "etc.)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr "Introduzca su contraseña aquí"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "ID de usuario"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr "Introduzca su ID de usuario, por favor."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr "Su organización"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -234,54 +150,54 @@ msgstr ""
 "organización se muestre, los usuarios encontrarán los mensajes más fáciles "
 "de entender y actuar."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr "&Nombre de su organización:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "El nombre de su organización tal cual aparecerá en las notificaciones de "
 "contacto para soporte"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr "(Se recomienda algo corto)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr "&Información de contacto de soporte:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr "La dirección web para ofrecer soporte"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr "La dirección de correo para soporte"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr "El teléfono para soporte"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr "Identificador único del proveedor"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -289,33 +205,33 @@ msgstr ""
 "Asignar a su organización un identificador único para permitir que el "
 "conjunto de credenciales se comparta entre distintos perfiles de red."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr "&Espacio de nombres:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr "&Identificador único de proveedor:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "El identificador de su organización para asignar las mismas credenciales de "
 "otros perfiles"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr "Bloqueo de configuración"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -324,7 +240,7 @@ msgstr ""
 "accidentales por los usuarios. Estos sólo tendrán permitido introducir "
 "credenciales."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -332,85 +248,44 @@ msgstr ""
 "&Bloquear esta configuración y prevenir así cualquier modificación posterior"
 " en la interfaz de usuario."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Advertencia: ¡Una vez bloqueada, no podrá volver atrás usando este "
 "diálogo!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr "Identidad"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-"Seleccione el ID de usuario con el que el suplicante se presenta al "
-"autenticador:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "Identidad &Real"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Usar mi nombre de usuario real"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr "Usar una identidad &vacía"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr "Omitir mi nombre de usuario y usar @midominio.org sólo"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr "Identidad &personalizada:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr "Especificar identidad personalizada"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr "Identidad personalizada a usar"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "Configuración de conexiones EAP"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "Proveedor de identidad EAP"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "Credenciales %s"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Credenciales EAP"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr "Para ayuda o instrucciones adicionales, por favor contacte con %s en:"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr "su proveedor"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr "Abrir el navegador web por defecto"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr "Abrir su cliente de correo electrónico"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Llamar al teléfono"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
@@ -419,120 +294,38 @@ msgstr ""
 "%s tiene determinadas secciones de configuración pre-establecidas. Dichas "
 "secciones están bloqueadas para evitar modificaciones accidentales."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr "Su proveedor"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 "El intento anterior de conexión reportó que las credenciales no eran "
 "correctas."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 "El intento anterior de conexión reportó que las credenciales han expirado."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 "El intento anterior de conexión reportó que sus credenciales están siendo "
 "cambiadas."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr "Los intentos anteriores de conexión fallaron."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 "Por favor, asegúrese de que sus credenciales son correctas, o inténtelo de "
 "nuevo más tarde."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-"La versión %s instalada en este ordenador registra las credenciales de forma"
-" abierta y fácil de leer."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr "Por favor, reconsidera la necesidad de introducir tus credenciales."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Método EAP interno"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Selecciona y configura un método EAP interno"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "&Configuración"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Fallo al enumerar los métodos EAP (error %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Fallo al enumerar los métodos EAP (error %u)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Fallo al configurar el método EAP (error %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "Fallo al configurar el método EAP (error %u)."
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr "Reto GTC"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr "Introduzca su respuesta, por favor."
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr "Reto del servidor"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr "Introduzca su respuesta aquí"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr "Autenticación EAP-GTC &mode:"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr "Elija un modo de autenticación EAP-GTC de la lista"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr "Reto/Respuesta"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr "Contraseña"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr "Reto %s"
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr "Identificador MSCHAPv2 de usuario y contraseña"
@@ -546,9 +339,12 @@ msgid "Server Trust"
 msgstr "Confianza en el servidor"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
-"Describa los servidores confiables para prevenir ataques man-in-the-middle."
+"Describa los servidores confiables para prevenir que las credenciales puedan"
+" ser interceptadas en caso de ataques man-in-the-middle"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -586,15 +382,15 @@ msgstr ""
 msgid "&Remove CA"
 msgstr "&Borrar una CA"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Borrar las autoridades de certificación de la lista"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Nombres de servidor &aceptables:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -602,27 +398,27 @@ 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"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Ejemplo: foo.bar.com;servidor2.bar.com)"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr "Certificado de usuario"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Por favor seleccione su &certificado a usar para la autenticación."
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Certificado de cliente a utilizar para autenticación"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "&Identidad personalizada:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -630,109 +426,193 @@ msgstr ""
 "Su identidad (usuario@dominio) que sobreescribirá la del certificado; o en "
 "blanco para usar la proporcionada en el certificado"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr "Carácter no válido en el nombre: %c"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Conflicto de validación"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr "<vació>"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr "Añadir Certificado"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Ficheros de certificado (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "Ficheros de certificado X.509 (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "Ficheros de certificados PKCS #7 (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr "Todos los ficheros (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Fichero de certificado %s es inválido o no está soportado"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr "Error"
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
+msgstr "Identidad Externa"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
-"Fallo al lanzar la interfaz de usuario de identidad EAP (error %u, %s, %s)."
+"Seleccione el ID de usuario con el que el suplicante se presenta al "
+"autenticador:"
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "Fallo al lanzar la interfaz de usuario de identidad EAP (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
+msgstr "Identidad &Real"
 
-#: lib/TTLS_UI/src/Module.cpp:376
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr "Usar mi nombre de usuario real"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr "Usar una identidad externa &vacía (RFC 4822)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr "Omitir mi nombre de usuario y usar @midominio.org sólo"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr "Identidad externa personalizada:"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr "Especificar identidad externa personalizada"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr "Identidad externa personalizada a usar"
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
-"Fallo al lanzar la interfaz de usuario interactiva EAP (error %u, %s, %s)."
+"Error escribiendo credenciales en el Gestor de Credenciales: %hs (error %u)"
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr "Fallo al lanzar la interfaz de usuario interactiva EAP (error %u)."
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr "Fallo escribiendo credenciales."
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr "Autenticación interna"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr "Seleccione un método de autenticación interna de la lista"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr "Autenticación externa"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr "Seleccione un método de autenticación interna de la lista"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr "PAP"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, 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?"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr "Advertencia"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Otros métodos EAP..."
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr "Configuración del proveedor"
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Fallo al borrar credenciales (error %u)."
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
-msgstr "Método EAP-TTLS"
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr "<error %u>"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr "<error>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr "<ID en blanco>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "&Recordar"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr "Marca si quieres guardar las credenciales"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr "<Su organización>"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr "Configuración de conexiones EAP"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr "Métodos EAP"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr "Módulos para soportar métodos EAP individualmente"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr "TTLS"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/et_EE.po

@@ -1,721 +0,0 @@
-# Translators:
-# Indrek Rokk <indrek.rokk@eenet.ee>, 2018
-# Anne M <anne@eenet.ee>, 2019
-# Simon Rozman <simon@rozman.si>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
-"Language-Team: Estonian (https://www.transifex.com/eduroam_devel/teams/11799/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
-"X-Poedit-Basepath: ../..\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-"Kas oled kindel, et soovid %s teenusepakkuja seadistusest püsivalt "
-"eemaldada?"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Hoiatus"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "EAP kasutajakonto"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Teenusepakkuja seadistused"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s kasutajakonto andmed"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Viga kasutajakonto andmete kirjutamisel kasutajakonto halduris (Credential "
-"Manager): %hs (viga %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Kasutajakonto andmete kirjutamine ebaõnnestus"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Kasutajakonto andmete kustutamine ebaõnnestus (viga %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(viga %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(viga)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr "(tühi ID)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Jäta meelde"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Linnuta, kui soovid kasutajakonto andmeid salvestada"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(Sinu asutus)"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
-msgid "+"
-msgstr "+"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
-msgid "Adds new provider"
-msgstr "Lisab uue teenusepakkuja"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
-msgid "-"
-msgstr "-"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
-msgid "Removes selected provider"
-msgstr "Eemaldab valitud teenusepakkuja"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
-msgid "Advanced..."
-msgstr "Keerukam..."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:48
-msgid "Opens dialog with provider settings"
-msgstr "Avab teenusepakkuja seadistuste dialoogi"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
-msgid "Select the source where your credentials used to connect are stored."
-msgstr ""
-"Vali koht, kuhu Su ühendumiseks kasutatud kasutajakonto andmed on "
-"salvestatud."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
-msgid ""
-"Select this option if you would like to use credentials stored in Windows "
-"Credential Manager"
-msgstr ""
-"Vali see võimalus, kui soovid kasutada Windowsi kasutajakontode halduris "
-"(Windows Credential Manager) salvestatud kontoandmeid"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identiteet:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
-msgid "Your present credentials stored in Windows Credential Manager"
-msgstr ""
-"Sinu praegused, Windowsi kasutajakontode halduris (Windows Credential "
-"Manager) salvestatud kontoandmed"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-msgid "&Clear Credentials"
-msgstr "&Kustuta kasutajakonto andmed"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
-msgid ""
-"Click to clear your credentials from Credential Manager.\n"
-"Note: You will be prompted to enter credentials when connecting."
-msgstr ""
-"Klõpsa. et kustutada oma andmed kasutajakonto haldurist.\n"
-"Märkus: Ühendumisel lastakse Sul sisestada kasutajakonto andmed."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
-msgid "&Set Credentials..."
-msgstr "&Määra kasutajakonto andmed..."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
-msgid "Click here to set or modify your credentials"
-msgstr "Klõpsa siin oma kasutajakonto andmete määramiseks või muutmiseks"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
-msgid ""
-"Select this option if you would like to store credentials as a part of  "
-"profile configuration"
-msgstr ""
-"Vali see võimalus, kui soovid salvestada kasutajakonto andmed profiili "
-"seadistustesse."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
-msgid "Profile configuration credentials"
-msgstr "Profiili seadistuse kasutajaandmed"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
-msgid "User ID and Password"
-msgstr "Kasutaja ID ja parool"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
-msgid "Please provide your user ID and password."
-msgstr "Palun sisesta oma kasutaja ID ja parool"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
-msgid "User ID:"
-msgstr "Kasutaja ID:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
-msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
-msgstr "Sisesta siin oma kasutajanimi (nimi@domeen.ee, DOMEEN\\kasutaja vmt)"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
-msgid "Password:"
-msgstr "Parool:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
-msgid "Enter your password here"
-msgstr "Sisesta siin oma parool"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "Kasutaja ID"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr "Palun sisesta oma kasutaja ID (kasutajanimi)."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
-msgid "Your Organization"
-msgstr "Sinu asutus"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
-msgid ""
-"Describe your organization to customize user prompts.  When organization is "
-"introduced, end-users find program messages easier to understand and act."
-msgstr ""
-"Kirjelda oma asutust, et seadistada kasutajaviibad. Kui asutus on "
-"kirjeldatud, on lõppkasutajatel lihtsam programmi sõnumeid mõista ja neist "
-"juhinduda."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
-msgid "Your organization &name:"
-msgstr "Sinu asutuse &nimi:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
-msgid ""
-"Your organization name as it will appear on helpdesk contact notifications"
-msgstr ""
-"Sinu asutuse nimi, mida näidatakse kasutajatoega kontakteerumise teadetes"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
-msgid "(Keep it short, please)"
-msgstr "(Palun kirjuta lühidalt)"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
-msgid "Helpdesk contact &information:"
-msgstr "Kasutajatoe k&ontaktteave:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
-msgid "Your helpdesk website address"
-msgstr "Sinu kasutajatoe veebiaadress"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
-msgid "Your helpdesk e-mail address"
-msgstr "Sinu kasutajatoe e-posti aadress"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
-msgid "Your helpdesk phone number"
-msgstr "Sinu kasutajatoe telefoninumber"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
-msgid "Provider Unique Identifier"
-msgstr "Teenusepakkuja unikaalne identifikaator"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
-msgid ""
-"Assign your organization a unique ID to allow sharing the same credential "
-"set across different network profiles."
-msgstr ""
-"Määra oma asutusele unikaalne ID, et samu kontoandmeid saaks kasutada "
-"erinevatel võrguprofiilidel."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
-msgid "&Namespace:"
-msgstr "&Nimeruum:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
-msgid "urn:RFC4282:realm"
-msgstr "urn:RFC4282:realm"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
-msgid "urn:uuid"
-msgstr "urn:uuid"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
-msgid "Provider unique &identifier:"
-msgstr "Teenusepakkuja unikaalne &identifikaator:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
-msgid "Your organization ID to assign same credentials from other profiles"
-msgstr "Sinu asutuse ID, et määrata samu kontoandmeid teistelt profiilidelt"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
-msgid "Configuration Lock"
-msgstr "Seadistuslukk"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
-msgid ""
-"Your configuration can be locked to prevent accidental modification by end-"
-"users. Users will only be allowed to enter credentials."
-msgstr ""
-"Seadistuslukk ei lase lõppkasutajatel kogemata muudatusi teha. Kasutajad "
-"saavad ainult kasutajakontoandmeid sisestada."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
-msgid ""
-"&Lock this configuration and prevent any further modification via user "
-"interface."
-msgstr ""
-"&Lukusta see seadistus ja hoia ära selle muutmine kasutajaliidese kaudu"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
-msgid "(Warning: Once locked, you can not revert using this dialog!)"
-msgstr ""
-"(Hoiatus: Lukustamise järel ei saa Sa seda dialoogi kasutades tehtut tagasi "
-"pöörata!)"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr "Vali kasutajanimi, mida pistikprogramm autentijale näitab:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "&Tõene identiteet"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Kasuta mu tõest kasutajanime"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr "Jäta mu kasutajanimi ära ja kasuta ainult @minudomeeni"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "EAP ühenduse seadistus"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "EAP identiteedipakkuja"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
-#, c-format
-msgid "%s Credentials"
-msgstr "%s kasutajakonto andmed"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
-#, c-format
-msgid "For additional help and instructions, please contact %s at:"
-msgstr "Abi ja juhendite saamiseks võta palun ühendust: %s "
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
-msgid "your provider"
-msgstr "sinu teenusepakkuja"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
-msgid "Open the default web browser"
-msgstr "Ava vaikimisi määratud veebilehitseja"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
-msgid "Open your e-mail program"
-msgstr "Ava oma e-postiprogramm"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
-msgid "Dial the phone number"
-msgstr "Vali telefoninumber"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
-#, c-format
-msgid ""
-"%s has pre-set parts of this configuration. Those parts are locked to "
-"prevent accidental modification."
-msgstr ""
-"%s omab selles seadistuses eelseatud osi, mis on juhuslike muudatuste eest "
-"kaitsmiseks lukustatud."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
-msgid "Your provider"
-msgstr "Sinu teenusepakkuja"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
-msgid "Previous attempt to connect reported invalid credentials."
-msgstr "Eelmine ühendumiskatse oli mittekehtivate kasutajakonto andmetega."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
-msgid "Previous attempt to connect reported your credentials expired."
-msgstr "Eelmise ühendumiskatse kohaselt olid su kasutajakonto andmed aegunud."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
-msgid ""
-"Previous attempt to connect reported your credentials are being changed."
-msgstr "Eelmise ühendumiskatse kohaselt on su kasutajakonto andmed muutmisel."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
-msgid "Previous attempt to connect failed."
-msgstr "Eelmine ühendumiskatse ebaõnnestus."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
-msgid "Please, make sure your credentials are correct, or try again later."
-msgstr ""
-"Palun veendu, et Su kasutajakonto andmed on korrektsed, või proovi hiljem "
-"uuesti."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-"%s versioon selles arvutis logib kasutajakonto andmeid nähtavalt ja lihtsalt"
-" loetavalt."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr "Palun kaalu oma kasutajakonto andmete sisestamise vajalikkust."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Sisemine EAP meetod"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Vali ja seadista sisemine EAP meetod"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "&Seadistused"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "EAP meetodite loetlemine ebaõnnestus (viga %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "EAP meetodite loetlemine ebaõnnestus (viga %u)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "EAP meetodi seadistamine ebaõnnestus (viga %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "EAP meetodi seadistamine ebaõnnestus (viga %u)."
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr "GTC pretensioon"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr "Palun sisesta oma vastus."
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr "Serveri pretensioon"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr "Sisesta siin oma vastus."
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr "EAP-GTC &autentimisrežiim:"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr "Vali loetelust EAP-GTC autentimisrežiim"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr "Pretensioon/Vastus"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr "Parool"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr "%s pretensioon"
-
-#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
-msgid "MSCHAPv2 User ID and Password"
-msgstr "MSCHAPv2 kasutajanimi ja parool"
-
-#: lib/PAP_UI/src/PAP_UI.cpp:33
-msgid "PAP User ID and Password"
-msgstr "PAP kasutajanimi ja parool"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:17
-msgid "Server Trust"
-msgstr "Serveri usaldamine"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
-msgstr ""
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:35
-msgid "Acceptable Certificate Authorities:"
-msgstr "Lubatud sertifitseerimiskeskused:"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:40
-msgid ""
-"Server's certificate must be issued by one of certificate authorities listed"
-" here"
-msgstr ""
-"Serverisertifikaat peab olema väljastatud siin loetletud "
-"sertifitseerimiskeskuse poolt"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:47
-msgid "Add CA from Store..."
-msgstr "Lisa sertifikaadilaost CA..."
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:48
-msgid ""
-"Adds a new certificate authority from the certificate store to the list"
-msgstr "Lisab sertikaadilaost nimekirja uue sertifitseerimiskeskuse"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:52
-msgid "Add CA from File..."
-msgstr "Lisa failist CA..."
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:53
-msgid "Adds a new certificate authority from the file to the list"
-msgstr "Lisab failist nimekirja uue sertifitseerimiskeskuse"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:57
-msgid "&Remove CA"
-msgstr "Eemalda &CA"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
-msgid "Removes selected certificate authorities from the list"
-msgstr "Eemaldab valitud sertifitseerimiskeskused nimekirjast"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
-msgid "Acceptable server &names:"
-msgstr "Lubatud serveri&nimed:"
-
-#: 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 ""
-"Semikoolonitega eraldatult nimekiri lubatud serverite FQDN nimedest; "
-"nimekontrolli vahelejätmiseks tühik; lubatud on Unicode märgistik"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
-msgid "(Example: foo.bar.com;server2.bar.com)"
-msgstr "(Näide: yks.näide.ee;2.teine.ee)"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
-msgid "User Certificate"
-msgstr "Kasutaja sertifikaat"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
-msgid "Please select your &certificate to use for authentication."
-msgstr "Palun vali autentimiseks oma serti&fikaat"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
-msgid "Client certificate to use for authentication"
-msgstr "Autentimisel kasutatav kliendisertifikaat"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
-msgid "Custom &identity:"
-msgstr "Kohandatud &identiteet:"
-
-#: 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 ""
-"Sinu identiteet (kasutajanimi@domeen), millega kirjutatakse üle "
-"sertifikaadis olev; kui jätad tühjaks, kasutatakse sertifikaadis olevat"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:256
-msgid "Add Certificate"
-msgstr "Lisa sertifikaat"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:257
-msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
-msgstr "Sertifikaadi failid (*.cer;*.crt;*.der;*.p7b;*.pem)"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:258
-msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
-msgstr "X.509 sertifikaadi failid (*.cer;*.crt;*.der;*.p7b;*.pem)"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:259
-msgid "PKCS #7 Certificate Files (*.p7b)"
-msgstr "PKCS #7 sertifikaadi failid (*.p7b)"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:260
-msgid "All Files (*.*)"
-msgstr "Kõik failid (*.*)"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:274
-#, c-format
-msgid "Invalid or unsupported certificate file %s"
-msgstr "Vigane või mittetoetatud sertifikaadifail %s"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:274
-msgid "Error"
-msgstr "Viga"
-
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
-msgstr "EAP identiteedi UI aktiveerimine ebaõnnestus (viga %u, %s, %s)."
-
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "EAP identiteedi UI aktiveerimine ebaõnnestus (viga %u)."
-
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
-msgstr "EAP interaktiivse UI aktiveerimine ebaõnnestus (viga %u, %s, %s)."
-
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr "EAP interaktiivse UI aktiveerimine ebaõnnestus (viga %u)."
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
-msgid "Inner Authentication"
-msgstr "Sisemine autentimine"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr "Vali nimekirjast sisemise autentimise meetod"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Väline autentimine"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
-msgid "PAP"
-msgstr "PAP"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Muud EAP meetodid..."
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
-msgstr ""
-
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP Methods"
-msgstr "EAP meetodid"
-
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-msgid "Modules to support individual EAP methods"
-msgstr "Moodulid individuaalsete EAP meetodite toeks"

EAPMethods/locale/hr_HR.po

@@ -1,106 +1,28 @@
-# Translators:
-# Dubravko Penezic <dpenezic@gmail.com>, 2018
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Dubravko Penezic <dpenezic@gmail.com>, 2016\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/eduroam_devel/teams/11799/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr_HR\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, 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 ? "
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Upozorenje"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "EAP korisničke oznake"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Postavke davatelja usluge"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s korisničke vjerodajnice"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Greška pri zapisivanju podataka o identitetu u Upravitelju vjerodajnica: %hs"
-" (error %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Zapisivanje podataka o identitetu nije uspijelo."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Brisanje podataka o identitetu nije uspijelo (error %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(greška %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(greška)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr "(bez)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr "(prazni ID)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Podsjeti"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Provjerite želite li spremiti vjerodajnice"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(Vaša organizacija)"
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
@@ -125,104 +47,92 @@ msgstr "Napredno..."
 msgid "Opens dialog with provider settings"
 msgstr "Otvaranje dialoga s postavkama davatelja usluge"
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr ""
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
-"Odaberite izvor na kojem su pohranjene vaše vjerodajnice za povezivanje."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr "Upotrijebite iz Upravitelja vjerodajni&ca"
+msgid "Use credentials from Credential &Manager:"
+msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
 msgstr ""
-"Odaberite ovu opciju ako želite koristiti vjerodajnice pohranjene u Windows "
-"upravitelju vjerodajnica"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identitet"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
-msgstr "Vaše vjerodajnice pohranjene u Windows upravitelju vjerodajnica"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
-msgstr "&Izbriši vjerodajnice"
+msgstr "&Obriši korisničke podatke"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
-"Odaberi kako bi se obrisali korisnički podaci u Upravitelju vjerodajnica.\n"
+"Odaberi kako bi se obrisali korisnički podaci u Credential Manager.\n"
 "Opaska: Biti će te pitani za korisničke podatke po spajanju."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr "&Postavi korisničke podatke..."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr "Odaberi ako je potrebno postaviti korisničke podatke"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr "Upotrijebite iz konfiguracije &profila"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
-"Odaberite ovu opciju ako želite pohraniti vjerodajnice kao dio konfiguracije"
-" profila"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
-msgstr "Potvrde o konfiguraciji profila"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
-msgstr "Korisnički ID i lozinka"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr "Molimo postavite svoju korisničku oznaku i lozinku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr "Korisnička oznaka:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr "Unesi svoju korisnicku oznaku (pero@pero.hr)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr "Unesi svoju lozinku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "Korisnička oznaka"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr "Unesite korisničko ime i zaporku."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr "Vaša ustanova"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -231,52 +141,52 @@ msgstr ""
 "ustanova prestavljena, krajnji korisnik će lakše obaviti postavljanje "
 "postavki."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr "Ime vaše &ustanove:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr "Ime vaše ustanove će se pojaviti na obavijesti helpdesk-u"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr "(Ukratko, molim)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr "Kontakt &podaci helpdesk-a:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr "Web adresa vašeg helpdesk-a"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr "E-mail adresa vašeg helpdesk-a"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr "Telefonski broj vašeg helpdesk-a"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr "Jedinstveni identifikator davatelja usluge"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -284,31 +194,31 @@ msgstr ""
 "Prijavite ID vaše ustanove kako bi se mogao koristiti za različite mrežne "
 "profile"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr "Davatelj jedinstvene &identifikacije:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr "ID vaše ustanove se pojavljuje i kod drugih korisničkih podataka"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr "Zaključaj posatvke"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -316,7 +226,7 @@ msgstr ""
 "Vaše postavke su zaključane kao bi se zaštile od nehotične promjene krajnjeg"
 " korisnika. Korisnik će moći unjeti samo svoje korisničke podatke."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -324,84 +234,42 @@ msgstr ""
 "&Zaključaj postavke kako bi onemomogučili kasniju promjenu kroz korisničko "
 "sučelje"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr "(Upozorenje: Jednom zaključano, nemože se otključati ovim dijalogom!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr "Identitet"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-"Odaberi korisnički ID s kojim će se supplicant predstavljati autentikatoru."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "&Stvarna korisnička oznaka"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Koristi moju stvarnu korisničku oznaku"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr "Koristi &prazan identitet"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr ""
-"Koristi samo @mojadomena.hr (ovo nije podržano za korisnike iz sustava "
-"AAI@EduHr)"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr "Samostalno odabrani &identitet:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr "Specijalni identitet"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr "Samostalno odabrani identitet koji će se koristiti"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "Parametri EAP konekcije"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "Davatelj EAP identiteta"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "%s korisnički podatci"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP korisničke oznake"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr "Za dodatnu pomoć i postavke kontaktiraj %s :"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr "vaš davatelj usluge"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr "Otvori standardni web preglednik"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr "Otvorite vaš e-mail program"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Nazovi telefonski broj"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
@@ -410,131 +278,51 @@ msgstr ""
 "%s ima predefinirane postavke. Te postavke su zaključane kako bi spriječile "
 "slučajnu promjenu."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr "Vaš davatelj usluge"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 "Prethodni pokušaj spajanja je prijavio da su korišteni netočni korisnički "
 "podaci."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 "Prethodni pokušaj spajanja je prijavio da su korisnički podaci istekli."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 "Prethodni pokušaj spajanja je priojavio da su promjenjeni korisnički podaci."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr "Prethodni pokušaj spajanja nije uspio."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr "Molimo provjeritet da je certifikat dobar ili pokušajte kasnije."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-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."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr "Molimo, ponovno razmotrite potrebu za unos vjerodajnica."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Unutarnja EAP metoda"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Odaberite i konfigurirajte unutarnju EAP metodu"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "&Postavke"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Nije uspjelo nabrajanje metoda EAP (pogreška% u,% s,% s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Nije uspjelo nabrajanje metoda EAP (pogreška% u)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Nije uspjela konfiguracija EAP metode (pogreška% u,% s,% s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "Nije uspjela konfiguracija EAP metode (pogreška% u)."
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr "GTC izazov"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr "Navedite odgovor."
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr "Izazov poslužitelja"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr "Unesite svoj odgovor ovdje"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr "EAP-GTC autentifikacija i &način rada:"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr "Na popisu odaberite način provjere autentikacije EAP-GTC"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr "Izazov / Odgovor"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr "Lozinka"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr "$s Izazov"
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
-msgstr "Korisnički ID i lozinka MSCHAPv2"
+msgstr ""
 
 #: lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
-msgstr "PAP User ID i Lozinka"
+msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
-msgstr "Povjerenje poslužitelja"
+msgstr "Server Trust"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
 "Opisivanje autentikacijskog poslužitelja kako bi se izbjegao MitM napad."
 
@@ -546,7 +334,7 @@ msgstr "Prihvatljivi certifikat autoriteti: "
 msgid ""
 "Server's certificate must be issued by one of certificate authorities listed"
 " here"
-msgstr "Certifikat poslužitelja mora izdati ovlašteni izdavatelj certifikata"
+msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:47
 msgid "Add CA from Store..."
@@ -569,15 +357,15 @@ msgstr "Dodavanje novog certifikat autoriteta na listu"
 msgid "&Remove CA"
 msgstr "&Micanje CA"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "MIcanje odabranih certifikat autoriteta s liste"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Prihvatljiv &naziv poslužitelja "
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -585,27 +373,27 @@ msgstr ""
 "Točka-zarez odvaja listu FQDN naziva, prazno polje ne provjerava naziv; "
 "moguće korištenje Unicode znakova"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Primjer: pero.hr;freeradius.primjer.hr)"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
-msgstr "Korisnički certifikat"
+msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
-msgstr "Odaberite &certifikat koji ćete koristiti za autentikaciju."
+msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Klijentski certifikat za autentikaciju"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
-msgstr "Samostalno odabrani &identitet:"
+msgstr "Samostalno odabrani &identitet"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -613,107 +401,197 @@ 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"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr "Nevažeći znak u imenu poslužitelja %c"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Problem s provjerom"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr "<prazno>"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr "Dodaj certifikat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "PKCS #7 Certificate Files (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr "Sve datoteke (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Nevažeća ili nepodržana datoteka s certifikatom %s "
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr "Greška"
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
-msgstr "Neuspjelo otvaranje korisničkog sučelja EAP identiteta."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
+msgstr "Vanjski korisnički identitet"
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "Otvaranje korisničkog sučelja za identitet EAP nije uspjelo"
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
+msgstr ""
+"Odaberi korisnički ID s kojim će se supplicant predstavljati autentikatoru."
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
-msgstr "Neuspješno pokretanje interaktivnog korisničkog sučelja EAP."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
+msgstr "&Stvarna korisnička oznaka"
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr "Pokretanje EAP interaktivnog korisničkog sučelja nije uspjelo."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr "Koristi moju stvarnu korisničku oznaku"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr ""
+"Koristi &prazan vanjski identitet (RFC 4822) (ovo nije podržano za korisnike"
+" iz sustava AAI@EduHr)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr ""
+"Koristi samo @mojadomena.hr (ovo nije podržano za korisnike iz sustava "
+"AAI@EduHr)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr "&Samostalno odabrani vanjski identitet"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr "Specijalni vanjski identitet"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr "Samostalno odabrani vanjski identitet koji će se koristiti"
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
+#, 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)"
+
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr "Zapisivanje podataka o identitetu nije uspijelo."
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr "Unutrašnja autentikacija"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr "Odaberi unutrašnji autentikacijski mehanizam s liste"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr "Vanjska autentikacija"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr "Odaberi unutrašnji autentikacijski mehanizam s liste"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr "PAP"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, 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 ? "
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr "Upozorenje"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Ostale EAP metode..."
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr "Postavke davatelja usluge"
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Brisanje podataka o identitetu nije uspijelo (error %u)."
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
-msgstr "EAP-TTLS metoda"
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr "<greška %u>"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr "<greška>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr "<prazni ID>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "&Podsjeti"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr "<Vasa organizacija>"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr "Parametri EAP konekcije"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr "EAP metode"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr "Moduli za podršku pojedinim EAP metodama"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr "TTLS"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/hu_HU.po

@@ -1,101 +1,28 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr ""
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr ""
@@ -120,12 +47,17 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr ""
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
+msgid "Use credentials from Credential &Manager:"
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
@@ -134,361 +66,230 @@ msgid ""
 "Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
 "prevent accidental modification."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr ""
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr ""
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr ""
@@ -502,7 +303,9 @@ msgid "Server Trust"
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
@@ -536,147 +339,228 @@ msgstr ""
 msgid "&Remove CA"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr ""
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
-msgstr "PAP"
+msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
 msgstr ""
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %ls provider from configuration?"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr ""

EAPMethods/locale/nb_NO.po

@@ -1,105 +1,28 @@
-# Translators:
-# Tom Ivar Myren <tom.myren@uninett.no>, 2017
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Tom Ivar Myren <tom.myren@uninett.no>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, 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?"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Advarsel"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "EAP brukeropplysninger"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Tilbyder innstillinger"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s Påloggingsinformasjon"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Feil under skriving av brukeropplysninger til Credential Manager: %hs (feil "
-"%u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Skriving av brukeropplysninger feilet."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Sletting av brukeropplysninger feilet (feil %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(feil %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(feil)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Husk"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Huk av om du vil lagre brukeropplysninger "
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(Din organisasjon)"
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
@@ -124,13 +47,18 @@ msgstr "Avansert..."
 msgid "Opens dialog with provider settings"
 msgstr "Åpner dialog med tilbyder innstillinger"
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Påloggingsinformasjon"
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr "Velg kilden for din påloggingsinformasjon"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr ""
+msgid "Use credentials from Credential &Manager:"
+msgstr "Bruk brukerdetaljer fra Credential &Manager:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
@@ -140,19 +68,15 @@ msgstr ""
 "Velg denne opsjonen om du vil bruke brukerinformasjon lagret i Windows "
 "Credential Manager"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identitet:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr "Din nåværende brukerinformasjon i Windows Credential Manager"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr "&Fjern påloggingsinformasjon"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
@@ -160,19 +84,19 @@ msgstr ""
 "Klikk for å fjerne påloggingsinformasjon fra Credential Manager.\n"
 "Merk: Du vil bli bedt om å oppgi påloggingsinformasjon når du kobler til."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr "&Sett påloggingsinformasjon"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr "Klikk her for å sette eller endre påloggingsinformasjon"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
+msgstr "Bruk brukerinformasjon fra &profil konfigurasjon:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -180,47 +104,39 @@ msgstr ""
 "Velg denne opsjonen om du vil lagre brukerinformasjon som en del av profil "
 "konfigurasjon"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr "Profil konfigurasjon brukerinformasjon"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr "Bruker ID og passord"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr "Vennligst oppgi bruker ID og passord."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr "Oppgi ditt brukernavn (bruker@domain.org, DOMIAN\\User, etc)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Passord:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr "Oppgi ditt passord"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "Bruker ID"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr "Vennligst oppgi bruker ID."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr "Din organisasjon"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -229,53 +145,53 @@ msgstr ""
 "organisasjon introduseres vil sluttbrukere lettere forstå meldinger fra "
 "programmet og kan gi korrekt respons."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr "Din organisasjons %navn:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "Din organisasjons navn som det vil fremkomme på kontakt helpdesk varslinger"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr "(Vennligst, vær kort)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr "Helpdesk kontakt&informasjon:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr "Nettadresse til din helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr "E-post adresse til din helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr "Telefonnummer til din helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr "Oppgi unik identifikator"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -283,33 +199,33 @@ msgstr ""
 "Tildel din organisasjon en unik ID for å tillate bruk av de samme "
 "brukeropplysninger i forskjellige nettverksprofiler"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr "Oppgi unik &identifikator:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "Din organisasjons ID for å kunne bruke de samme brukeropplysninger i andre "
 "profiler"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr "Konfigurasjonslås"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -317,89 +233,49 @@ msgstr ""
 "Din konfigurasjon kan låses for å hindre utilsiktet modifikasjon av "
 "sluttbrukere. Brukere vil kun kunne oppgi brukerinformasjon."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
 msgstr ""
 "&Lås denne konfigurasjonen og hindre modifikasjon via brukergrensesnitt."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr "(Advarsel: Når låst, kan du ikke gå tilbake til denne dialogen!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-"Velg den bruker ID som supplikat introduserer seg som til autentikator:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "&Faktisk identitet"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Bruke mitt faktiske brukernavn"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr "Utelat mitt brukernavn og bruk kun @mydomian.org"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "Konfigurasjon av EAP forbindelse"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "EAP Identitetstilbyder"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "%s Brukeropplysninger"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP brukeropplysninger"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr "For mer hjelp og instruksjoner, kontakt %s via:"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr "Din tilbyder"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr "Åpne standard nettleser"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr "Åpne e-post program"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Ring telefon"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
@@ -408,118 +284,36 @@ msgstr ""
 "%s har pre-satt deler av denne konfigurasjonen. De delene er låst for å "
 "hindre utilsiktet modifikasjon."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr "Din tibyder"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr "Tidligere forsøk på tilkobling rapporterte feil brukeropplysninger."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 "Tidligere forsøk på tilkobling rapporterte brukeropplysninger utløpt på dato"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 "Tidligere forsøk på tilkobling rapporterte at dine brukeropplysninger blir "
 "endret. "
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr "Tidligere forsøk på tilkobling feilet."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 "Vennligst sjekk at dine brukeropplysninger er korrekt, eller prøv igjen "
 "senere."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-"%s versjonen som er installert på denne enheten logger brukeropplysninger på"
-" en synlig og lettlest måte. "
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr "Vennligst revurder nødvendigheten av å oppgi dine brukeropplysninger."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Indre EAP metode"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Velg og konfigurer indre EAP metode"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "&Innstillinger"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Listede EAP metoder feilet (feil %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Listede EAP metoder feilet (feil %u)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Konfigurasjon av EAP metode feilet (feil %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "Konfigurasjon av EAP metode feilet (feil %u)."
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr "GTC Challenge"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr "Vennligst responder."
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr "Server challenge"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr "Skriv din respons her"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr "EAP-GTC autentisering &modus:"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr "Velg EAP-GTC autentiseringsmodus fra listen"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr "Challenge/Response"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr "Passord"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr "%s Challenge"
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr "MSCHAPv2 bruker ID and passord"
@@ -533,8 +327,12 @@ msgid "Server Trust"
 msgstr "Server Trust"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
+"Beskriv tjenere du stoler på for å hindre tyveri av brukeropplysninger i "
+"tilfelle et man-in-the-middle angrep."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -569,15 +367,15 @@ msgstr "Legger til en ny CA fra filen til listen"
 msgid "&Remove CA"
 msgstr "&Fjern CA"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Fjerner valgte CA fra listen"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Aksepterte tjener&navn:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -585,27 +383,27 @@ msgstr ""
 "En semikolon separert liste med aksepterte tjener FQDN navn; blank for å "
 "hoppe over navne sjekk; Unicode tegn er tillatt"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Eksempel: foo.bar.com;server2.bar.com)"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr "Bruker sertifikat"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Vennligst velg ditt &sertifikat for autentisering."
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Klientsertifikat for autentisering "
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Tilpasset &identitet:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -613,107 +411,192 @@ msgstr ""
 "Din identitet (brukernavn@domene) for overskriving av sertifikat; eller tomt"
 " for å bruke den fra sertifikatet. "
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr "Ugyldig tegn funnet i navn: %c"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Valideringskonflikt"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr "<tom>"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr "Legg til sertifikat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Sertifikat filer  (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "X.509 sertifikat filer (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "PKCS #7 sertifikat filer (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr "Alle filer (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Ugyldig eller ikke støttet sertifikat fil %s"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr "Feil"
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
-msgstr "Kall av EAP identitet UI feilet (feil %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
+msgstr "Ytre identitet"
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "Kall av EAP identitet UI feilet (feil %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
+msgstr ""
+"Velg den bruker ID som supplikat introduserer seg som til autentikator:"
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
-msgstr "Kall av EAP interaktivt UI feilet (feil %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
+msgstr "&Faktisk identitet"
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr "Kall av EAP interaktivt UI feilet (feil %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr "Bruke mitt faktiske brukernavn"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr "Bruk &tom ytre identitet (RFC 4822)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr "Utelat mitt brukernavn og bruk kun @mydomian.org"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr "&Tilpasset ytre identitet:"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr "Spesifiser tilpasset ytre identitet"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr "Tilpasset ytre identitet som brukes"
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Feil under skriving av brukeropplysninger til Credential Manager: %hs (feil "
+"%u)"
+
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr "Skriving av brukeropplysninger feilet."
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr "Indre autentisering"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr "Velg den indre autentiseringsmetoden fra listen"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr "Ytre autentisering"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr "Velg den indre autentiseringsmetoden fra listen"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr "PAP"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Andre EAP metoder..."
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, 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?"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr "Advarsel"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr "Tilbyder innstillinger"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Sletting av brukeropplysninger feilet (feil %u)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr "<feil %u>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr "<feil>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr "<blank ID>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "&Husk"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr "Huk av om du vil lagre brukeropplysninger "
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr "<Din organisasjon>"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr "Konfigurasjon av EAP forbindelse"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr "EAP Metoder"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr "Moduler for støtte av individuelle EAP metoder"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr "TTLS"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/pl_PL.po

@@ -1,102 +1,28 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Tomasz Wolniewicz <tw2529@gmail.com>, 2016\n"
 "Language-Team: Polish (Poland) (https://www.transifex.com/eduroam_devel/teams/11799/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_PL\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-"X-Generator: Poedit 2.2.4\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, 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?"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "Poświadczenia EAP"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Ustawienia dostawcy tożsamości"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "Poświadczenia użytkownika %s"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, 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)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Nie udało się zapisać poświadczeń."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Błąd przy usuwaniu poświadczeń (błąd %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(błąd %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(błąd)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr "(puste ID)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Zapamiętaj"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Zaznacz, jeżeli chcesz zachować swoje poświadczenia"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(Twoja Instytucja)"
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
@@ -121,13 +47,17 @@ msgstr "Zaawansowane..."
 msgid "Opens dialog with provider settings"
 msgstr "Otwiera okno z ustawieniami dostawcy tożsamości"
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr ""
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
-"Wskaż miejsce, gdzie będą przechowywane Twoje poświadczenia logowania."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
+msgid "Use credentials from Credential &Manager:"
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
@@ -135,22 +65,16 @@ msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
 msgstr ""
-"Zaznacz tę opcję, jeżeli chcesz przechowywać poświadczenia w Managerze "
-"poświadczeń  systemu Windows"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
+msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
-msgid "Your present credentials stored in Windows Credential Manager"
-msgstr "Twoje poświadczenia zapisane w Managerze poświadczeń systemu Windows"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr "&Usuń poświadczenia"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
@@ -158,69 +82,59 @@ msgstr ""
 "Kliknij aby usunąć poświadczenia z Menadżera poświadczeń.\n"
 "Uwaga: Przy ponownym połączeniu zostaniesz poproszony o wprowadzenie poświadczeń."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr "&Ustaw poświadczenia"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr "Kliknij tutaj, aby zmodyfikować poświadczenia logowania"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
-"Zaznacz tę opcję, jeżeli chcesz zachować poświadczenia w ramach profilu "
-"konfiguracyjnego"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
-msgstr "Poświadczenia z profilu konfiguracyjnego"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
-msgstr "Identyfikator i hasło"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr "Proszę wprowadzić identyfikator i hasło."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr "Identyfikator:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 "Wprowadź swój identyfikator (użytkownik@domena.org, DOMENA\\Użytkownik, "
 "itp.)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Hasło:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr "Wprowadź hasło"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "Identyfikator"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr "Twoja Instytucja"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -228,54 +142,54 @@ msgstr ""
 "Opisz Twoją instytucję, aby spersonalizować komunikaty. Jeżeli instytucja "
 "jest ustawiona użytkownicy łatwiej rozumieją komunikaty i reagują na nie. "
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr "&Nazwa Twojej instytucji:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "Nazwa Twojej instytucji, tak jak ma być pokazana przy wskazaniach do "
 "helpdesku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr "(postaraj się, by było krótko)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr "&Kontakt do helpdesku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr "Adres WWW twojego helpdesku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr "Adres e-mail Twojego helpdesku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr "Numer telefonu Twojego helpdesku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr "Unikatowy Identyfikator Dostawcy Tożsamości"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -283,33 +197,33 @@ msgstr ""
 "Nadaj Twojej instytucji unikatowy identyfikator, by umożliwić używanie tego "
 "samego zestawu poświadczeń w kilku profilach sieciowych."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr "Unikatowy &identyfikator Dostawcy Tożsamości:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "Unikatowy identyfikator Twojej instytucji umożliwiający używanie tych samych"
 " poświadczeń z innych profili"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr "Blokada konfiguracji"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -318,92 +232,51 @@ msgstr ""
 "przez użytkowników końcowych. Użytkownicy będą mogli wprowadzać "
 "poświadczenia, ale nic poza tym. "
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
 msgstr ""
 "&Zablokuj konfigurację przed modyfikacją poprzez interfejs użytkownika."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Uwaga: Po zablokowaniu nie będziesz mógł tego wycofać przy pomocy tego "
 "interfejsu!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-"Wybierz identyfikator, a pomocą którego supplicant przedstawie się serwerowi"
-" uwierzytelniającemu:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "&Rzeczywista tożsamość"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Korzystaj z mojego rzeczywistego identyfikatora"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr "Pomiń mój identyfikator i użyj tylko @mydomain.org"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "Konfiguracja Połączenia EAP"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "Dostawca tożsamości EAP"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "Poświadczenia %s"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Poświadczenia EAP"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr "W celu otrzymania pomocy i instrukcji skontaktuj się z %s poprzez:"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr "Twój dostawca tożsamości"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr "Otwórz w domyślnej przeglądarce WWW"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr "Otwórz w programie obsługi e-mail"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Wybierz numer telefonu"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
@@ -412,136 +285,56 @@ msgstr ""
 "Ta konfiguracja dla %s jest częściowo pre-definiowana. Te części są "
 "zablokowane, aby zapobiec przypadkowej modyfikacji."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr "Twój dostawca tożsamości"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr "Poprzednie próby połączenia zgłosiły błąd poświadczeń logowania."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 "Poprzednie próby połączenia zgłosiły błąd przedawnienia poświadczeń "
 "logowania."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 "Poprzednie próby połączenia zgłosiły, że poświadczenia logowania zostały "
 "zmienione."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr "Poprzednie próby połączenia były nieudane."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 "Upewnij się, że Twoje poświadczenia logowania są poprawne, albo spróbuj "
 "ponownie później."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-"Zainstalowana na tym komputerze wersja %s zapisuje poświadczenia w sposób "
-"łatwy do odczytania."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr ""
-"Proszę, rozważ ponownie, czy wprowadzenie Twoich poświadczeń logowania jest "
-"niezbędne."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Wewnętrzna metoda EAP"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Wybierz i skonfiguruj wewnętrzną metodę EAP"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "&Ustawienia"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Błąd przy listowaniu metod EAP (błąd %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Błąd przy listowaniu metod EAP (błąd %u)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Błąd przy konfigurowaniu metody EAP (błąd %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "Błąd przy konfigurowaniu metody EAP (błąd %u)."
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr ""
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
-msgstr "Identyfikator i hasło dla MSCHAPv2"
+msgstr ""
 
 #: lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
-msgstr "Identyfikator i hasło dla PAP"
+msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
 msgstr "Zaufane serwery"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
+"Opisz serwery, którym ufasz, aby uniknąć możliwości przejęcia poświadczeń w "
+"atakach typu man-in-the-middle."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -552,8 +345,6 @@ msgid ""
 "Server's certificate must be issued by one of certificate authorities listed"
 " here"
 msgstr ""
-"Certyfikat serwera musi być wystawiony przez jeden z urzędów wymienionych na"
-" liście"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:47
 msgid "Add CA from Store..."
@@ -576,15 +367,15 @@ msgstr "Dodaje do listy nowy Urząd Certyfikacji z pliku"
 msgid "&Remove CA"
 msgstr "&Usuń Urząd"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Usuwa z listy wybrane urzędy certyfikacji"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Dopuszczalne &nazwy serwerów:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -592,29 +383,27 @@ msgstr ""
 "Lista nazw domenowych serwerów rozdzielana średnikami; pusta lista oznacza "
 "brak sprawdzenia nazw; dozwolone są znaki Unicode"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Przykład: foo.bar.com;server2.bar.com)"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
-msgstr "Certyfikat użytkownika"
+msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
-"Wybierz certyfikat klienta, który ma być używany przy Twoim "
-"uwierzytelnieniu."
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Certyfikat klienta używany do uwierzytelnienia"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Niestandardowy &identyfikator:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -622,108 +411,191 @@ 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"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr "W nazwie hosta znaleziono nieprawidłowy znak: %c"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Błąd walidacji danych"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr "<pusty>"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr "Dodaj certyfikat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Pliki certyfikatów (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "Pliki certyfikatów X.509 (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "Pliki certyfikatów PKCS #7 (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr "Wszystkie pliki (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Nieprawidłowy, albo niewspierany plik certyfikatu %s"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr "Błąd"
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
+msgstr "Tożsamość zewnętrzna"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
-"Błąd przy uruchomieniu interfejsu użytkownika dla EAP (błąd %u, %s, %s)."
+"Wybierz identyfikator, a pomocą którego supplicant przedstawie się serwerowi"
+" uwierzytelniającemu:"
 
-#: lib/TTLS_UI/src/Module.cpp:252
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
+msgstr "&Rzeczywista tożsamość"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr "Korzystaj z mojego rzeczywistego identyfikatora"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr "Użyj &pustego identyfikatora zewnętrznego (RFC 4822)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr "Pomiń mój identyfikator i użyj tylko @mydomain.org"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr "&Niestandardowa tożsamość zewnętrzna:"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr "Podaj niestandardowy identyfikator zewnętrzny"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr "Niestandardowy identyfikator zewnętrzny"
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "Błąd przy uruchomieniu interfejsu użytkownika dla EAP (błąd %u)."
+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)"
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
-msgstr ""
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr "Nie udało się zapisać poświadczeń."
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr "Uwierzytelnienie wewnętrzne"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr "Wymierz metodę uwierzytelnienia wewnętrznego z listy"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr "Uwierzytelnienie "
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr "Wymierz metodę uwierzytelnienia wewnętrznego z listy"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr "PAP"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, 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?"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr "Ostrzeżenie"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Inne metody EAP ..."
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr "Ustawienia dostawcy tożsamości"
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Błąd przy usuwaniu poświadczeń (błąd %u)."
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr "<błąd %u>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr "<błąd>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr "<puste ID>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "&Zapamiętaj"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr "<Twoja Instytucja>"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr "Konfiguracja Połączenia EAP"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr "Metody EAP"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr "Moduły obsługujące konkretne metody EAP"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr "TTLS"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/pt_PT.po

@@ -1,109 +1,35 @@
-# Translators:
-# Pedro Simões <psimoes@fccn.pt>, 2017
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Pedro Simões <psimoes@fccn.pt>, 2016\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Alerta"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "Credenciais EAP"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Definições do Fornecedor"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Memorizar"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr ""
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 msgid "Adds new provider"
-msgstr "Adiciona novo fornecedor"
+msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
 msgid "-"
@@ -111,7 +37,7 @@ msgstr "-"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 msgid "Removes selected provider"
-msgstr "Remove o fornecedor selecionado"
+msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
 msgid "Advanced..."
@@ -121,12 +47,17 @@ msgstr "Avançadas..."
 msgid "Opens dialog with provider settings"
 msgstr ""
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr ""
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
+msgid "Use credentials from Credential &Manager:"
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
@@ -135,361 +66,230 @@ msgid ""
 "Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identidade:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
-msgstr "&Definir Credenciais..."
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
-msgstr "ID do utilizador:"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Palavra passe:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr "Coloque aqui a sua palavra passe"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "ID do utilizador"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
+msgid "Your Organization"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
-msgid "Your Organization"
-msgstr "A sua Organização"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "%s Credenciais"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Credenciais EAP"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
-msgstr "o seu fornecedor"
+msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
-msgstr "Abrir o seu programa de email"
+msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Marcar o número de telefone"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
 "prevent accidental modification."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
-msgstr "O seu fornecedor"
+msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "&Definições"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr ""
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr "Palavra-passe"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr ""
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr ""
@@ -503,7 +303,9 @@ msgid "Server Trust"
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
@@ -535,149 +337,230 @@ msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:57
 msgid "&Remove CA"
-msgstr "&Remover CA"
+msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
-msgstr "Certificado do Utilizador"
+msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
-msgid "Add Certificate"
-msgstr "Adicionar Certificado"
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
+msgid "Add Certificate"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
-msgstr "Todos os Ficheiros (*.*)"
+msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
-msgstr "Erro"
-
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr ""
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
-msgstr "PAP"
+msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
 msgstr ""
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %ls provider from configuration?"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "&Memorizar"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr ""

EAPMethods/locale/sl_SI.po

@@ -1,104 +1,28 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl_SI\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, 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?"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "Poverilnice EAP"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Nastavitve ponudnika"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "Uporabnikove poverilnice za %s"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Napaka pri zapisovanju poverilnic v upravitelja poverilnic: %hs (napaka %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Zapisovanje poverilnic ni uspelo."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Izbris poverilnic ni uspel (napaka %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(napaka %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(napaka)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr "(brez)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr "(prazen ID)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "Za&pomni si"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Odkljukajte, če želite shraniti poverilnice"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(vaša organizacija)"
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
@@ -123,13 +47,18 @@ msgstr "Napredno ..."
 msgid "Opens dialog with provider settings"
 msgstr "Odpre dialog z nastavitvami ponudnika"
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr "Uporabnikove poverilnice za %s"
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr "Izberite vir, kjer so shranjene vaše poverilnice za povezovanje."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr "Uporabi iz &Upravitelja poverilnic"
+msgid "Use credentials from Credential &Manager:"
+msgstr "Uporabi poverilnice iz &Upravitelja poverilnic:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
@@ -139,19 +68,15 @@ msgstr ""
 "Izberite to možnost, če želite uporabiti poverilnice shranjene v Upravitelju"
 " poverilnic Windows"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identiteta:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr "Vaše trenutne poverilnice shranjene v Upravitelju poverilnic Windows"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr "Počisti poverilni&ce"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
@@ -159,19 +84,19 @@ msgstr ""
 "Kliknite, da počistite svoje poverilnice iz upravitelja poverilnic.\n"
 "Opomba: Za vnos poverilnic boste pozvani ob povezovanju."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr "Na&stavi poverilnice ..."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr "Kliknite tukaj, da nastavite ali spremenite svoje poverilnice"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr "Uporabi iz nastavitev &profila"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
+msgstr "Uporabi poverilnice iz nastavitev &profila:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -179,47 +104,39 @@ msgstr ""
 "Izberite to možnost, če želite shraniti poverilnice kot del nastavitev "
 "profila"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr "Poverilnice nastavitev profila"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr "ID uporabnika in geslo"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr "Vnesite svoj ID uporabnika in geslo."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr "ID uporabnika:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr "Tukaj vnesite svoje up. ime (up. ime@domena.si, DOMENA\\Uporabnik ipd.)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Geslo:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr "Tukaj vnesite svoje geslo"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "ID uporabnika"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr "Vnesite svoj ID uporabnika."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr "Vaša organizacija"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -228,54 +145,54 @@ msgstr ""
 "predstavi, uporabniki lažje razumejo sporočila programa in ustrezneje "
 "reagirajo."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr "Ime vaše orga&nizacije:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "Ime vaše organizacije, kot bo nastopalo na obvestilih s stikom na center za "
 "pomoč"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr "(Naj bo kratko, prosim)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr "Podatk&i centra za pomoč:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr "Naslov spletne strani vašega centra za pomoč"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr "E-poštni naslov vašega centra za pomoč"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr "Telefonska številka vašega centra za pomoč"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr "Enolični identifikator ponudnika"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -283,33 +200,33 @@ msgstr ""
 "Dodelite svoji organizaciji enoznačen identifikator, da omogočite souporabo "
 "istih poverilnic različnim omrežnim profilom."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr "Ime&nski prostor:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr "Enolični &identifikator ponudnika:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "Identifikator vaše organizacije za souporabo istih poverilnic različnih "
 "profilov"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr "Zaklep konfiguracije"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -317,7 +234,7 @@ msgstr ""
 "Svojo konfiguracijo lahko zaklenete in preprečite končnim uporabnikom "
 "nenamerno spreminjanje. Uporabniki bodo lahko vnašali samo poverilnice."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -325,81 +242,42 @@ msgstr ""
 "Zak&leni to konfiguracijo in prepreči vse nadaljnje spremembe preko up. "
 "vmesnika."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr "(Pozor: Ko zaklenete, vrnitev ne bo več možna preko tega dialoga!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr "Identiteta"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr "Izberite ID uporabnika, s katerim se prosilec predstavi overovitelju:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "Prava iden&titeta"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Uporabi moje pravo uporabniško ime"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr "Uporabi prazno id&entiteto"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr "Izpusti moje uporabniško ime in uporabi samo @mojadomena.si"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr "&Identiteta po meri:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr "Navedite identiteto po meri"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr "Zunanja po meri za uporabo"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "Konfiguracija povezave EAP"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "Ponudnik identitete EAP"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "Poverilnice za %s"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "Poverilnice EAP"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr "Za dodtano pomoč ali navodila se obrnite na %s na:"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr "vaš ponudnik"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr "Odpre privzeto nastavljen spletni brskalnik"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr "Odpre vaš program za e-pošto"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Pokliče telefonsko številko"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
@@ -408,115 +286,33 @@ msgstr ""
 "%s je prednastavil dele te konfiguracije. Ti deli so zaklenjeni zaradi "
 "preprečevanja nenamernih sprememb."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr "Vaš ponudnik"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr "Prejšnji poskus povezave je javil, da so poverilnice napačne."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr "Prejšnji poskus povezave je javil, da so poverilnice potekle."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 "Prejšnji poskus povezave je javil, da so poverilnice v postopku "
 "spreminjanja."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr "Prejšnji poskus povezave ni uspel."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr "Preverite, ali so vaše poverilnice pravilne ali poskusite kasneje."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-"Verzija %s nameščena na tem računalniku beleži poverilnice na viden in "
-"preprosto berljiv način."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr "Premislite o nujnosti vpisovanja svojih poverilnic."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Notranja metoda EAP"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Izberite in nastavite notranjo metodo EAP"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "Na&stavitve"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Oštevilčevanje metod EAP ni uspelo (napaka %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Oštevilčevanje metod EAP ni uspelo (napaka %u)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Nastavljanje metode EAP ni uspelo (napaka %u, %s, %s)."
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "Nastavljanje metode EAP ni uspelo (napaka %u)."
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr "Vprašanje GTC"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr "Vnesite svoj odgovor."
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr "Strežnikovo vprašanje"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr "Vnesite svoj odgovor tukaj"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr "&Način overovljanja EAP-GTC:"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr "Izberite način overovljanja EAP-GTC s seznama"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr "Vprašanje/odgovor"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr "Geslo"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr "Vprašanje %s"
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr "ID uporabnika in geslo za MSCHAPv2"
@@ -530,9 +326,12 @@ msgid "Server Trust"
 msgstr "Zaupanje strežniku"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
-"Opišite strežnike, ki jim zaupate in preprečite napade \"vmesnega člena\"."
+"Opišite strežnike, ki jim zaupate in preprečite prestrezanje poverilnic v "
+"primeru napada \"vmesnega člena\"."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -567,15 +366,15 @@ msgstr "Doda novega izdajatelja potrdil iz datoteke na seznam"
 msgid "&Remove CA"
 msgstr "Odst&rani CA"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Odstrani izbrane izdajatelje potrdil s seznama"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Sprejemljiva ime&na strežnika:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -583,27 +382,27 @@ msgstr ""
 "S podpičji ločen seznam sprejemljivih strežnikovih imen FQDN; prazno, da "
 "izpusti preverjanje imena; znaki Unicode dovoljeni"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Primer: vzo.rec.si;streznik2.rec.si)"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr "Uporabnikovo potrdilo"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Izberite svoje potrdilo za uporabo med overovljanjem."
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Odjemalčevo potrdilo za overovljanje"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "&Identiteta po meri:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -611,107 +410,191 @@ msgstr ""
 "Vaša identiteta (up. ime@domena), ki bo nadomestila tisto s potrdila; ali "
 "prazno, če želite uporabiti tisto s potrdila"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr "Napačen znak v imenu gostitelja: %c"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Nesoglasje pri preverjanju"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr "<prazno>"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr "Dodaj potrdilo"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Datoteke s potrdili (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "Datoteke s potrdili X.509 (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "Datoteke s potrdili PKCS #7 (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr "Vse datoteke (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Napačna ali nepodprta datoteka s potrdilom %s"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr "Napaka"
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, 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)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
+msgstr "Zunanja identiteta"
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
-msgstr "Zagon up. vmesnika za identiteto EAP ni uspel (napaka %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
+msgstr "Izberite ID uporabnika, s katerim se prosilec predstavi overovitelju:"
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
-msgstr "Zagon interaktivnega up. vmesnika EAP ni uspel (napaka %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
+msgstr "Prava iden&titeta"
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr "Zagon interaktivnega up. vmesnika EAP ni uspel (napaka %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr "Uporabi moje pravo uporabniško ime"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr "Uporabi prazno zunanjo id&entiteto (RFC 4822)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr "Izpusti moje uporabniško ime in uporabi samo @mojadomena.si"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr "Zunanja identiteta po &meri:"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr "Navedite zunanjo identiteto po meri"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr "Zunanja identiteta po meri za uporabo"
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+"Napaka pri zapisovanju poverilnic v upravitelja poverilnic: %hs (napaka %u)"
+
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr "Zapisovanje poverilnic ni uspelo."
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr "Notranje overovljanje"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr "Izberite metodo notranjega overovljanja s seznama"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr "Zunanje overovljanje"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr "Izberite postopek notranjega overovljanja s seznama"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr "PAP"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, 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?"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr "Opozorilo"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Druge metode EAP ..."
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr "Nastavitve ponudnika"
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Izbris poverilnic ni uspel (napaka %u)."
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
-msgstr "Metoda EAP-TTLS"
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr "<napaka %u>"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr "<napaka>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr "<prazen ID>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "Za&pomni si"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr "Odkljukajte, če želite shraniti poverilnice"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr "<vaša organizacija>"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr "Konfiguracija povezave EAP"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
-msgstr "Metode EAP"
+msgstr "Postopki EAP"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
-msgstr "Moduli, ki omogočajo posamezne metode EAP"
+msgstr "Moduli, ki omogočajo posamezne postopke EAP"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr "TTLS"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/sr_RS.po

@@ -1,105 +1,28 @@
-# Translators:
-# Marko Eremija <marko.eremija@amres.ac.rs>, 2017
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Marko Eremija <marko.eremija@amres.ac.rs>, 2016\n"
 "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, 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?"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr "Upozorenje"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr "EAP kredencijali"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr "Podešavanja provajdera"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr "%s korisnikovi kredencijali"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, 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)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr "Upis kredencijala je neuspešan."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Brisanje kredencijala neuspešno (greška %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr "(greška %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr "(greška)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr "(prazan ID)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr "&Zapamti"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr "Označite ako želite da sačuvate kredencijale"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr "(Vaša organizacija)"
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
 msgstr "+"
@@ -124,13 +47,18 @@ msgstr "Napredno..."
 msgid "Opens dialog with provider settings"
 msgstr "Otvara dijalog sa podešavanjima za provajdera"
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s korisnikovi kredencijali"
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr "Izaberite izvor gde se nalaze vaši kredencijali za povezivanje."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr ""
+msgid "Use credentials from Credential &Manager:"
+msgstr "Koristi kredencijale iz &Manager kredencijala:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
@@ -140,19 +68,15 @@ msgstr ""
 "Odaberite ovu opciju ako želite da koristite kredencijale sačuvane u Windows"
 " menadžeru kredencijala"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identitet:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr "Vaši trenutni kredencijali se čuvaju u Windows menadžeru kredencijala"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr "&Clear kredencijale"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
@@ -160,19 +84,19 @@ msgstr ""
 "Kliknite ovde kako biste ukolnili svoje kredencijale iz menadžera kredencijala.\n"
 "Napomena: Biće vam traženo da unesete kredencijale prilikom povezivanja."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr "&Set kredencijale..."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr "Kliknite ovde kako biste promenili svoje kredencijale"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
+msgstr "Koristi kredencijale iz konfiguracije &profila:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -180,49 +104,41 @@ msgstr ""
 "Odaberite ovu opciju ako želite da sačuvate kredencijale kao deo "
 "konfiguracije profila"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr "Kredencijali za konfiguraciju profila"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
 msgstr "Korisničko ime i lozinka"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
 msgstr "Unesite vaše korisničko ime i lozinku."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
 msgstr "Korisničko ime:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 "Unesite vaše korisničko ime ovde (korisnik@domen.ac.rs, DOMEN\\Korisnik, "
 "itd.)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
 msgstr "Unesite lozinku ovde"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "Korisničko ime"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr "Unesite vaše korisničko ime."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr "Vaša organizacija"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -231,54 +147,54 @@ msgstr ""
 "instalaciju. Kada se organizacija predstavi, krajnji korisnici bolje "
 "razumeju poruke koje program generiše i lakše mogu da preduzimaju akcije."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr "&name vaše organizacije:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "Ime vaše institucije u formatu koji će se pojavljivati u obaveštenjima "
 "službe za podršku korisnicima"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr "(budite kratki, molimo vas)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr "Helpdesk kontakt &information:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr "Web stranice službe za podršku korisnicima"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr "e-mail adresa službe za podršku korisnicima"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr "Broj telefona službe za podršku korisnicima"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr "Jedinstveni identifikator provajdera"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -286,33 +202,33 @@ msgstr ""
 "Dodelite jedinstven ID vašoj organizaciji kako bi se omogućilo deljenje "
 "istog seta kredencijala u više različitih mrežnih profila."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr "Jedinstveni &identifier provajdera: "
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "ID vaše organizacije kako bi se dodelili isti kredencijali kao i na drugim "
 "profilima"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr "Zaključavanje konfiguracije"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -321,7 +237,7 @@ msgstr ""
 "modifikacije od strane krajnjih korisnika. Korisnici će moći jedino da unesu"
 " kredencijale.  "
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -329,84 +245,44 @@ msgstr ""
 "&Lock ovu konfiguraciju i sprečite bilo kakve nove izmene preko korisničkog "
 "interfejsa."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Upozorenje: Kada se jednom zaključa, ne možete se vratiti na početna "
 "podešavanja!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-"Izaberite korisničko ime kojim se softver predstavlja autentifikatoru:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr "&True identitet"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr "Koristi moje pravo korisničko ime"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr "Izostavi korisničko ime i koristi samo @mojdomen.ac.rs"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr "Podešavanja za EAP povezivanje"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr "EAP davalac identiteta"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr "%s kredencijali"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr "EAP kredencijali"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr "Za dodatnu pomoć i instrukcije, kontaktirajte %s na:"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr "vaš provajder"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr "Otvorite uobičajeni web brauzer"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr "Otvorite vašeg mejl klijenta"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr "Pozovite broj"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
@@ -415,120 +291,38 @@ msgstr ""
 "%s ima predefinisane delove ove konfiguracije. Ti delovi su zaključani kako "
 "bi se izbegla njihova slučajna izmena."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr "Vaš provajder"
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 "Prethodni pokušaj povezivanja je prijavio da ste uneli pogrešne "
 "kredencijale."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 "Prethodni pokušaj povezivanja je prijavio da su vaši kredencijali istekli."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 "Prethodni pokušaj povezivanja je prijavio da se vaši kredencijali trenutno "
 "menjaju."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr "Prethodni pokušaj povezivanja nije bio uspešan."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 "Proverite da li ste uneli ispravne kredencijale ili pokušajte ponovo "
 "kasnije."
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-"%s verzija instalirana na ovom računaru loguje kredencijale na vidljiv i "
-"lako čitljiv način."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr "Razmotrite da li je potrebno da ponovo unosite vaše kredencijale."
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr "Unutrašnji EAP metod"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr "Odaberite i konfigurišite unutrašnji EAP metod"
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr "&Settings"
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr "Nabrajanje neuspešnih EAP metoda (greška %u, %s, %s). "
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr "Nabrajanje neuspešnih EAP metoda (greška %u). "
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr "Konfigurisanje EAP metoda nije uspešno (greška %u, %s, %s). "
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr "Konfigurisanje EAP metoda nije uspešno (greška %u). "
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr "GTC Challenge"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr "Unesite vaš odgovor."
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr "Server challenge"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr "Ovde unesite vaš odgovor"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr "EAP-GTC autentifikacija &mode:"
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr "Izaberite EAP-GTC metod autentifikacije iz liste"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr "Challenge/Response"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr "Lozinka"
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr "%s Challenge"
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr "MSCHAPv2 korisničko ime i lozinka"
@@ -542,8 +336,12 @@ msgid "Server Trust"
 msgstr "Serveri kojima se veruje"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
+"Opišite servere kojima verujete kako bi se izbegla mogućnost krađe "
+"kredencijala u slučaju man-in-the-middle napada."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -578,15 +376,15 @@ msgstr "Dodaje novo sertifikaciono telo iz fajla u listu"
 msgid "&Remove CA"
 msgstr "&Remove CA"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr "Uklanja odabrano sertifikaciono telo sa liste"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr "Prihvatljiva &names servera"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
@@ -595,27 +393,27 @@ msgstr ""
 "prazno ukoliko nije potrebna provera imena servera; dozvoljeno je korišćenje"
 " <i>unicode</i> karaktera"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(npr: foo.bar.com;server2.bar.com)"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr "Korisnički sertifikat"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr "Izaberite vaš &certificate koji ćete koristiti za autentifikaciju."
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr "Klijentski sertifikat koji se koristi za autentifikaciju"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr "Proizvoljan &identity:"
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
@@ -624,115 +422,192 @@ msgstr ""
 "ime iz sertifikata; ili prazno kako biste koristili ono koje se nalazi u "
 "sertifikatu"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr "Neispravan karakter je pronađen u DNS imenu: %c"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Konflikt prilikom validacije"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr "<prazno>"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr "Dodaj sertifikat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Fajlovi sa sertifikatima (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "Fajlovi sa X.509 sertifikatima (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "Fajlovi sa PKCS #7 sertifikatima (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr "Svi fajlovi (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Pogrešan ili nepodržan sertifikat %s"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
 msgstr "Greška"
 
-#: lib/TTLS_UI/src/Module.cpp:249
-#, 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). "
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
+msgstr "Spoljni identitet"
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
-"Aktiviranje korisničkog interfejsa za EAP identitet je neuspešno (greška "
-"%u). "
+"Izaberite korisničko ime kojim se softver predstavlja autentifikatoru:"
 
-#: lib/TTLS_UI/src/Module.cpp:376
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
+msgstr "&True identitet"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr "Koristi moje pravo korisničko ime"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr "Koristi &empty spoljni identitet (RFC 4822)"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr "Izostavi korisničko ime i koristi samo @mojdomen.ac.rs"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr "&Custom spoljni identitet:"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr "Unesite proizvoljan spoljni identitet"
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr "Koristi proizvoljan spoljni identitet"
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
-"Aktiviranje interaktivnog korisničkog interfejsa za EAP je neuspešno (greška"
-" %u, %s, %s). "
+"Greška prilikom upisa kredencijala u Menadžera kredencijala: %hs (greška %u)"
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
-msgstr ""
-"Aktiviranje interaktivnog korisničkog interfejsa za EAP je neuspešno (greška"
-" %u). "
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr "Upis kredencijala je neuspešan."
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr "Unutrašnja autentifikacija"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr "Izaberite unutrašnji metod autentifikacije sa liste"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr "Spoljna autentifikacija"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr "Izaberite unutrašnji metod autentifikacije sa liste"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
 msgstr "PAP"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
-msgstr "Drugi EAP metodi..."
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, 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?"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr "Podešavanja provajdera"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Brisanje kredencijala neuspešno (greška %u)."
+
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr "<greška %u>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr "<greška>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr "<prazan ID>"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr "&Zapamti"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr "Označite ako želite da sačuvate kredencijale"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr "<Vaša organizacija>"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr "Podešavanja za EAP povezivanje"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr "EAP metodi"
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr "Moduli podržani u određenim EAP metodima"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr "TTLS"
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/tr_TR.po

@@ -1,132 +1,63 @@
-# Translators:
-# Gokhan Eryol <gokhaneryol@gmail.com>, 2017
-# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
-"PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
 "Language-Team: Turkish (https://www.transifex.com/eduroam_devel/teams/11799/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
-"X-Poedit-SearchPath-2: lib/GTC_UI\n"
-"X-Poedit-SearchPath-3: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-4: lib/PAP_UI\n"
-"X-Poedit-SearchPath-5: lib/TLS_UI\n"
-"X-Poedit-SearchPath-6: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-7: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-2: lib/PAP_UI\n"
+"X-Poedit-SearchPath-3: lib/TLS_UI\n"
+"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-5: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-#, c-format
-msgid ""
-"Are you sure you want to permanently remove %s provider from configuration?"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:294
-msgid "Warning"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
-msgid "EAP Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:724
-msgid "Provider Settings"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
-#, c-format
-msgid "%s User Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
-#: lib/TTLS_UI/src/Module.cpp:305
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
-#: lib/TTLS_UI/src/Module.cpp:307
-msgid "Writing credentials failed."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:899
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:938
-#, c-format
-msgid "(error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:942
-msgid "(error)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-#: lib/TLS_UI/src/TLS_UI.cpp:61
-msgid "(none)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962
-msgid "(blank ID)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
-msgid "&Remember"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
-msgid "Check if you would like to save credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
-msgid "(Your Organization)"
-msgstr ""
-
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
-msgstr "+"
+msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 msgid "Adds new provider"
-msgstr "Yeni sağlayıcı ekler"
+msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
 msgid "-"
-msgstr "-"
+msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 msgid "Removes selected provider"
-msgstr "Seçili sağlayıcıyı kaldırır"
+msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
 msgid "Advanced..."
-msgstr "Gelişmiş..."
+msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:48
 msgid "Opens dialog with provider settings"
 msgstr ""
 
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#, c-format
+msgid "%s User Credentials"
+msgstr ""
+
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
+msgid "Use credentials from Credential &Manager:"
 msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
@@ -135,362 +66,230 @@ msgid ""
 "Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Kimlik:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:278 lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Use credentials from &profile configuration:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
-msgstr "Kullanıcı Adı ve Parola"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
-msgstr "Lütfen kullanıcı adı ve parolanızı sağlayınız."
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
-msgstr "Kullanıcı Adı:"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
-"Kullanıcı adınızı buraya giriniz (user@domain.org, ALANADI\\Kullanıcı, vb.)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
-msgstr "Parola:"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
-msgstr "Parolanızı buraya giriniz"
+msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
-msgid "User ID"
-msgstr "Kullanıcı Adı"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
-msgid "Please provide your user ID."
-msgstr "Lütfen kullanıcı adınızı sağlayınız."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
 msgstr "¶"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
 msgstr "*"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
 msgstr ")"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
-msgid "Identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
-msgid "&True identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
-msgid "Use my true user name"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
-msgid "Use &empty identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
-msgid "Omit my user name and use @mydomain.org only"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
-msgid "&Custom identity:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
-msgid "Specify custom identity"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
-msgid "Custom identity to use"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
-msgid "EAP Connection Configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
-msgid "EAP Identity Provider"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
+#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+#: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+#: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+#: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+#: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:203
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
 msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
 "prevent accidental modification."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+#: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+#: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
-#, c-format
-msgid ""
-"The %s version installed on this computer logs credentials in visible and "
-"easy to read way."
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
-msgid "Please, reconsider necessity to enter your credentials."
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
-msgid "Inner EAP Method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
-msgid "Select and configure inner EAP method"
-msgstr ""
-
-#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
-msgid "&Settings"
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:59
-#, c-format
-msgid "Enumerating EAP methods failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:61
-#, c-format
-msgid "Enumerating EAP methods failed (error %u)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:136
-#, c-format
-msgid "Configuring EAP method failed (error %u, %s, %s)."
-msgstr ""
-
-#: lib/EapHost_UI/src/EapHost_UI.cpp:138
-#, c-format
-msgid "Configuring EAP method failed (error %u)."
-msgstr ""
-
-#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
-msgid "GTC Challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:26
-msgid "Please provide your response."
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:38
-msgid "Server challenge"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:43
-msgid "Enter your response here"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:70
-msgid "EAP-GTC authentication &mode:"
-msgstr ""
-
-#: lib/GTC_UI/res/wxGTC_UI.cpp:75
-msgid "Select EAP-GTC authentication mode from the list"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:39
-msgid "Challenge/Response"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:41
-msgid "Password"
-msgstr ""
-
-#: lib/GTC_UI/src/GTC_UI.cpp:119
-#, c-format
-msgid "%s Challenge"
-msgstr ""
-
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr ""
@@ -504,7 +303,9 @@ msgid "Server Trust"
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgid ""
+"Describe the servers you trust to prevent credential interception in case of"
+" man-in-the-middle attacks."
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
@@ -538,147 +339,228 @@ msgstr ""
 msgid "&Remove CA"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+#: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+#: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:76
+#: lib/TLS_UI/res/wxTLS_UI.cpp:77
 msgid ""
 "A semicolon delimited list of acceptable server FQDN names; blank to skip "
 "name check; Unicode characters allowed"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+#: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+#: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+#: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+#: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
+#: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+#, c-format
+msgid "Invalid character in host name found: %c"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
+#: lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<empty>"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
-msgstr "Hata"
-
-#: lib/TTLS_UI/src/Module.cpp:249
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:252
-#, c-format
-msgid "Invoking EAP identity UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
+msgid "Outer Identity"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:376
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:379
-#, c-format
-msgid "Invoking EAP interactive UI failed (error %u)."
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
+msgid "&True identity"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
+msgid "Use my true user name"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
+msgid "Use &empty outer identity (RFC 4822)"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
+msgid "Ommit my user name and use @mydomain.org only"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
+msgid "&Custom outer identity:"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
+msgid "Specify custom outer identity"
+msgstr ""
+
+#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
+msgid "Custom outer identity to use"
+msgstr ""
+
+#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
+#: lib/EAPBase_UI/include/EAP_UI.h:696
+#, c-format
+msgid "Error writing credentials to Credential Manager: %hs (error %u)"
+msgstr ""
+
+#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
+#: lib/EAPBase_UI/include/EAP_UI.h:699
+msgid "Writing credentials failed."
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
-msgid "Select inner authentication method from the list"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
+#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:127
+#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+msgid "Select inner authentication method from the list"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
-msgstr "PAP"
+msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+#: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:131
-msgid "EAP-MSCHAPv2"
-msgstr "EAP-MSCHAPv2"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:133
-msgid "EAP-GTC"
-msgstr "EAP-GTC"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:136
-msgid "Other EAP methods..."
 msgstr ""
 
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS"
-msgstr "EAP-TTLS"
-
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4
-msgid "EAP-TTLS Method"
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %ls provider from configuration?"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: lib/EAPBase_UI/include/EAP_UI.h:292
+msgid "Warning"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:552
+msgid "Provider Settings"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:717
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:754
+#, c-format
+msgid "<error %u>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:758
+msgid "<error>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+msgid "<blank ID>"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:820
+msgid "&Remember"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:821
+msgid "Check if you would like to save credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:964
+msgid "<Your Organization>"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:69
+msgid "EAP Connection Configuration"
+msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
 msgstr ""
 
-#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "TTLS"
+msgstr ""
+
+#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
+msgid "Tunneled Transport Layer Security"
+msgstr ""

EAPMethods/src/Main.cpp

@@ -0,0 +1,982 @@
+/*
+    Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of GÉANTLink.
+
+    GÉANTLink is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    GÉANTLink is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <StdAfx.h>
+
+using namespace std;
+using namespace winstd;
+
+#pragma comment(lib, "Ws2_32.lib")
+
+#if EAPMETHOD_TYPE==21
+#define _EAPMETHOD_PEER    eap::peer_ttls
+#else
+#error Unknown EAP Method type.
+#endif
+
+_EAPMETHOD_PEER g_peer;
+
+
+///
+/// DLL main entry point
+///
+/// \sa [DllMain entry point](https://msdn.microsoft.com/en-us/library/windows/desktop/ms682583.aspx)
+///
+BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved)
+{
+    UNREFERENCED_PARAMETER(lpvReserved);
+
+    if (fdwReason == DLL_PROCESS_ATTACH) {
+#ifdef _DEBUG
+        //Sleep(10000);
+#endif
+        g_peer.m_instance = hinstDLL;
+    } else if (fdwReason == DLL_PROCESS_DETACH)
+        assert(!_CrtDumpMemoryLeaks());
+
+    return TRUE;
+}
+
+
+///
+/// Releases all memory associated with an opaque user interface context data buffer.
+///
+/// \sa [EapPeerFreeMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363606.aspx)
+///
+VOID WINAPI EapPeerFreeMemory(_In_ void *pUIContextData)
+{
+    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));
+
+    if (pUIContextData)
+        g_peer.free_memory((BYTE*)pUIContextData);
+}
+
+
+///
+/// Releases error-specific memory allocated by the EAP peer method.
+///
+/// \sa [EapPeerFreeErrorMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363605.aspx)
+///
+VOID WINAPI EapPeerFreeErrorMemory(_In_ EAP_ERROR *ppEapError)
+{
+    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));
+
+    if (ppEapError)
+        g_peer.free_error_memory(ppEapError);
+}
+
+
+///
+/// Obtains a set of function pointers for an implementation of the EAP peer method currently loaded on the EapHost service.
+///
+/// \sa [EapPeerGetInfo function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363608.aspx)
+///
+DWORD WINAPI EapPeerGetInfo(_In_ EAP_TYPE* pEapType, _Out_ EAP_PEER_METHOD_ROUTINES* pEapPeerMethodRoutines, _Out_ EAP_ERROR **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!pEapType)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapType is NULL.")));
+    else if (pEapType->type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)pEapType->type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (!pEapPeerMethodRoutines)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapPeerMethodRoutines is NULL.")));
+    else {
+        pEapPeerMethodRoutines->dwVersion                    = PRODUCT_VERSION;
+        pEapPeerMethodRoutines->pEapType                     = NULL;
+
+        pEapPeerMethodRoutines->EapPeerInitialize            = EapPeerInitialize;
+        pEapPeerMethodRoutines->EapPeerShutdown              = EapPeerShutdown;
+        pEapPeerMethodRoutines->EapPeerBeginSession          = EapPeerBeginSession;
+        pEapPeerMethodRoutines->EapPeerEndSession            = EapPeerEndSession;
+        pEapPeerMethodRoutines->EapPeerSetCredentials        = NULL;    // Always NULL unless we want to use generic credential UI
+        pEapPeerMethodRoutines->EapPeerGetIdentity           = EapPeerGetIdentity;
+        pEapPeerMethodRoutines->EapPeerProcessRequestPacket  = EapPeerProcessRequestPacket;
+        pEapPeerMethodRoutines->EapPeerGetResponsePacket     = EapPeerGetResponsePacket;
+        pEapPeerMethodRoutines->EapPeerGetResult             = EapPeerGetResult;
+        pEapPeerMethodRoutines->EapPeerGetUIContext          = EapPeerGetUIContext;
+        pEapPeerMethodRoutines->EapPeerSetUIContext          = EapPeerSetUIContext;
+        pEapPeerMethodRoutines->EapPeerGetResponseAttributes = EapPeerGetResponseAttributes;
+        pEapPeerMethodRoutines->EapPeerSetResponseAttributes = EapPeerSetResponseAttributes;
+    }
+
+    return dwResult;
+}
+
+
+#pragma warning(push)
+#pragma warning(disable: 4702) // Compiler is smart enough to find out the initialize() method is empty => never throws an exception.
+
+///
+/// Initializes an EAP peer method for EapHost.
+///
+/// \sa [EapPeerGetInfo function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363613.aspx)
+///
+DWORD APIENTRY EapPeerInitialize(_Out_ EAP_ERROR **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    try {
+        g_peer.initialize();
+    } catch (std::exception &err) {
+        g_peer.log_error(*ppEapError = g_peer.make_error(err));
+        dwResult = (*ppEapError)->dwWinError;
+    } catch (...) {
+        dwResult = ERROR_INVALID_DATA;
+    }
+
+    return dwResult;
+}
+
+#pragma warning(pop)
+
+
+#pragma warning(push)
+#pragma warning(disable: 4702) // Compiler is smart enough to find out the shutdown() method is empty => never throws an exception.
+
+///
+/// Shuts down the EAP method and prepares to unload its corresponding DLL.
+///
+/// \sa [EapPeerShutdown function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363627.aspx)
+///
+DWORD APIENTRY EapPeerShutdown(_Out_ EAP_ERROR **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    try {
+        g_peer.shutdown();
+    } catch (std::exception &err) {
+        g_peer.log_error(*ppEapError = g_peer.make_error(err));
+        dwResult = (*ppEapError)->dwWinError;
+    } catch (...) {
+        dwResult = ERROR_INVALID_DATA;
+    }
+
+    return dwResult;
+}
+
+#pragma warning(pop)
+
+
+///
+/// Returns the user data and user identity after being called by EapHost.
+///
+/// \sa [EapPeerGetIdentity function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363607.aspx)
+///
+DWORD APIENTRY EapPeerGetIdentity(
+    _In_                                   DWORD     dwFlags,
+    _In_                                   DWORD     dwConnectionDataSize,
+    _In_count_(dwConnectionDataSize) const BYTE      *pConnectionData,
+    _In_                                   DWORD     dwUserDataSize,
+    _In_count_(dwUserDataSize)       const BYTE      *pUserData,
+    _In_                                   HANDLE    hTokenImpersonateUser,
+    _Out_                                  BOOL      *pfInvokeUI,
+    _Out_                                  DWORD     *pdwUserDataOutSize,
+    _Out_                                  BYTE      **ppUserDataOut,
+    _Out_                                  WCHAR     **ppwszIdentity,
+    _Out_                                  EAP_ERROR **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!pUserData && dwUserDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUserData is NULL.")));
+    else if (!pfInvokeUI)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pfInvokeUI is NULL.")));
+    else if (!pdwUserDataOutSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwUserDataOutSize is NULL.")));
+    else if (!ppUserDataOut)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppUserDataOut is NULL.")));
+    else if (!ppwszIdentity)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL.")));
+    else {
+        try {
+            g_peer.get_identity(dwFlags, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, ppUserDataOut, pdwUserDataOutSize, hTokenImpersonateUser, pfInvokeUI, ppwszIdentity);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// Starts an EAP authentication session on the peer EapHost using the EAP method.
+///
+/// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
+///
+DWORD APIENTRY EapPeerBeginSession(
+    _In_                                       DWORD              dwFlags,
+    _In_                               const   EapAttributes      *pAttributeArray,
+    _In_                                       HANDLE             hTokenImpersonateUser,
+    _In_                                       DWORD              dwConnectionDataSize,
+    _In_count_(dwConnectionDataSize) /*const*/ BYTE               *pConnectionData,
+    _In_                                       DWORD              dwUserDataSize,
+    _In_count_(dwUserDataSize)       /*const*/ BYTE               *pUserData,
+    _In_                                       DWORD              dwMaxSendPacketSize,
+    _Out_                                      EAP_SESSION_HANDLE *phSession,
+    _Out_                                      EAP_ERROR          **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!pUserData && dwUserDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUserData is NULL.")));
+    else if (!phSession)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" phSession is NULL.")));
+    else {
+        try {
+            *phSession = g_peer.begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, dwMaxSendPacketSize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// Ends an EAP authentication session for the EAP method.
+///
+/// \sa [EapPeerEndSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363604.aspx)
+///
+DWORD APIENTRY EapPeerEndSession(
+    _In_  EAP_SESSION_HANDLE hSession,
+    _Out_ EAP_ERROR          **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!hSession)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
+    else {
+        try {
+            g_peer.end_session(hSession);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// Processes a packet received by EapHost from a supplicant.
+///
+/// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
+///
+DWORD APIENTRY EapPeerProcessRequestPacket(
+    _In_                                           EAP_SESSION_HANDLE  hSession,
+    _In_                                           DWORD               dwReceivedPacketSize,
+    _In_bytecount_(dwReceivedPacketSize) /*const*/ EapPacket           *pReceivedPacket,
+    _Out_                                          EapPeerMethodOutput *pEapOutput,
+    _Out_                                          EAP_ERROR           **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!hSession)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
+    else if (!pReceivedPacket || dwReceivedPacketSize < 6)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pReceivedPacket is NULL or too short.")));
+    else if (pReceivedPacket->Data[0] != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, wstring_printf(_T(__FUNCTION__) _T(" Packet EAP type (%d) does not match the supported EAP type (%d)."), (int)pReceivedPacket->Data[0], (int)EAPMETHOD_TYPE).c_str()));
+    else if (!pEapOutput)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapOutput is NULL.")));
+    else {
+        try {
+            g_peer.process_request_packet(hSession, pReceivedPacket, dwReceivedPacketSize, pEapOutput);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// Obtains a response packet from the EAP method.
+///
+/// \sa [EapPeerGetResponsePacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363610.aspx)
+///
+DWORD APIENTRY EapPeerGetResponsePacket(
+    _In_                               EAP_SESSION_HANDLE hSession,
+    _Inout_                            DWORD              *pdwSendPacketSize,
+    _Inout_bytecap_(*dwSendPacketSize) EapPacket          *pSendPacket,
+    _Out_                              EAP_ERROR          **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!hSession)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
+    else if (!pdwSendPacketSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwSendPacketSize is NULL.")));
+    else if (!pSendPacket && *pdwSendPacketSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pSendPacket is NULL.")));
+    else {
+        try {
+            g_peer.get_response_packet(hSession, pSendPacket, pdwSendPacketSize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD APIENTRY EapPeerGetResult(
+    _In_  EAP_SESSION_HANDLE        hSession,
+    _In_  EapPeerMethodResultReason reason,
+    _Out_ EapPeerMethodResult       *pResult,
+    _Out_ EAP_ERROR                 **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!hSession)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
+    else if (!pResult)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pResult is NULL.")));
+    else {
+        try {
+            g_peer.get_result(hSession, reason, pResult);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD APIENTRY EapPeerGetUIContext(
+    _In_  EAP_SESSION_HANDLE hSession,
+    _Out_ DWORD              *pdwUIContextDataSize,
+    _Out_ BYTE               **ppUIContextData,
+    _Out_ EAP_ERROR          **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!hSession)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
+    else if (!pdwUIContextDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwUIContextDataSize is NULL.")));
+    else if (!ppUIContextData)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppUIContextData is NULL.")));
+    else {
+        try {
+            g_peer.get_ui_context(hSession, ppUIContextData, pdwUIContextDataSize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD APIENTRY EapPeerSetUIContext(
+    _In_                                  EAP_SESSION_HANDLE  hSession,
+    _In_                                  DWORD               dwUIContextDataSize,
+    _In_count_(dwUIContextDataSize) const BYTE                *pUIContextData,
+    _Out_                                 EapPeerMethodOutput *pEapOutput,
+    _Out_                                 EAP_ERROR           **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!hSession)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
+    else if (!pUIContextData && dwUIContextDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUIContextData is NULL.")));
+    else if (!pEapOutput)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapOutput is NULL.")));
+    else {
+        try {
+            g_peer.set_ui_context(hSession, pUIContextData, dwUIContextDataSize, pEapOutput);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD APIENTRY EapPeerGetResponseAttributes(
+    _In_  EAP_SESSION_HANDLE hSession,
+    _Out_ EapAttributes      *pAttribs,
+    _Out_ EAP_ERROR          **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!hSession)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
+    else if (!pAttribs)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pAttribs is NULL.")));
+    else {
+        try {
+            g_peer.get_response_attributes(hSession, pAttribs);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD APIENTRY EapPeerSetResponseAttributes(
+    _In_            EAP_SESSION_HANDLE  hSession,
+    _In_  /*const*/ EapAttributes       *pAttribs,
+    _Out_           EapPeerMethodOutput *pEapOutput,
+    _Out_           EAP_ERROR           **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!hSession)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
+    else if (!pEapOutput)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapOutput is NULL.")));
+    else {
+        try {
+            g_peer.set_response_attributes(hSession, pAttribs, pEapOutput);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD WINAPI EapPeerGetMethodProperties(
+    _In_                                   DWORD                     dwVersion,
+    _In_                                   DWORD                     dwFlags,
+    _In_                                   EAP_METHOD_TYPE           eapMethodType,
+    _In_                                   HANDLE                    hUserImpersonationToken,
+    _In_                                   DWORD                     dwConnectionDataSize,
+    _In_count_(dwConnectionDataSize) const BYTE                      *pConnectionData,
+    _In_                                   DWORD                     dwUserDataSize,
+    _In_count_(dwUserDataSize)       const BYTE                      *pUserData,
+    _Out_                                  EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray,
+    _Out_                                  EAP_ERROR                 **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)eapMethodType.eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (eapMethodType.dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)eapMethodType.dwAuthorId, (int)67532).c_str()));
+    else if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!pUserData && dwUserDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUserData is NULL.")));
+    else if (!pMethodPropertyArray)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pMethodPropertyArray is NULL.")));
+    else {
+        try {
+            g_peer.get_method_properties(dwVersion, dwFlags, hUserImpersonationToken, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, pMethodPropertyArray);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD WINAPI EapPeerCredentialsXml2Blob(
+    _In_                                   DWORD            dwFlags,
+    _In_                                   EAP_METHOD_TYPE  eapMethodType,
+    _In_                                   IXMLDOMDocument2 *pCredentialsDoc,
+    _In_count_(dwConnectionDataSize) const BYTE             *pConnectionData,
+    _In_                                   DWORD            dwConnectionDataSize,
+    _Out_                                  BYTE             **ppCredentialsOut,
+    _Out_                                  DWORD            *pdwCredentialsOutSize,
+    _Out_                                  EAP_ERROR        **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)eapMethodType.eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (eapMethodType.dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)eapMethodType.dwAuthorId, (int)67532).c_str()));
+    else if (!pCredentialsDoc)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pCredentialsDoc is NULL.")));
+    else if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!ppCredentialsOut)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppCredentialsOut is NULL.")));
+    else if (!pdwCredentialsOutSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwCredentialsOutSize is NULL.")));
+    else {
+        // <Credentials>
+        com_obj<IXMLDOMNode> pXmlElCredentials;
+        if (FAILED(eapxml::select_node(pCredentialsDoc, bstr(L"//EapHostUserCredentials/Credentials"), pXmlElCredentials))) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_FOUND, _T(__FUNCTION__) _T(" Error selecting <EapHostUserCredentials><Credentials> element.")));
+            return dwResult;
+        }
+
+        // Load credentials.
+        pCredentialsDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
+        try {
+            g_peer.credentials_xml2blob(dwFlags, pXmlElCredentials, pConnectionData, dwConnectionDataSize, ppCredentialsOut, pdwCredentialsOutSize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD WINAPI EapPeerQueryCredentialInputFields(
+    _In_                                   HANDLE                       hUserImpersonationToken,
+    _In_                                   EAP_METHOD_TYPE              eapMethodType,
+    _In_                                   DWORD                        dwFlags,
+    _In_                                   DWORD                        dwConnectionDataSize,
+    _In_count_(dwConnectionDataSize) const BYTE                         *pConnectionData,
+    _Out_                                  EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray,
+    _Out_                                  EAP_ERROR                    **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)eapMethodType.eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (eapMethodType.dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)eapMethodType.dwAuthorId, (int)67532).c_str()));
+    else if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!pEapConfigInputFieldsArray)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapConfigInputFieldsArray is NULL.")));
+    else {
+        try {
+            g_peer.query_credential_input_fields(hUserImpersonationToken, dwFlags, dwConnectionDataSize, pConnectionData, pEapConfigInputFieldsArray);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD WINAPI EapPeerQueryUserBlobFromCredentialInputFields(
+    _In_                                   HANDLE                       hUserImpersonationToken,
+    _In_                                   EAP_METHOD_TYPE              eapMethodType,
+    _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,
+    _Out_                                  EAP_ERROR                    **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)eapMethodType.eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (eapMethodType.dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)eapMethodType.dwAuthorId, (int)67532).c_str()));
+    else if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!pEapConfigInputFieldArray)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapConfigInputFieldArray is NULL.")));
+    else if (!pdwUsersBlobSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwUsersBlobSize is NULL.")));
+    else if (!ppUserBlob)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppUserBlob is NULL.")));
+    else {
+        try {
+            g_peer.query_user_blob_from_credential_input_fields(hUserImpersonationToken, dwFlags, dwConnectionDataSize, pConnectionData, pEapConfigInputFieldArray, pdwUsersBlobSize, ppUserBlob);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD WINAPI EapPeerQueryInteractiveUIInputFields(
+    _In_                                  DWORD                   dwVersion,
+    _In_                                  DWORD                   dwFlags,
+    _In_                                  DWORD                   dwUIContextDataSize,
+    _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
+    _Out_                                 EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData,
+    _Out_                                 EAP_ERROR               **ppEapError,
+    _Inout_                               LPVOID                  *ppvReserved)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!pUIContextData && dwUIContextDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUIContextData is NULL.")));
+    else if (!pUIContextData && dwUIContextDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUIContextData is NULL.")));
+    else if (!pEapInteractiveUIData)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapInteractiveUIData is NULL.")));
+    else {
+        UNREFERENCED_PARAMETER(ppvReserved);
+
+        try {
+            g_peer.query_interactive_ui_input_fields(dwVersion, dwFlags, dwUIContextDataSize, pUIContextData, pEapInteractiveUIData);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// 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)
+///
+DWORD WINAPI EapPeerQueryUIBlobFromInteractiveUIInputFields(
+    _In_                                  DWORD                   dwVersion,
+    _In_                                  DWORD                   dwFlags,
+    _In_                                  DWORD                   dwUIContextDataSize,
+    _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
+    _In_                            const EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData,
+    _Out_                                 DWORD                   *pdwDataFromInteractiveUISize,
+    _Out_                                 BYTE                    **ppDataFromInteractiveUI,
+    _Out_                                 EAP_ERROR               **ppEapError,
+    _Inout_                               LPVOID                  *ppvReserved)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!pUIContextData && dwUIContextDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapConfigInputFieldArray is NULL.")));
+    else if (!pEapInteractiveUIData)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapInteractiveUIData is NULL.")));
+    else if (!pdwDataFromInteractiveUISize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwDataFromInteractiveUISize is NULL.")));
+    else if (!ppDataFromInteractiveUI)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppDataFromInteractiveUI is NULL.")));
+    else {
+        UNREFERENCED_PARAMETER(ppvReserved);
+
+        try {
+            g_peer.query_ui_blob_from_interactive_ui_input_fields(dwVersion, dwFlags, dwUIContextDataSize, pUIContextData, pEapInteractiveUIData, pdwDataFromInteractiveUISize, ppDataFromInteractiveUI);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}

EAPMethods/src/Main_UI.cpp

@@ -0,0 +1,413 @@
+/*
+    Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of GÉANTLink.
+
+    GÉANTLink is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    GÉANTLink is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <StdAfx.h>
+
+#pragma comment(lib, "msxml6.lib")
+
+using namespace std;
+using namespace winstd;
+
+
+#if EAPMETHOD_TYPE==21
+#define _EAPMETHOD_PEER_UI eap::peer_ttls_ui
+#else
+#error Unknown EAP Method type.
+#endif
+
+HANDLE g_act_ctx = NULL;
+_EAPMETHOD_PEER_UI g_peer;
+
+
+///
+/// DLL main entry point
+///
+/// \sa [DllMain entry point](https://msdn.microsoft.com/en-us/library/windows/desktop/ms682583.aspx)
+///
+BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved)
+{
+    UNREFERENCED_PARAMETER(lpvReserved);
+
+    if (fdwReason == DLL_PROCESS_ATTACH) {
+#ifdef _DEBUG
+        //Sleep(10000);
+#endif
+        g_peer.m_instance = hinstDLL;
+
+        // Save current activation context, as proper activation context is set at this time only (LoadLibrary() call).
+        GetCurrentActCtx(&g_act_ctx);
+    } else if (fdwReason == DLL_PROCESS_DETACH) {
+        if (g_act_ctx)
+            ReleaseActCtx(g_act_ctx);
+
+        // wxWidgets library has some global objects allocating data on heap in constructors,
+        // causing false-positive memory leak reports.
+        //assert(!_CrtDumpMemoryLeaks());
+    }
+
+    return TRUE;
+}
+
+
+///
+/// Releases all memory associated with an opaque user interface context data buffer.
+///
+/// \sa [EapPeerFreeMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363606.aspx)
+///
+VOID WINAPI EapPeerFreeMemory(_In_ void *pUIContextData)
+{
+    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));
+
+    if (pUIContextData)
+        g_peer.free_memory((BYTE*)pUIContextData);
+}
+
+
+///
+/// Releases error-specific memory allocated by the EAP peer method.
+///
+/// \sa [EapPeerFreeErrorMemory function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363605.aspx)
+///
+VOID WINAPI EapPeerFreeErrorMemory(_In_ EAP_ERROR *ppEapError)
+{
+    event_fn_auto event_auto(g_peer.get_event_fn_auto(__FUNCTION__));
+
+    if (ppEapError)
+        g_peer.free_error_memory(ppEapError);
+}
+
+
+///
+/// Converts XML into the configuration BLOB.
+///
+/// \sa [EapPeerConfigXml2Blob function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363602.aspx)
+///
+DWORD WINAPI EapPeerConfigXml2Blob(
+    _In_  DWORD            dwFlags,
+    _In_  EAP_METHOD_TYPE  eapMethodType,
+    _In_  IXMLDOMDocument2 *pConfigDoc,
+    _Out_ BYTE             **pConnectionDataOut,
+    _Out_ DWORD            *pdwConnectionDataOutSize,
+    _Out_ EAP_ERROR        **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)eapMethodType.eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (eapMethodType.dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)eapMethodType.dwAuthorId, (int)67532).c_str()));
+    else if (!pConfigDoc)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConfigDoc is NULL.")));
+    else if (!pConnectionDataOut)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionDataOut is NULL.")));
+    else if (!pdwConnectionDataOutSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwConnectionDataOutSize is NULL.")));
+    else {
+        // Configure XML selection namespaces used.
+        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
+
+        // <Config>
+        com_obj<IXMLDOMElement> pXmlElConfig;
+        if (FAILED(eapxml::select_element(pConfigDoc, bstr(L"//eaphostconfig:Config"), pXmlElConfig))) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" Error reading <Config> element.")));
+            return dwResult;
+        }
+
+        // Load configuration.
+        try {
+            g_peer.config_xml2blob(dwFlags, pXmlElConfig, pConnectionDataOut, pdwConnectionDataOutSize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// Converts the configuration BLOB to XML.
+///
+/// The configuration BLOB is returned in the ppConnectionDataOut parameter of the EapPeerInvokeConfigUI function.
+///
+/// \sa [EapPeerConfigBlob2Xml function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363601.aspx)
+///
+DWORD WINAPI EapPeerConfigBlob2Xml(
+    _In_                                   DWORD            dwFlags,
+    _In_                                   EAP_METHOD_TYPE  eapMethodType,
+    _In_count_(dwConnectionDataSize) const BYTE             *pConnectionData,
+    _In_                                   DWORD            dwConnectionDataSize,
+    _Out_                                  IXMLDOMDocument2 **ppConfigDoc,
+    _Out_                                  EAP_ERROR        **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)eapMethodType.eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (eapMethodType.dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)eapMethodType.dwAuthorId, (int)67532).c_str()));
+    else if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!ppConfigDoc)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppConfigDoc is NULL.")));
+    else {
+        HRESULT hr;
+
+        // Create configuration XML document.
+        com_obj<IXMLDOMDocument2> pConfigDoc;
+        if (FAILED(hr = pConfigDoc.create(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER))) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error creating XML document.")));
+            return dwResult;
+        }
+
+        pConfigDoc->put_async(VARIANT_FALSE);
+
+        // Load empty XML configuration.
+        VARIANT_BOOL isSuccess = VARIANT_FALSE;
+        if (FAILED((hr = pConfigDoc->loadXML(L"<Config xmlns=\"http://www.microsoft.com/provisioning/EapHostConfig\"></Config>", &isSuccess)))) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error loading XML document template.")));
+            return dwResult;
+        }
+        if (!isSuccess) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_XML_PARSE_ERROR, _T(__FUNCTION__) _T(" Loading XML template failed.")));
+            return dwResult;
+        }
+
+        // Configure XML selection namespaces used.
+        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
+
+        // Select <Config> node.
+        com_obj<IXMLDOMNode> pXmlElConfig;
+        if (FAILED(eapxml::select_node(pConfigDoc, bstr(L"eaphostconfig:Config"), pXmlElConfig))) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_FOUND, _T(__FUNCTION__) _T(" Error selecting <Config> element.")));
+            return dwResult;
+        }
+
+        // Save configuration.
+        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
+        try {
+            g_peer.config_blob2xml(dwFlags, pConnectionData, dwConnectionDataSize, pConfigDoc, pXmlElConfig);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            return dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            return dwResult = ERROR_INVALID_DATA;
+        }
+
+        *ppConfigDoc = pConfigDoc.detach();
+    }
+
+    return dwResult;
+}
+
+
+///
+/// Raises the EAP method's specific connection configuration user interface dialog on the client.
+///
+/// \sa [EapPeerInvokeConfigUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363614.aspx)
+///
+DWORD WINAPI EapPeerInvokeConfigUI(
+    _In_                               const EAP_METHOD_TYPE *pEapType,
+    _In_                                     HWND            hwndParent,
+    _In_                                     DWORD           dwFlags,
+    _In_                                     DWORD           dwConnectionDataInSize,
+    _In_count_(dwConnectionDataInSize) const BYTE            *pConnectionDataIn,
+    _Out_                                    DWORD           *pdwConnectionDataOutSize,
+    _Out_                                    BYTE            **ppConnectionDataOut,
+    _Out_                                    EAP_ERROR       **ppEapError)
+{
+    UNREFERENCED_PARAMETER(dwFlags);
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+    actctx_activator actctx(g_act_ctx);
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!pEapType)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapType is NULL.")));
+    else if (pEapType->eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)pEapType->eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (pEapType->dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)pEapType->dwAuthorId, (int)67532).c_str()));
+    else if (!pConnectionDataIn && dwConnectionDataInSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionDataIn is NULL.")));
+    else if (!pdwConnectionDataOutSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwConnectionDataOutSize is NULL.")));
+    else if (!ppConnectionDataOut)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppConnectionDataOut is NULL.")));
+    else {
+        try {
+            g_peer.invoke_config_ui(hwndParent, pConnectionDataIn, dwConnectionDataInSize, ppConnectionDataOut, pdwConnectionDataOutSize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// Raises a custom interactive user interface dialog to obtain user identity information for the EAP method on the client.
+///
+/// \sa [EapPeerInvokeIdentityUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363615.aspx)
+///
+DWORD WINAPI EapPeerInvokeIdentityUI(
+    _In_                             const EAP_METHOD_TYPE *pEapType,
+    _In_                                   DWORD           dwFlags,
+    _In_                                   HWND            hwndParent,
+    _In_                                   DWORD           dwConnectionDataSize,
+    _In_count_(dwConnectionDataSize) const BYTE            *pConnectionData,
+    _In_                                   DWORD           dwUserDataSize,
+    _In_count_(dwUserDataSize)       const BYTE            *pUserData,
+    _Out_                                  DWORD           *pdwUserDataOutSize,
+    _Out_                                  BYTE            **ppUserDataOut,
+    _Out_                                  LPWSTR          *ppwszIdentity,
+    _Out_                                  EAP_ERROR       **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+    actctx_activator actctx(g_act_ctx);
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!pEapType)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapType is NULL.")));
+    else if (pEapType->eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)pEapType->eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (pEapType->dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)pEapType->dwAuthorId, (int)67532).c_str()));
+    else if (!pConnectionData && dwConnectionDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pConnectionData is NULL.")));
+    else if (!pUserData && dwUserDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUserData is NULL.")));
+    else if (!pdwUserDataOutSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwUserDataOutSize is NULL.")));
+    else if (!ppUserDataOut)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppUserDataOut is NULL.")));
+    else if (!ppwszIdentity)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppwszIdentity is NULL.")));
+    else {
+        try {
+            g_peer.invoke_identity_ui(hwndParent, dwFlags, pConnectionData, dwConnectionDataSize, pUserData, dwUserDataSize, ppUserDataOut, pdwUserDataOutSize, ppwszIdentity);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}
+
+
+///
+/// Raises a custom interactive user interface dialog for the EAP method on the client.
+///
+/// \sa [EapPeerInvokeInteractiveUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363616.aspx)
+///
+DWORD WINAPI EapPeerInvokeInteractiveUI(
+    _In_                            const EAP_METHOD_TYPE *pEapType,
+    _In_                                  HWND            hwndParent,
+    _In_                                  DWORD           dwUIContextDataSize,
+    _In_count_(dwUIContextDataSize) const BYTE            *pUIContextData,
+    _Out_                                 DWORD           *pdwDataFromInteractiveUISize,
+    _Out_                                 BYTE            **ppDataFromInteractiveUI,
+    _Out_                                 EAP_ERROR       **ppEapError)
+{
+    DWORD dwResult = ERROR_SUCCESS;
+    event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));
+    actctx_activator actctx(g_act_ctx);
+#ifdef _DEBUG
+    //Sleep(10000);
+#endif
+
+    // Parameter check
+    if (!ppEapError)
+        return dwResult = ERROR_INVALID_PARAMETER;
+
+    assert(!*ppEapError);
+
+    if (!pEapType)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pEapType is NULL.")));
+    else if (pEapType->eapType.type != EAPMETHOD_TYPE)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" Input EAP type (%d) does not match the supported EAP type (%d)."), (int)pEapType->eapType.type, (int)EAPMETHOD_TYPE).c_str()));
+    else if (pEapType->dwAuthorId != 67532)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_SUPPORTED, wstring_printf(_T(__FUNCTION__) _T(" EAP author (%d) does not match the supported author (%d)."), (int)pEapType->dwAuthorId, (int)67532).c_str()));
+    else if (!pUIContextData && dwUIContextDataSize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pUIContextData is NULL.")));
+    else if (!pdwDataFromInteractiveUISize)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwDataFromInteractiveUISize is NULL.")));
+    else if (!ppDataFromInteractiveUI)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppDataFromInteractiveUI is NULL.")));
+    else {
+        try {
+            g_peer.invoke_interactive_ui(hwndParent, pUIContextData, dwUIContextDataSize, ppDataFromInteractiveUI, pdwDataFromInteractiveUISize);
+        } catch (std::exception &err) {
+            g_peer.log_error(*ppEapError = g_peer.make_error(err));
+            dwResult = (*ppEapError)->dwWinError;
+        } catch (...) {
+            dwResult = ERROR_INVALID_DATA;
+        }
+    }
+
+    return dwResult;
+}

EventMonitor/App.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,7 +18,7 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "PCH.h"
+#include "StdAfx.h"
 #if defined(__WXMSW__)
 #pragma comment(lib, "msi.lib")
 #endif
@@ -28,7 +28,6 @@
 // wxEventMonitorApp
 //////////////////////////////////////////////////////////////////////////
 
-#pragma warning(suppress: 28251)
 wxIMPLEMENT_APP(wxEventMonitorApp);
 
 

EventMonitor/App.h

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -19,10 +19,8 @@
 */
 
 ///
-/// \defgroup EventMonitor  Event Monitor
-/// Real-time log of application events
+/// EventMonitor application
 ///
-
 class wxEventMonitorApp;
 
 #pragma once
@@ -34,12 +32,6 @@ class wxEventMonitorApp;
 #include <wx/intl.h>
 
 
-/// \addtogroup EventMonitor
-/// @{
-
-///
-/// EventMonitor application
-///
 class wxEventMonitorApp : public wxApp
 {
 public:
@@ -65,6 +57,4 @@ public:
     wxLocale             m_locale;  ///< Current locale
 };
 
-/// @}
-
 wxDECLARE_APP(wxEventMonitorApp);

EventMonitor/ETWLog.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,7 +18,7 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "PCH.h"
+#include "StdAfx.h"
 
 #pragma comment(lib, "tdh.lib")
 #pragma comment(lib, "Ws2_32.lib")
@@ -115,8 +115,6 @@ void wxEventTraceProcessorThread::Abort()
 }
 
 
-/// \cond internal
-
 wxThread::ExitCode wxEventTraceProcessorThread::Entry()
 {
     // Process events.
@@ -132,14 +130,15 @@ VOID WINAPI wxEventTraceProcessorThread::EventRecordCallback(_In_ PEVENT_RECORD
     wxASSERT_MSG(pEvent->UserContext, wxT("thread is NULL"));
 
     wxEventTraceProcessorThread *_this = ((wxEventTraceProcessorThread*)pEvent->UserContext);
-    if (!_this || _this->TestDestroy())
+
+    if (_this->TestDestroy()) {
+        // Event processing is pending destruction.
         return;
+    }
 
     _this->m_parent->QueueEvent(new wxETWEvent(wxEVT_ETW_EVENT, *pEvent));
 }
 
-/// \endcond
-
 
 //////////////////////////////////////////////////////////////////////////
 // wxETWListCtrl
@@ -165,17 +164,17 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
     m_rec_idx(wxETWEVENT_RECORDS_MAX),
     wxListCtrl(parent, id, pos, size, style, validator, name)
 {
-    this->AppendColumn(_("Time"  ), wxLIST_FORMAT_LEFT, FromDIP(160));
-    this->AppendColumn(_("PID"   ), wxLIST_FORMAT_LEFT, FromDIP( 50));
-    this->AppendColumn(_("TID"   ), wxLIST_FORMAT_LEFT, FromDIP( 50));
-    this->AppendColumn(_("Source"), wxLIST_FORMAT_LEFT, FromDIP( 80));
-    this->AppendColumn(_("Event" ), wxLIST_FORMAT_LEFT, FromDIP(350));
+    this->AppendColumn(_("Time"  ), wxLIST_FORMAT_LEFT, 160);
+    this->AppendColumn(_("PID"   ), wxLIST_FORMAT_LEFT,  50);
+    this->AppendColumn(_("TID"   ), wxLIST_FORMAT_LEFT,  50);
+    this->AppendColumn(_("Source"), wxLIST_FORMAT_LEFT,  80);
+    this->AppendColumn(_("Event" ), wxLIST_FORMAT_LEFT, 350);
 
     // Maximum expected column widths for pre-formatted row display
     m_col_format_width[0] = 26;
     m_col_format_width[1] = 5;
     m_col_format_width[2] = 5;
-    m_col_format_width[3] = std::max<size_t>(std::max<size_t>(_countof("EapHost"), _countof("Schannel")), _countof(PRODUCT_NAME_STR)) - 1;
+    m_col_format_width[3] = std::max<int>(std::max<int>(_countof("EapHost"), _countof("Schannel")), _countof(PRODUCT_NAME_STR)) - 1;
     m_col_format_width[4] = 0;
 
     // Prepare all possible item attributes.
@@ -201,11 +200,11 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
     ULONG ulResult;
     for (unsigned int i = 0; ; i++) {
         //tstring log_file(tstring_printf(i ? _T("test.etl") : _T("test %u.etl"), i));
-        tstring session_name(tstring_printf(i ? _T(PRODUCT_NAME_STR) _T(" Event Monitor Session %u") : _T(PRODUCT_NAME_STR) _T(" Event Monitor Session"), i));
+        tstring name(tstring_printf(i ? _T(PRODUCT_NAME_STR) _T(" Event Monitor Session %u") : _T(PRODUCT_NAME_STR) _T(" Event Monitor Session"), i));
 
         // Allocate session properties.
         ULONG
-            ulSizeName    = (ULONG)((session_name.length() + 1)*sizeof(TCHAR)),
+            ulSizeName    = (ULONG)((name    .length() + 1)*sizeof(TCHAR)),
             //ulSizeLogFile = (ULONG)((log_file.length() + 1)*sizeof(TCHAR)),
             ulSize        = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName /*+ ulSizeLogFile*/;
         unique_ptr<EVENT_TRACE_PROPERTIES> properties(reinterpret_cast<EVENT_TRACE_PROPERTIES*>(new char[ulSize]));
@@ -216,24 +215,20 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
         properties->Wnode.BufferSize    = ulSize;
         properties->Wnode.Flags         = WNODE_FLAG_TRACED_GUID;
         properties->Wnode.ClientContext = 1; //QPC clock resolution
-        HRESULT hr = CoCreateGuid(&(properties->Wnode.Guid));
-        if (FAILED(hr)) {
-            wxLogError(winstd::tstring_printf(wxT("error 0x%08x generating GUID"), hr).c_str());
-            continue;
-        }
+        CoCreateGuid(&(properties->Wnode.Guid));
         properties->LogFileMode         = /*EVENT_TRACE_FILE_MODE_SEQUENTIAL |*/ EVENT_TRACE_REAL_TIME_MODE;
         properties->MaximumFileSize     = 1;  // 1 MB
         properties->LoggerNameOffset    = sizeof(EVENT_TRACE_PROPERTIES);
         //properties->LogFileNameOffset   = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName;
         //memcpy(reinterpret_cast<char*>(properties.get()) + properties->LogFileNameOffset, log_file.c_str(), ulSizeLogFile);
 
-        if ((ulResult = m_session.create(session_name.c_str(), properties.get())) == ERROR_SUCCESS) {
+        if ((ulResult = m_session.create(name.c_str(), properties.get())) == ERROR_SUCCESS) {
             break;
         } else if (ulResult == ERROR_ACCESS_DENIED) {
             wxLogError(_("Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."));
             return;
         } else if (ulResult == ERROR_ALREADY_EXISTS) {
-            wxLogDebug(_("The %s event session already exists."), session_name);
+            wxLogDebug(_("The %s event session already exists."), name.c_str());
             // Do not despair... Retry with a new session name and ID.
             continue;
         } else {
@@ -465,8 +460,6 @@ void wxETWListCtrl::RebuildItems()
 }
 
 
-/// \cond internal
-
 bool wxETWListCtrl::IsVisible(const EVENT_RECORD &rec) const
 {
     return
@@ -568,7 +561,7 @@ wxString wxETWListCtrl::OnGetItemText(long item, long column) const
 }
 
 
-wxString wxETWListCtrl::OnGetItemText(const winstd::event_rec &rec, long column) const
+wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const
 {
     switch (column) {
     case 0: {
@@ -685,8 +678,6 @@ void wxETWListCtrl::OnETWEvent(wxETWEvent& event)
     }
 }
 
-/// \endcond
-
 
 //////////////////////////////////////////////////////////////////////////
 // wxPersistentETWListCtrl
@@ -712,7 +703,7 @@ void wxPersistentETWListCtrl::Save() const
     col.SetMask(wxLIST_MASK_TEXT | wxLIST_MASK_WIDTH);
     for (int i = 0, n = wnd->GetColumnCount(); i < n; i++) {
         wnd->GetColumn(i, col);
-        SaveValue(wxString::Format(wxT("Column%sWidth"), col.GetText()), col.GetWidth());
+        SaveValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), col.GetWidth());
     }
 
     SaveValue(wxT("ScrollAuto"), wnd->m_scroll_auto);
@@ -737,7 +728,7 @@ bool wxPersistentETWListCtrl::Restore()
         wnd->GetColumn(i, col);
 
         int width;
-        if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText()), &width))
+        if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), &width))
             wnd->SetColumnWidth(i, width);
     }
 
@@ -777,13 +768,13 @@ static tstring MapToString(_In_ const EVENT_MAP_INFO *pMapInfo, _In_ ULONG ulDat
         ((pMapInfo->Flag &  EVENTMAP_INFO_FLAG_WBEM_VALUEMAP    ) && (pMapInfo->Flag & ~EVENTMAP_INFO_FLAG_WBEM_VALUEMAP) != EVENTMAP_INFO_FLAG_WBEM_FLAG))
     {
         if ((pMapInfo->Flag & EVENTMAP_INFO_FLAG_WBEM_NO_MAP) == EVENTMAP_INFO_FLAG_WBEM_NO_MAP)
-            return tstring_printf(_T("%ls"), (LPCWSTR)((PBYTE)pMapInfo + pMapInfo->MapEntryArray[ulData].OutputOffset));
+            return tstring_printf(_T("%ls"), (PBYTE)pMapInfo + pMapInfo->MapEntryArray[ulData].OutputOffset);
         else {
             for (ULONG i = 0; ; i++) {
                 if (i >= pMapInfo->EntryCount)
                     return tstring_printf(_T("%lu"), ulData);
                 else if (pMapInfo->MapEntryArray[i].Value == ulData)
-                    return tstring_printf(_T("%ls"), (LPCWSTR)((PBYTE)pMapInfo + pMapInfo->MapEntryArray[i].OutputOffset));
+                    return tstring_printf(_T("%ls"), (PBYTE)pMapInfo + pMapInfo->MapEntryArray[i].OutputOffset);
             }
         }
     } else if (
@@ -806,7 +797,7 @@ static tstring MapToString(_In_ const EVENT_MAP_INFO *pMapInfo, _In_ ULONG ulDat
         return out.empty() ? tstring_printf(_T("%lu"), ulData) : out;
     }
 
-    return _T("(unknown map)");
+    return _T("<unknown map>");
 }
 
 
@@ -818,7 +809,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
         case TDH_INTYPE_UNICODESTRING:
         case TDH_INTYPE_NONNULLTERMINATEDSTRING:
         case TDH_INTYPE_UNICODECHAR:
-            return tstring_printf(_T("%.*ls"), (unsigned int)(nDataSize/sizeof(WCHAR)), (LPCWSTR)pData);
+            return tstring_printf(_T("%.*ls"), nDataSize/sizeof(WCHAR), pData);
 
         case TDH_INTYPE_ANSISTRING:
         case TDH_INTYPE_NONNULLTERMINATEDANSISTRING:
@@ -919,7 +910,6 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
         case TDH_INTYPE_BINARY:
             switch (OutType) {
             case TDH_OUTTYPE_IPV6: {
-                #pragma warning(suppress: 6387) // ntdll.dll *must* exist.
                 auto RtlIpv6AddressToString = (LPTSTR(NTAPI*)(const IN6_ADDR*, LPTSTR))GetProcAddress(GetModuleHandle(_T("ntdll.dll")),
 #ifdef _UNICODE
                     "RtlIpv6AddressToStringW"
@@ -932,7 +922,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
                     RtlIpv6AddressToString((IN6_ADDR*)pData, szIPv6Addr);
                     return tstring_printf(_T("%s"), szIPv6Addr);
                 } else
-                    return _T("(IPv6 address)");
+                    return _T("<IPv6 address>");
             }
             default: {
                 tstring out;
@@ -947,12 +937,8 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
         case TDH_INTYPE_GUID: {
             assert(nDataSize >= sizeof(GUID));
             WCHAR szGuid[39];
-            if (StringFromGUID2(*(GUID*)pData, szGuid, _countof(szGuid)))
+            StringFromGUID2(*(GUID*)pData, szGuid, _countof(szGuid));
             return tstring_printf(_T("%ls"), szGuid);
-            else {
-                assert(0);
-                return _T("(GUID)");
-            }
         }
 
         case TDH_INTYPE_POINTER:
@@ -962,7 +948,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
             case sizeof(ULONGLONG): return tstring_printf(_T("0x%016I64x"), *(PULONGLONG)pData);
             default: // Unsupported pointer size.
                 assert(0);
-                return _T("(pointer)");
+                return _T("<pointer>");
             }
 
         case TDH_INTYPE_SIZET:
@@ -972,7 +958,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
             case sizeof(ULONGLONG): return tstring_printf(_T("%I64u"), *(PULONGLONG)pData);
             default: // Unsupported size_t size.
                 assert(0);
-                return _T("(size_t)");
+                return _T("<size_t>");
             }
 
         case TDH_INTYPE_FILETIME: {
@@ -989,7 +975,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
             case TDH_OUTTYPE_CULTURE_INSENSITIVE_DATETIME: return tstring_printf(_T("%04d-%02d-%02d %02d:%02d:%02d.%03u"), ((PSYSTEMTIME)pData)->wYear, ((PSYSTEMTIME)pData)->wMonth, ((PSYSTEMTIME)pData)->wDay, ((PSYSTEMTIME)pData)->wHour, ((PSYSTEMTIME)pData)->wMinute, ((PSYSTEMTIME)pData)->wSecond, ((PSYSTEMTIME)pData)->wMilliseconds);
             default: {
                 tstring out;
-                return GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, (PSYSTEMTIME)pData, NULL, out) ? out : tstring(_T("(time)"));
+                return GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, (PSYSTEMTIME)pData, NULL, out) ? out : tstring(_T("<time>"));
             }}
 
         case TDH_INTYPE_WBEMSID:
@@ -1001,7 +987,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
             // 32-bit computer and 16 bytes on a 64-bit computer.
             // Doubling the pointer size handles both cases.
             assert(nDataSize >= (SIZE_T)nPtrSize * 2);
-            return (PULONG)pData > 0 ? DataToString(TDH_INTYPE_SID, OutType, pData + (SIZE_T)nPtrSize * 2, nDataSize - (SIZE_T)nPtrSize * 2, pMapInfo, nPtrSize) : _T("(WBEM SID)");
+            return (PULONG)pData > 0 ? DataToString(TDH_INTYPE_SID, OutType, pData + nPtrSize * 2, nDataSize - nPtrSize * 2, pMapInfo, nPtrSize) : _T("<WBEM SID>");
 
         case TDH_INTYPE_SID: {
             assert(nDataSize >= sizeof(SID));
@@ -1015,14 +1001,14 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
                     ConvertSidToStringSid((PSID)pData, (LPTSTR*)&sid))
                     return tstring_printf(_T("%s"), sid.get());
                 else
-                    return _T("(SID)");
+                    return _T("<SID>");
             }
         }
 
     default:
         // It is not actually an error if we do not understand the given data type.
         assert(0);
-        return _T("(unknown data type)");
+        return _T("<unknown data type>");
     }
 }
 
@@ -1033,7 +1019,7 @@ static ULONG GetArraySize(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, ULONG i
         ULONG ulResult;
 
         // Get array count property.
-        PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)pInfo + pInfo->EventPropertyInfoArray[pInfo->EventPropertyInfoArray[i].countPropertyIndex].NameOffset, ULONG_MAX };
+        PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[pInfo->EventPropertyInfoArray[i].countPropertyIndex].NameOffset), ULONG_MAX };
         vector<unsigned char> count;
         if ((ulResult = TdhGetProperty(pEvent, 0, NULL, 1, &data_desc, count)) != ERROR_SUCCESS)
             return ulResult;
@@ -1059,7 +1045,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
     // Get the size of the array if the property is an array.
     ULONG ulArraySize = 0;
     if ((ulResult = GetArraySize(pEvent, pInfo, ulPropIndex, &ulArraySize)) != ERROR_SUCCESS)
-        return tstring_printf(_T("(Error getting array size (error %u))"), ulResult);;
+        return tstring_printf(_T("<Error getting array size (error %u)>"), ulResult);;
 
     tstring out;
     bool out_nonfirst = false;
@@ -1073,7 +1059,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
             if (out_nonfirst) out += _T(", "); else out_nonfirst = true;
             out += _T('(');
             for (USHORT j = pInfo->EventPropertyInfoArray[ulPropIndex].structType.StructStartIndex, usLastMember = pInfo->EventPropertyInfoArray[ulPropIndex].structType.StructStartIndex + pInfo->EventPropertyInfoArray[ulPropIndex].structType.NumOfStructMembers; j < usLastMember; j++) {
-                out += tstring_printf(_T("%ls: "), (LPCWSTR)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[j].NameOffset));
+                out += tstring_printf(_T("%ls: "), reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[j].NameOffset);
                 out += PropertyToString(pEvent, pInfo, j, reinterpret_cast<LPWSTR>(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k, nPtrSize);
             }
             out += _T(')');
@@ -1084,7 +1070,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) {
@@ -1093,18 +1079,18 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
                     // descriptor defines the member of the structure whose data you want to retrieve. 
                     PROPERTY_DATA_DESCRIPTOR data_desc[2] = {
                         { (ULONGLONG)pStructureName                                                                           , ulStructIndex },
-                        { (ULONGLONG)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset, k             }
+                        { (ULONGLONG)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k             }
                     };
                     ulResult = TdhGetProperty(pEvent, 0, NULL, _countof(data_desc), data_desc, data);
                 } else {
-                    PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset, k };
+                    PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k };
                     ulResult = TdhGetProperty(pEvent, 0, NULL, 1, &data_desc, data);
                 }
                 if (ulResult == ERROR_EVT_INVALID_EVENT_DATA) {
                     // This happens with empty/NULL data. Not an error actually.
                     assert(data.empty());
                 } else if (ulResult != ERROR_SUCCESS)
-                    return tstring_printf(_T("(Error getting property (error %u))"), ulResult);
+                    return tstring_printf(_T("<Error getting property (error %u)>"), ulResult);
 
                 // Get the name/value mapping if the property specifies a value map.
                 unique_ptr<EVENT_MAP_INFO> map_info;
@@ -1113,7 +1099,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
                     // name/value mapping not found. Not an error actually.
                     assert(!map_info);
                 } else if (ulResult != ERROR_SUCCESS)
-                    return tstring_printf(_T("(Error getting map information (error %u))"), ulResult);
+                    return tstring_printf(_T("<Error getting map information (error %u)>"), ulResult);
                 else if (pInfo->DecodingSource == DecodingSourceXMLFile) {
                     // The mapped string values defined in a manifest will contain a trailing space
                     // in the EVENT_MAP_ENTRY structure. Replace the trailing space with a null-
@@ -1132,7 +1118,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/ETWLog.h

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -20,23 +20,32 @@
 
 #include <wx/event.h>
 
-/// \addtogroup EventMonitor
-/// @{
-
 ///
 /// Maximum number of event records kept
 ///
 #define wxETWEVENT_RECORDS_MAX  1000000
 
-/// @}
-
+///
+/// ETW event
+///
 class wxETWEvent;
 wxDECLARE_EVENT(wxEVT_ETW_EVENT, wxETWEvent);
 #define wxETWEventHandler(func) wxEVENT_HANDLER_CAST(wxETWEventFunction, func)
 #define EVT_ETW_EVENT(func) wx__DECLARE_EVT0(wxEVT_ETW_EVENT, wxETWEventHandler(func))
 
+///
+/// Event trace processor
+///
 class wxEventTraceProcessorThread;
+
+///
+/// Event list control
+///
 class wxETWListCtrl;
+
+///
+/// Supports saving/restoring wxETWListCtrl state
+///
 class wxPersistentETWListCtrl;
 
 #pragma once
@@ -52,106 +61,47 @@ class wxPersistentETWListCtrl;
 #include <set>
 
 
-/// \addtogroup EventMonitor
-/// @{
-
-///
-/// ETW event
-///
 class wxETWEvent : public wxEvent
 {
 public:
-    ///
-    /// Creates ETW event
-    ///
-    /// \param[in] type    The unique type of event
-    /// \param[in] record  ETW event record
-    ///
     wxETWEvent(wxEventType type = wxEVT_NULL, const EVENT_RECORD &record = s_record_null);
-
-    ///
-    /// Copies an ETW event
-    ///
-    /// \param[in] event  ETW event to copy from
-    ///
     wxETWEvent(const wxETWEvent& event);
+    virtual wxEvent *Clone() const { return new wxETWEvent(*this); }
 
-    ///
-    /// Clones the ETW event
-    ///
-    /// \returns Event copy
-    ///
-    virtual wxEvent *Clone() const
-    {
-        return new wxETWEvent(*this);
-    }
+    inline const winstd::event_rec&  GetRecord() const { return m_record; }
+    inline       winstd::event_rec&  GetRecord()       { return m_record; }
 
-    ///
-    /// Returns ETW event record assosiated with event
-    ///
-    inline const winstd::event_rec& GetRecord() const
-    {
-        return m_record;
-    }
-
-    ///
-    /// Returns ETW event record assosiated with event
-    ///
-    inline winstd::event_rec& GetRecord()
-    {
-        return m_record;
-    }
+protected:
+    bool DoSetExtendedData(size_t extended_data_count, const EVENT_HEADER_EXTENDED_DATA_ITEM *extended_data);
+    bool DoSetUserData(size_t user_data_length, const void *user_data);
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxETWEvent)
 
 public:
-    static const EVENT_RECORD s_record_null; ///< Blank ETW event record
+    static const EVENT_RECORD s_record_null;
 
 protected:
     winstd::event_rec m_record; ///< ETW event record
 };
 
 
-///
-/// Prototype of the function consuming `wxETWEvent` events
-///
 typedef void (wxEvtHandler::*wxETWEventFunction)(wxETWEvent&);
 
 
-///
-/// Monitors ETW events and forwards them as `wxETWEvent` event
-///
 class wxEventTraceProcessorThread : public wxThread
 {
 public:
-    ///
-    /// A thread to process ETW events
-    ///
-    /// \param[in] parent    Event handler this thread will send record notifications
-    /// \param[in] sessions  An array of sessions to monitor
-    ///
     wxEventTraceProcessorThread(wxEvtHandler *parent, const wxArrayString &sessions);
-
-    ///
-    /// Destructor
-    ///
     virtual ~wxEventTraceProcessorThread();
 
-    ///
-    /// Closes all session handles to allow graceful thread termination
-    ///
     void Abort();
 
 protected:
-    /// \cond internal
     virtual ExitCode Entry();
-    /// \endcond
 
 private:
-    /// \cond internal
-    static VOID WINAPI EventRecordCallback(_In_ PEVENT_RECORD pEvent);
-    /// \endcond
+    static VOID WINAPI EventRecordCallback(PEVENT_RECORD pEvent);
 
 protected:
     std::vector<TRACEHANDLE> m_traces;  ///< An array of tracing sessions this thread is monitoring
@@ -159,9 +109,6 @@ protected:
 };
 
 
-///
-/// Event list control
-///
 class wxETWListCtrl : public wxListCtrl
 {
 protected:
@@ -170,9 +117,6 @@ protected:
     ///
     struct less_guid : public std::binary_function<GUID, GUID, bool>
     {
-        ///
-        /// Compares two GUIDs
-        ///
         bool operator()(const GUID &a, const GUID &b) const
         {
             if (a.Data1 < b.Data1) return true;
@@ -192,17 +136,6 @@ protected:
     typedef std::set<GUID, less_guid> guidset;
 
 public:
-    ///
-    /// Creates a list control for ETW log display
-    ///
-    /// \param[in] parent     Parent window. Must not be \c NULL.
-    /// \param[in] id         Window identifier. The value \c wxID_ANY indicates a default value.
-    /// \param[in] pos        Window position. If \c wxDefaultPosition is specified then a default position is chosen.
-    /// \param[in] size       Window size. If \c wxDefaultSize is specified then the window is sized appropriately.
-    /// \param[in] style      Window style. See \c wxListCtrl.
-    /// \param[in] validator  Window validator
-    /// \param[in] name       Window name
-    ///
     wxETWListCtrl(
               wxWindow    *parent,
               wxWindowID  id         = wxID_ANY,
@@ -211,70 +144,21 @@ public:
               long        style      = wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxNO_BORDER,
         const wxValidator &validator = wxDefaultValidator,
         const wxString    &name      = wxListCtrlNameStr);
-
-    ///
-    /// Destructor
-    ///
     virtual ~wxETWListCtrl();
 
-    ///
-    /// Returns true if the list is empty
-    ///
-    inline bool IsEmpty() const
-    {
-        return m_rec_db.empty();
-    }
-
-    ///
-    /// Copies selected rows to clipboard
-    ///
+    inline bool IsEmpty() const { return m_rec_db.empty(); }
     void CopySelected() const;
-
-    ///
-    /// Copies all rows (including hidden ones) to clipboard
-    ///
     void CopyAll() const;
-
-    ///
-    /// Empties the list
-    ///
     void ClearAll();
-
-    ///
-    /// Selects all rows
-    ///
     void SelectAll();
-
-    ///
-    /// Clears row selection
-    ///
     void SelectNone();
-
-    ///
-    /// Rebuilds the list
-    ///
     void RebuildItems();
 
-    ///
-    /// Checks if given ETW source is enabled
-    ///
-    /// \param[in] guid  GUID of ETW source
-    ///
-    /// \returns
-    /// - \c true if ETW source with \p guid GUID is enabled;
-    /// - \c false otherwise.
-    ///
     inline bool IsSourceEnabled(const GUID &guid) const
     {
         return m_sources.find(guid) != m_sources.end();
     }
 
-    ///
-    /// Enables/Disables ETW source
-    ///
-    /// \param[in] guid    GUID of ETW source
-    /// \param[in] enable  \c true to enable, \c false to disable
-    ///
     inline void EnableSource(const GUID &guid, bool enable = true)
     {
         auto s = m_sources.find(guid);
@@ -294,7 +178,6 @@ public:
     friend class wxPersistentETWListCtrl;   // Allow saving/restoring window state.
 
 protected:
-    /// \cond internal
     bool IsVisible(const EVENT_RECORD &rec) const;
     void FormatRow(const winstd::event_rec &rec, std::string &rowA, std::wstring &rowW) const;
     bool CopyToClipboard(const std::string &dataA, const std::wstring &dataW) const;
@@ -303,8 +186,6 @@ protected:
     virtual wxString OnGetItemText(long item, long column) const;
     virtual wxString OnGetItemText(const winstd::event_rec &rec, long column) const;
     void OnETWEvent(wxETWEvent& event);
-    /// \endcond
-
     DECLARE_EVENT_TABLE()
 
 public:
@@ -328,48 +209,18 @@ protected:
 };
 
 
-///
-/// Supports saving/restoring `wxETWListCtrl` state
-///
 class wxPersistentETWListCtrl : public wxPersistentWindow<wxETWListCtrl>
 {
 public:
-    ///
-    /// Constructor for a persistent window object
-    ///
-    /// \param[in] wnd  Window this object will save/restore
-    ///
     wxPersistentETWListCtrl(wxETWListCtrl *wnd);
 
-    ///
-    /// Returns the string uniquely identifying the objects supported by this adapter.
-    ///
-    /// \returns This implementation always returns `wxT(wxPERSIST_TLW_KIND)`
-    ///
     virtual wxString GetKind() const;
-
-    ///
-    /// Saves the object properties
-    ///
     virtual void Save() const;
-
-    ///
-    /// Restores the object properties
-    ///
-    /// \returns
-    /// - \c true if the properties were successfully restored;
-    /// - \c false otherwise.
-    ///
     virtual bool Restore();
 };
 
 
-///
-/// Creates persistent window object for `wxETWListCtrl` class window
-///
 inline wxPersistentObject *wxCreatePersistentObject(wxETWListCtrl *wnd)
 {
     return new wxPersistentETWListCtrl(wnd);
 }
-
-/// @}

EventMonitor/EventMonitor.props

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

EventMonitor/EventMonitor.vcxproj

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -13,10 +9,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -30,88 +22,66 @@
     <ProjectGuid>{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EventMonitor</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Debug.props" />
+    <Import Project="EventMonitor.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Debug.props" />
+    <Import Project="EventMonitor.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\Win32.props" />
+    <Import Project="..\include\Release.props" />
+    <Import Project="EventMonitor.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\x64.props" />
+    <Import Project="..\include\Release.props" />
+    <Import Project="EventMonitor.props" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
   <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>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\wxExtend\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-    </Link>
-  </ItemDefinitionGroup>
   <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>
@@ -120,7 +90,7 @@
     <ClInclude Include="ETWLog.h" />
     <ClInclude Include="Frame.h" />
     <ClInclude Include="LogPanel.h" />
-    <ClInclude Include="PCH.h" />
+    <ClInclude Include="StdAfx.h" />
     <ClInclude Include="res\wxEventMonitor_UI.h" />
   </ItemGroup>
   <ItemGroup>
@@ -128,8 +98,11 @@
     <ClCompile Include="ETWLog.cpp" />
     <ClCompile Include="Frame.cpp" />
     <ClCompile Include="LogPanel.cpp" />
-    <ClCompile Include="PCH.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
+    <ClCompile Include="StdAfx.cpp">
+      <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)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="res\wxEventMonitor_UI.cpp" />
   </ItemGroup>
@@ -137,10 +110,10 @@
     <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib-16.0.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
       <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
     </ProjectReference>
   </ItemGroup>
@@ -157,7 +130,6 @@
     <POCompile Include="locale\de_DE.po" />
     <POCompile Include="locale\el_GR.po" />
     <POCompile Include="locale\es_ES.po" />
-    <POCompile Include="locale\et_EE.po" />
     <POCompile Include="locale\eu_ES.po" />
     <POCompile Include="locale\fi_FI.po" />
     <POCompile Include="locale\fr_CA.po" />

EventMonitor/EventMonitor.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -24,7 +24,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="PCH.h">
+    <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="App.h">
@@ -44,7 +44,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="PCH.cpp">
+    <ClCompile Include="StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="App.cpp">
@@ -162,8 +162,5 @@
     <POCompile Include="locale\ko_KR.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
-    <POCompile Include="locale\et_EE.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
   </ItemGroup>
 </Project>

EventMonitor/Frame.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,7 +18,7 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "PCH.h"
+#include "StdAfx.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -26,10 +26,10 @@
 //////////////////////////////////////////////////////////////////////////
 
 
-wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, long style, const wxString& name) :
-    wxFrame(parent, id, title, pos, parent->FromDIP(wxSize(600,400)), style, name)
+wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name) :
+    wxFrame(parent, id, title, pos, size, style, name)
 {
-    this->SetSizeHints(FromDIP(wxSize(150,150)), wxDefaultSize);
+    this->SetSizeHints(wxSize(150,150), wxDefaultSize);
     m_mgr.SetManagedWindow(this);
     m_mgr.SetFlags(wxAUI_MGR_DEFAULT);
 
@@ -261,8 +261,6 @@ wxEventMonitorFrame::~wxEventMonitorFrame()
 }
 
 
-/// \cond internal
-
 void wxEventMonitorFrame::OnExit(wxCommandEvent& event)
 {
     Close();
@@ -410,8 +408,6 @@ void wxEventMonitorFrame::OnViewToolbar(wxCommandEvent& event)
     }
 }
 
-/// \endcond
-
 
 //////////////////////////////////////////////////////////////////////////
 // wxPersistentEventMonitorFrame

EventMonitor/Frame.h

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,7 +18,14 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
+///
+/// EventMonitor main frame
+///
 class wxEventMonitorFrame;
+
+///
+/// Supports saving/restoring wxEventMonitorFrame GUI state
+///
 class wxPersistentEventMonitorFrame;
 
 #pragma once;
@@ -34,16 +41,7 @@ class wxPersistentEventMonitorFrame;
 
 #include <WinStd/Win.h>
 
-#pragma warning(push)
-#pragma warning(disable: 26444)
 
-
-/// \addtogroup EventMonitor
-/// @{
-
-///
-/// EventMonitor main frame
-///
 class wxEventMonitorFrame : public wxFrame
 {
 protected:
@@ -64,28 +62,12 @@ protected:
     };
 
 public:
-    ///
-    /// Creates an EventMonitor frame window
-    ///
-    /// \param[in] parent  The window parent. This may be \c NULL. If it is non-NULL, the frame will always be displayed on top of the parent window on Windows.
-    /// \param[in] id      The window identifier. It may take a value of \c wxID_ANY to indicate a default value.
-    /// \param[in] title   The caption to be displayed on the frame's title bar.
-    /// \param[in] pos     The window position. The value \c wxDefaultPosition indicates a default position, chosen by either the windowing system or wxWidgets, depending on platform.
-    /// \param[in] size    The window size. The value \c wxDefaultSize indicates a default size, chosen by either the windowing system or wxWidgets, depending on platform.
-    /// \param[in] style   The window style. See `wxFrame` class description.
-    /// \param[in] name    The name of the window. This parameter is used to associate a name with the item, allowing the application user to set Motif resource values for individual windows.
-    ///
-    wxEventMonitorFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Event Monitor"), const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitor"));
-
-    ///
-    /// Destructor
-    ///
+    wxEventMonitorFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Event Monitor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(600,400), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitor"));
     ~wxEventMonitorFrame();
 
     friend class wxPersistentEventMonitorFrame;
 
 protected:
-    /// \cond internal
     void OnExit(wxCommandEvent& event);
     void OnEditCopyUpdate(wxUpdateUIEvent& event);
     void OnEditCopy(wxCommandEvent& event);
@@ -105,10 +87,8 @@ protected:
     void OnViewLevel(wxCommandEvent& event);
     void OnViewToolbarUpdate(wxUpdateUIEvent& event);
     void OnViewToolbar(wxCommandEvent& event);
-    /// \endcond
 
 protected:
-    /// \cond internal
     wxMenuBar* m_menubar;
     wxMenu* m_menuProgram;
     wxMenu* m_menuEdit;
@@ -134,47 +114,20 @@ protected:
     wxStatusBar* m_statusBar;
     wxEventMonitorLogPanel* m_panel;
     wxAuiManager m_mgr;
-    /// \endcond
 };
 
 
-///
-/// Supports saving/restoring `wxEventMonitorFrame` GUI state
-///
 class wxPersistentEventMonitorFrame : public wxPersistentTLW
 {
 public:
-    ///
-    /// Constructor for a persistent window object
-    ///
-    /// \param[in] wnd  Window this object will save/restore
-    ///
     wxPersistentEventMonitorFrame(wxEventMonitorFrame *wnd);
 
-    ///
-    /// Saves the object properties
-    ///
     virtual void Save() const;
-
-    ///
-    /// Restores the object properties
-    ///
-    /// \returns
-    /// - \c true if the properties were successfully restored;
-    /// - \c false otherwise.
-    ///
     virtual bool Restore();
 };
 
 
-///
-/// Creates persistent window object for `wxETWListCtrl` class window
-///
 inline wxPersistentObject *wxCreatePersistentObject(wxEventMonitorFrame *wnd)
 {
     return new wxPersistentEventMonitorFrame(wnd);
 }
-
-/// @}
-
-#pragma warning(pop)

EventMonitor/LogPanel.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,7 +18,7 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "PCH.h"
+#include "StdAfx.h"
 
 
 //////////////////////////////////////////////////////////////////////////

EventMonitor/LogPanel.h

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,7 +18,14 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
+///
+/// EventMonitor trace log panel
+///
 class wxEventMonitorLogPanel;
+
+///
+/// Supports saving/restoring wxEventMonitorLogPanel state
+///
 class wxPersistentEventMonitorLogPanel;
 
 #pragma once
@@ -27,68 +34,27 @@ class wxPersistentEventMonitorLogPanel;
 #include <wx/persist/window.h>
 
 
-/// \addtogroup EventMonitor
-/// @{
-
-///
-/// EventMonitor trace log panel
-///
 class wxEventMonitorLogPanel : public wxEventMonitorLogPanelBase
 {
 public:
-    ///
-    /// Constructs EventMonitor log panel
-    ///
-    /// \param[in] parent  Parent window. Must not be \c NULL.
-    ///
     wxEventMonitorLogPanel(wxWindow* parent);
 
     friend class wxPersistentEventMonitorLogPanel;   // Allow saving/restoring window state.
 };
 
 
-///
-/// Supports saving/restoring `wxEventMonitorLogPanel` state
-///
 class wxPersistentEventMonitorLogPanel : public wxPersistentWindow<wxEventMonitorLogPanel>
 {
 public:
-    ///
-    /// Constructor for a persistent window object
-    ///
-    /// \param[in] wnd  Window this object will save/restore
-    ///
     wxPersistentEventMonitorLogPanel(wxEventMonitorLogPanel *wnd);
 
-    ///
-    /// Returns the string uniquely identifying the objects supported by this adapter.
-    ///
-    /// \returns This implementation always returns `wxT(wxPERSIST_TLW_KIND)`
-    ///
     virtual wxString GetKind() const;
-
-    ///
-    /// Saves the object properties
-    ///
     virtual void Save() const;
-
-    ///
-    /// Restores the object properties
-    ///
-    /// \returns
-    /// - \c true if the properties were successfully restored;
-    /// - \c false otherwise.
-    ///
     virtual bool Restore();
 };
 
 
-///
-/// Creates persistent window object for `wxEventMonitorLogPanel` class window
-///
 inline wxPersistentObject *wxCreatePersistentObject(wxEventMonitorLogPanel *wnd)
 {
     return new wxPersistentEventMonitorLogPanel(wnd);
 }
-
-/// @}

EventMonitor/StdAfx.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
@@ -18,4 +18,4 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "PCH.h"
+#include "StdAfx.h"

EventMonitor/StdAfx.h

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2020 Amebis
+/*
+    Copyright 2015-2016 Amebis
     Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.

EventMonitor/locale/EventMonitor.pot

@@ -2,21 +2,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2019-08-12 14:04+0200\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: en_US\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: App.cpp:61 Frame.h:75 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
@@ -26,41 +27,41 @@ msgstr ""
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
-#: ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr ""
 
-#: ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr ""
 
-#: ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr ""
 
-#: ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr ""
 
-#: ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr ""
 
-#: ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid "Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."
 msgstr ""
 
-#: ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""
 
-#: ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
 
-#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
@@ -204,8 +205,6 @@ msgstr ""
 msgid "Trace Log"
 msgstr ""
 
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
@@ -213,7 +212,6 @@ msgstr ""
 msgid "Real-time display of internal events"
 msgstr ""
 
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"

EventMonitor/locale/bg_BG.po

@@ -1,12 +1,10 @@
-# Translators:
-# University of Ruse <support@uni-ruse.bg>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: University of Ruse <support@uni-ruse.bg>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -14,65 +12,43 @@ 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-Poedit-Basepath: ../../..\n"
+"X-Generator: Poedit 1.8.9\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/EventMonitor\n"
-"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
-"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
+"X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr "Следене на събития"
 
-#: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
+#: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr "Грешка при отваряне проследяването на събитие (error %u)."
 
-#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr "Време"
 
-#: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr "PID"
 
-#: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr "TID"
 
-#: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr "Източник"
 
-#: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr "Събитие"
 
-#: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
@@ -82,264 +58,168 @@ msgstr ""
 "администраторски права (Run As Administrator) или да бъдете член на групата "
 "Performance Log Users, за да стартирате сесия за проследяване на събитие."
 
-#: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr "Сесията на събитие %s вече съществува."
 
-#: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr "Грешка при създаване сесията на събитие (error %u)."
 
-#: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
-#: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
-#: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr "Грешка при разрешаване %s събитие на доставчик (error %u)."
 
-#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
-#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
-#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
-#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
-#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
+#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr "Сборно изобразяване на записи %s"
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "E&xit"
 msgstr "Из&ход"
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "Quits this program"
 msgstr "Излизане от тази програма"
 
-#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
+#: Frame.cpp:69
 msgid "&Program"
 msgstr "&Програма"
 
-#: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
+#: Frame.cpp:73
 msgid "&Copy"
 msgstr "&Копиране"
 
-#: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
-#: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr "Копиране на избраните записи в клипборда"
 
-#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
+#: Frame.cpp:78
 msgid "Copy A&ll"
 msgstr "Копиране на Всич&ко"
 
-#: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
-#: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr "Копиране на всички записи в клипборда (включително скритите)"
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
 msgstr "Изчистване"
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr "Изчистване на всички записи от лога"
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Select &All"
 msgstr "Изберете &всичко"
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Selects all visible records"
 msgstr "Изберете всички видими записи"
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Select &None"
 msgstr "Изберете &Нищо"
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Clears record selection"
 msgstr "Изчистете избраните записи"
 
-#: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
+#: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
 msgstr "&Редактиране"
 
-#: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
+#: Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr "Автоматичен &скрол"
 
-#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
-#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr "Автоматичен скрол на най-последните записи, така както са влезли"
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
 msgstr "Подробно"
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr "Показва всички нива на записите"
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
 msgstr "Информационен"
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr "Показва всички записи, по-високи от информационното ниво"
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr "Показва всички записи, по-високи от ниво предупреждение"
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
 msgstr "Грешка"
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
 msgstr "Показва само записи с ниво грешка"
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr "%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
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr "Сборно изобразяване на лентата с инструменти %s"
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
+#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
 msgstr "Изглед"
 
-#: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
+#: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
 msgstr "&Изглед"
 
-#: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:154
 msgid "Copy"
 msgstr "Копиране"
 
-#: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:156
 msgid "Copy All"
 msgstr "Копиране на всичко"
 
-#: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
+#: Frame.cpp:161
 msgid "Edit"
 msgstr "Редактиране"
 
-#: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:164
 msgid "Auto Scroll"
 msgstr "Автоматичен скрол"
 
-#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
+#: Frame.cpp:189
 msgid "Trace Log"
 msgstr "Лог с проследяване"
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: 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
 msgid "Real-time display of internal events"
 msgstr "Покзва в реално време вътрешни събития"
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr "EVENTM~1|GÉANTLink следене на събитие"

EventMonitor/locale/ca_ES.po

@@ -1,12 +1,10 @@
-# Translators:
-# eduki <ecercos@xtec.cat>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2019-08-12 14:04+0200\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"POT-Creation-Date: 2016-09-19 11:14+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"
 "MIME-Version: 1.0\n"
@@ -14,14 +12,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: App.cpp:61 Frame.h:75 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr "Monitor de Successos"
@@ -31,27 +28,27 @@ msgstr "Monitor de Successos"
 msgid "Error opening event trace (error %u)."
 msgstr "Error obrint la traça (error %u)."
 
-#: ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr "Temps"
 
-#: ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr "PID"
 
-#: ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr "TID"
 
-#: ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr "Font"
 
-#: ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr "Succés"
 
-#: ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
@@ -62,17 +59,17 @@ msgstr ""
 "d'usuaris del Log de Rendiment per iniciar una sessió de traces de "
 "successos."
 
-#: ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr "La sessió de successos %s ja existeix."
 
-#: ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr "Error creant la sessió de successos (error %u)."
 
-#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr "Error habilitant el proveidor de successos %s (error %u)."
@@ -216,8 +213,6 @@ msgstr "Auto Scroll"
 msgid "Trace Log"
 msgstr "Registre de traces"
 
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
@@ -225,7 +220,6 @@ msgstr "Registre de traces"
 msgid "Real-time display of internal events"
 msgstr "Mostra en temps real dels successos interns"
 
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"

EventMonitor/locale/cs_CZ.po

@@ -3,337 +3,219 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/eduroam_devel/teams/11799/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
-"X-Generator: Poedit 1.8.11\n"
-"X-Poedit-Basepath: ../../..\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Poedit 1.8.9\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/EventMonitor\n"
-"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
-"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
+"X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
+#: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
-#: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
-#: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
-#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
-#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
-#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
-#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
+#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "E&xit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "Quits this program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
+#: Frame.cpp:69
 msgid "&Program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
+#: Frame.cpp:73
 msgid "&Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
-#: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
+#: Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
-#: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Select &All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Select &None"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
+#: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
+#: Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
-#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
+#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
+#: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:154
 msgid "Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:156
 msgid "Copy All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
+#: Frame.cpp:161
 msgid "Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
+#: Frame.cpp:189
 msgid "Trace Log"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: 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
 msgid "Real-time display of internal events"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""

EventMonitor/locale/cy_UK.po

@@ -3,337 +3,219 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Welsh (https://www.transifex.com/eduroam_devel/teams/11799/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Poedit-Basepath: ../../..\n"
+"X-Generator: Poedit 1.8.9\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/EventMonitor\n"
-"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
-"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
+"X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
+#: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
-#: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
-#: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
-#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
-#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
-#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
-#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
+#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "E&xit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "Quits this program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
+#: Frame.cpp:69
 msgid "&Program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
+#: Frame.cpp:73
 msgid "&Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
-#: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
+#: Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
-#: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Select &All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Select &None"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
+#: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
+#: Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
-#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
+#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
+#: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:154
 msgid "Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:156
 msgid "Copy All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
+#: Frame.cpp:161
 msgid "Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
+#: Frame.cpp:189
 msgid "Trace Log"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: 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
 msgid "Real-time display of internal events"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""

EventMonitor/locale/de_DE.po

@@ -1,28 +1,24 @@
-# Translators:
-# eduroam_devel <stefan.winter@restena.lu>, 2016
-# Eric Hoch <eric.hoch@hhu.de>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2019-08-12 14:04+0200\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Last-Translator: Eric Hoch <eric.hoch@hhu.de>, 2016\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: eduroam_devel <stefan.winter@restena.lu>, 2016\n"
 "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: App.cpp:61 Frame.h:75 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr "Ereignisanzeige"
@@ -32,27 +28,27 @@ msgstr "Ereignisanzeige"
 msgid "Error opening event trace (error %u)."
 msgstr "Fehler beim Öffnen des Ereignislogs (Fehler %u)."
 
-#: ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr "Zeit"
 
-#: ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr "PID"
 
-#: ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr "TID"
 
-#: ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr "Quelle"
 
-#: ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr "Ereignis"
 
-#: ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
@@ -63,17 +59,17 @@ msgstr ""
 "ausführen) oder müssen in der Benutzergruppe Leistungsprotokollbenutzer sein"
 " um eine Ereignislogsitzung zu eröffnen."
 
-#: ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr "Es besteht bereits ein Eintrag für für die Sitzung %s"
 
-#: ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr "Fehler beim Erstellen der Ereignislogsitzung (Fehler %u)."
 
-#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr "Fehler beim Einschalten des %s Ereignisanbieters (Fehler %u)."
@@ -218,8 +214,6 @@ msgstr "Automatischer Bildlauf"
 msgid "Trace Log"
 msgstr "Ereignislog"
 
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
@@ -227,7 +221,6 @@ msgstr "Ereignislog"
 msgid "Real-time display of internal events"
 msgstr "Echtzeitanzeige der internen Ereignisse"
 
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"

EventMonitor/locale/el_GR.po

@@ -1,13 +1,10 @@
-# Translators:
-# Vicky Kons <vickyk@admin.grnet.gr>, 2016
-# Zenon Mousmoulas <zenon@mousmoulas.gr>, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2019-08-12 14:04+0200\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Zenon Mousmoulas <zenon@mousmoulas.gr>, 2016\n"
 "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n"
 "MIME-Version: 1.0\n"
@@ -15,14 +12,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: App.cpp:61 Frame.h:75 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr "Παρακολούθηση Συνεδριών"
@@ -32,27 +28,27 @@ msgstr "Παρακολούθηση Συνεδριών"
 msgid "Error opening event trace (error %u)."
 msgstr "Σφάλμα ενακτήριας συνεδρίας (σφάλμα %u)."
 
-#: ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr "Χρόνος"
 
-#: ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr "PID"
 
-#: ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr "TID"
 
-#: ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr "Πηγή"
 
-#: ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr "Συνεδρία"
 
-#: ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
@@ -62,17 +58,17 @@ msgstr ""
 "δικαιώματα διαχειριστή (Εκτέλεση ως διαχειριστής) ή να είστε μέλος της "
 "ομάδας Perfomance Log Users για να ξεκινήσετε να ψάξετε μία συνεδρία."
 
-#: ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr "Η %s συνεδρία υπάρχει ήδη."
 
-#: ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr "Σφάλμα κατά τη δημιουργία συνεδρίας (σφάλμα %u)."
 
-#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr "Σφάλμα κατά την ενεργοποίηση %s παρόχου στη συνεδρία (σφάλμα %u)."
@@ -217,8 +213,6 @@ msgstr "Αυτόματη Κύλιση"
 msgid "Trace Log"
 msgstr "Trace Log"
 
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
@@ -226,7 +220,6 @@ msgstr "Trace Log"
 msgid "Real-time display of internal events"
 msgstr "Απεικόνιση των εσωτερικών γεγονότων σε πραγματικό χρόνο  "
 
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"

EventMonitor/locale/es_ES.po

@@ -1,27 +1,24 @@
-# Translators:
-# José Manuel Macías, 2016
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2019-08-12 14:04+0200\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Last-Translator: José Manuel Macías, 2016\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: App.cpp:61 Frame.h:75 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr "Monitor de eventos"
@@ -31,27 +28,27 @@ msgstr "Monitor de eventos"
 msgid "Error opening event trace (error %u)."
 msgstr "Error abriendo la traza de evento (error %u)."
 
-#: ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr "Instante"
 
-#: ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr "PID"
 
-#: ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr "TID"
 
-#: ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr "Fuente"
 
-#: ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr "Evento"
 
-#: ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
@@ -61,17 +58,17 @@ msgstr ""
 "administración (ejecutar como administrador) o ser miembro del grupo "
 "\"Performance Log Users\" para comenzar una sesión de traza de eventos."
 
-#: ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr "La evento de sesión %s ya existía."
 
-#: ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr "Error creando una sesión de eventos (error %u)."
 
-#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr "Error habilitando el proveedor de eventos %s (error %u)."
@@ -216,8 +213,6 @@ msgstr "Autodesplazamiento"
 msgid "Trace Log"
 msgstr "Trazar log"
 
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
@@ -225,7 +220,6 @@ msgstr "Trazar log"
 msgid "Real-time display of internal events"
 msgstr "Mostrar en tiempo real los eventos internos"
 
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"

EventMonitor/locale/et_EE.po

@@ -1,233 +0,0 @@
-# Translators:
-# Indrek Rokk <indrek.rokk@eenet.ee>, 2018
-# Anne M <anne@eenet.ee>, 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2019-08-12 14:04+0200\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
-"Last-Translator: Anne M <anne@eenet.ee>, 2019\n"
-"Language-Team: Estonian (https://www.transifex.com/eduroam_devel/teams/11799/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.3\n"
-"X-Poedit-Basepath: ..\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#: App.cpp:61 Frame.h:75 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-msgid "Event Monitor"
-msgstr "Sündmuste monitor"
-
-#: ETWLog.cpp:83
-#, c-format
-msgid "Error opening event trace (error %u)."
-msgstr "Viga sündmuse jälitamise avamisel (viga %u)."
-
-#: ETWLog.cpp:171
-msgid "Time"
-msgstr "Aeg"
-
-#: ETWLog.cpp:172
-msgid "PID"
-msgstr "PID"
-
-#: ETWLog.cpp:173
-msgid "TID"
-msgstr "TID"
-
-#: ETWLog.cpp:174
-msgid "Source"
-msgstr "Allikas"
-
-#: ETWLog.cpp:175
-msgid "Event"
-msgstr "Sündmus"
-
-#: ETWLog.cpp:232
-msgid ""
-"Access denied creating event session: you need administrative privileges "
-"(Run As Administrator) or be a member of Performance Log Users group to "
-"start event tracing session."
-msgstr ""
-"Puudub pääsuluba: sündmuse jälitusseansi loomiseks vajad "
-"administraatoriõigusi (Run As Administrator) või kuulumist soorituste logi "
-"kasutajagruppi (Performance Log Users)"
-
-#: ETWLog.cpp:235
-#, c-format
-msgid "The %s event session already exists."
-msgstr "%s sündmuse seanss on juba olemas."
-
-#: ETWLog.cpp:239
-#, c-format
-msgid "Error creating event session (error %u)."
-msgstr "Viga sündmuse seansi loomisel (viga %u)."
-
-#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
-#, c-format
-msgid "Error enabling %s event provider (error %u)."
-msgstr "Viga %s sündmuse looja võimaldamisel (viga %u)."
-
-#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
-#, c-format
-msgid "Toggles display of %s records"
-msgstr "Lülitab %s kirjete näitamise sisse"
-
-#: Frame.cpp:65
-msgid "E&xit"
-msgstr "V&älju"
-
-#: Frame.cpp:65
-msgid "Quits this program"
-msgstr "Lõpetab selle programmi"
-
-#: Frame.cpp:69
-msgid "&Program"
-msgstr "&Programm"
-
-#: Frame.cpp:73
-msgid "&Copy"
-msgstr "&Kopeeri"
-
-#: Frame.cpp:73 Frame.cpp:154
-msgid "Copies selected records to clipboard"
-msgstr "Kopeerib valitud kirjed lõikelauale"
-
-#: Frame.cpp:78
-msgid "Copy A&ll"
-msgstr "Kopee&ri kõik"
-
-#: Frame.cpp:78 Frame.cpp:156
-msgid "Copies all records to clipboard (including hidden)"
-msgstr "Kopeerib kõik (sh varjatud) kirjed lõikelauale"
-
-#: Frame.cpp:83 Frame.cpp:158
-msgid "Clear"
-msgstr "Kustuta"
-
-#: Frame.cpp:83 Frame.cpp:158
-msgid "Clears all records from the log"
-msgstr "Kustutab logist kõik kirjed"
-
-#: Frame.cpp:90
-msgid "Select &All"
-msgstr "Vali k&õik"
-
-#: Frame.cpp:90
-msgid "Selects all visible records"
-msgstr "Valib kõik nähtavad kirjed"
-
-#: Frame.cpp:94
-msgid "Select &None"
-msgstr "Valiku &nullimine"
-
-#: Frame.cpp:94
-msgid "Clears record selection"
-msgstr "Tühjendab kirjete valiku"
-
-#: Frame.cpp:97 Frame.cpp:142
-msgid "&Edit"
-msgstr "R&edigeeri"
-
-#: Frame.cpp:101
-msgid "Auto &Scroll"
-msgstr "A&utomaatne kerimine"
-
-#: Frame.cpp:101 Frame.cpp:164
-msgid "Automatically scrolls to the most recent records as they come-in"
-msgstr ""
-"Kerib automaatselt kõige värskemate kirjeteni vastavalt nende tekkimisele"
-
-#: Frame.cpp:123 Frame.cpp:176
-msgid "Verbose"
-msgstr "Pikk tulemus"
-
-#: Frame.cpp:123 Frame.cpp:176
-msgid "Displays all levels of records"
-msgstr "Kõigi tasemete kirjete kuvamine"
-
-#: Frame.cpp:127 Frame.cpp:178
-msgid "Informational"
-msgstr "Informatiivne"
-
-#: Frame.cpp:127 Frame.cpp:178
-msgid "Displays all records up to informational level"
-msgstr "Kirjete kuvamine informatiivse tasemeni"
-
-#: Frame.cpp:131 Frame.cpp:180
-msgid "Warning"
-msgstr "Hoiatused"
-
-#: Frame.cpp:131 Frame.cpp:180
-msgid "Displays all records up to warning level"
-msgstr "Kirjete kuvamine hoiatustasemeni"
-
-#: Frame.cpp:135 Frame.cpp:182
-msgid "Error"
-msgstr "Vead"
-
-#: Frame.cpp:135 Frame.cpp:182
-msgid "Displays error level records only"
-msgstr "Kirjete kuvamine ainult veatasemel"
-
-#: Frame.cpp:142 Frame.cpp:146
-#, c-format
-msgid "%s toolbar"
-msgstr "%s tööriistariba"
-
-#: Frame.cpp:142 Frame.cpp:146
-#, c-format
-msgid "Toggles display of %s toolbar"
-msgstr "Vahetab %s tööriistariba kuvamise"
-
-#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
-msgid "View"
-msgstr "Vaata"
-
-#: Frame.cpp:146 Frame.cpp:149
-msgid "&View"
-msgstr "&Vaata"
-
-#: Frame.cpp:154
-msgid "Copy"
-msgstr "Kopeeri"
-
-#: Frame.cpp:156
-msgid "Copy All"
-msgstr "Kopeeri kõik"
-
-#: Frame.cpp:161
-msgid "Edit"
-msgstr "Redigeeri"
-
-#: Frame.cpp:164
-msgid "Auto Scroll"
-msgstr "Automaatne kerimine"
-
-#: Frame.cpp:189
-msgid "Trace Log"
-msgstr "Jälituslogi"
-
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-msgid "Real-time display of internal events"
-msgstr "Sisesündmuste reaalajas kuvamine"
-
-#: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-msgid "EVENTM~1|GÉANTLink Event Monitor"
-msgstr "EVENTM~1|GÉANTLink Event Monitor"

EventMonitor/locale/eu_ES.po

@@ -3,337 +3,219 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Basque (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Poedit-Basepath: ../../..\n"
+"X-Generator: Poedit 1.8.9\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/EventMonitor\n"
-"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
-"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
+"X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
+#: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
-#: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
-#: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
-#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
-#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
-#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
-#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
+#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "E&xit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "Quits this program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
+#: Frame.cpp:69
 msgid "&Program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
+#: Frame.cpp:73
 msgid "&Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
-#: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
+#: Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
-#: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Select &All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Select &None"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
+#: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
+#: Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
-#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
+#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
+#: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:154
 msgid "Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:156
 msgid "Copy All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
+#: Frame.cpp:161
 msgid "Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
+#: Frame.cpp:189
 msgid "Trace Log"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: 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
 msgid "Real-time display of internal events"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""

EventMonitor/locale/fi_FI.po

@@ -3,337 +3,219 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/eduroam_devel/teams/11799/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Poedit-Basepath: ../../..\n"
+"X-Generator: Poedit 1.8.9\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/EventMonitor\n"
-"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
-"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
+"X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
+#: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
-#: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
-#: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
-#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
-#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
-#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
-#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
+#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "E&xit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "Quits this program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
+#: Frame.cpp:69
 msgid "&Program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
+#: Frame.cpp:73
 msgid "&Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
-#: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
+#: Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
-#: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Select &All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Select &None"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
+#: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
+#: Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
-#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
+#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
+#: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:154
 msgid "Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:156
 msgid "Copy All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
+#: Frame.cpp:161
 msgid "Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
+#: Frame.cpp:189
 msgid "Trace Log"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: 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
 msgid "Real-time display of internal events"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""

EventMonitor/locale/fr_CA.po

@@ -3,337 +3,219 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
-"PO-Revision-Date: 2016-08-27 11:21+0000\n"
+"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Language-Team: French (Canada) (https://www.transifex.com/eduroam_devel/teams/11799/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-Poedit-Basepath: ../../..\n"
+"X-Generator: Poedit 1.8.9\n"
+"X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: master/EventMonitor\n"
-"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
-"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
+"X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
+#: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
+#: ETWLog.cpp:167
 msgid "Time"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
+#: ETWLog.cpp:168
 msgid "PID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
+#: ETWLog.cpp:169
 msgid "TID"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
+#: ETWLog.cpp:170
 msgid "Source"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
+#: ETWLog.cpp:171
 msgid "Event"
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
+#: ETWLog.cpp:228
 msgid ""
 "Access denied creating event session: you need administrative privileges "
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
+#: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
+#: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
 
-#: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
-#: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
-#: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
+#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:48 master/EventMonitor/Frame.cpp:108
-#: master/EventMonitor/Frame.cpp:113 master/EventMonitor/Frame.cpp:168
-#: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
-#: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
-#: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
+#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "E&xit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
+#: Frame.cpp:65
 msgid "Quits this program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
+#: Frame.cpp:69
 msgid "&Program"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
+#: Frame.cpp:73
 msgid "&Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
-#: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
+#: Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
-#: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
-#: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
+#: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Select &All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
+#: Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Select &None"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
+#: Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
+#: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
+#: Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
-#: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
-#: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
+#: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
-#: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
+#: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
-#: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
+#: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
-#: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
+#: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
+#: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
-#: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
+#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
-#: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
+#: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
+#: Frame.cpp:154
 msgid "Copy"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
+#: Frame.cpp:156
 msgid "Copy All"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
+#: Frame.cpp:161
 msgid "Edit"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
+#: Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""
 
-#: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
+#: Frame.cpp:189
 msgid "Trace Log"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: 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
 msgid "Real-time display of internal events"
 msgstr ""
 
-#: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: master/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""