Upgrade code signing

This adds support for Microsoft Azure Trusted Signing and removes
signing of the Debug binaries to minimize the Trusted Signing API
volume.

Signed-off-by: Simon Rozman <simon@rozman.si>

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "lib/wxExtend"]
 	path = lib/wxExtend
 	url = https://github.com/Amebis/wxExtend.git
+[submodule "lib/stdex"]
+	path = lib/stdex
+	url = https://github.com/Amebis/stdex.git

CredWrite/CredWrite.vcxproj

@@ -28,87 +28,39 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <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">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\include\$(Platform).props" />
     <Import Project="..\include\$(Configuration).props" />
   </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>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\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" />
   </ItemGroup>
@@ -134,14 +86,10 @@
     <ProjectReference Include="..\lib\TLS\build\TLS.vcxproj">
       <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

CredWrite/Main.cpp

@@ -1,26 +1,13 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
 
 using namespace std;
+using namespace stdex;
 using namespace winstd;
 
 class module_dummy : public eap::module {
@@ -125,9 +112,9 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
     UNREFERENCED_PARAMETER(lpCmdLine);
     UNREFERENCED_PARAMETER(nCmdShow);
 
+    _CrtSetDbgFlag(_crtDbgFlag | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_CHECK_CRT_DF | _CRTDBG_LEAK_CHECK_DF);
     g_module.m_instance = hInstance;
 
     int res = CredWrite();
-    assert(!_CrtDumpMemoryLeaks());
     return res;
 }

CredWrite/PCH.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"

CredWrite/PCH.h

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
@@ -25,8 +11,8 @@
 #include "../lib/EAPBase/include/Module.h"
 
 #include <WinStd/Common.h>
-#include <WinStd/Base64.h>
 #include <WinStd/Win.h>
+#include <stdex/base64.hpp>
 
 #include <Windows.h>
 #include <eaptypes.h> // Must include after <Windows.h>

EAPMethods/Common.props

@@ -4,14 +4,13 @@
     <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>
+      <AdditionalIncludeDirectories>$(ProjectDir);..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -21,8 +20,5 @@
     <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.vcxproj

@@ -29,65 +29,29 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{331B6077-E3E2-4867-B93E-9D3F57280DE7}</ProjectGuid>
     <RootNamespace>EAP-TTLS</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="EAPMethod.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>
@@ -96,12 +60,6 @@
       <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>
@@ -123,6 +81,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

EAPMethods/EAP-TTLS.vcxproj.filters

@@ -26,6 +26,9 @@
     <ClCompile Include="Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Register.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\EAPMethod.rc">

EAPMethods/EAP-TTLS_UI.vcxproj

@@ -29,65 +29,29 @@
   <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">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
   <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>
@@ -96,12 +60,6 @@
       <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>

EAPMethods/EAP-TTLS_UI.vcxproj.filters

@@ -30,6 +30,9 @@
     <ClCompile Include="Main_UI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Register_UI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\EAPMethod_UI.rc">
@@ -45,6 +48,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <POCompile Include="locale\ro_RO.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
     <POCompile Include="locale\sl_SI.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>

EAPMethods/EAPMethod.props

@@ -3,8 +3,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Common.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
   <ItemDefinitionGroup>
     <Link>
       <ModuleDefinitionFile>EAPMethod.def</ModuleDefinitionFile>
@@ -18,6 +16,7 @@
     <ClCompile Include="PCH.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="Register.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="EAPMethod.def" />

EAPMethods/EAPMethod_UI.props

@@ -3,8 +3,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Common.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeaderFile>PCH_UI.h</PrecompiledHeaderFile>
@@ -21,6 +19,7 @@
     <ClCompile Include="PCH_UI.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="Register_UI.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="EAPMethod_UI.def" />
@@ -52,6 +51,7 @@
     <POCompile Include="locale\pt_PT.po" />
     <POCompile Include="locale\ru_RU.po" />
     <POCompile Include="locale\sk_SK.po" />
+    <POCompile Include="locale\ro_RO.po" />
     <POCompile Include="locale\sl_SI.po" />
     <POCompile Include="locale\sr_RS.po" />
     <POCompile Include="locale\sv_SE.po" />
@@ -65,7 +65,7 @@
     <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">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
       <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
     </ProjectReference>
   </ItemGroup>

EAPMethods/Main.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
@@ -41,10 +27,10 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
     if (fdwReason == DLL_PROCESS_ATTACH) {
 #ifdef _DEBUG
         //Sleep(10000);
+        _CrtSetDbgFlag(_crtDbgFlag | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_CHECK_CRT_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
         g_peer.m_instance = hinstDLL;
-    } else if (fdwReason == DLL_PROCESS_DETACH)
-        assert(!_CrtDumpMemoryLeaks());
+    }
 
     return TRUE;
 }
@@ -106,8 +92,12 @@ DWORD WINAPI EapPeerGetInfo(EAP_TYPE* pEapType, EAP_PEER_METHOD_ROUTINES* pEapPe
     if (pEapType->type != EAPMETHOD_TYPE)
         return dwResult = ERROR_NOT_SUPPORTED;
 
-    pEapPeerMethodRoutines->dwVersion                    = PRODUCT_VERSION;
-    pEapPeerMethodRoutines->pEapType                     = NULL;
+    pEapPeerMethodRoutines->dwVersion =
+        ((PRODUCT_VERSION_MAJ   & 0xff) << 24) |
+        ((PRODUCT_VERSION_MIN   & 0xff) << 16) |
+        ((PRODUCT_VERSION_REV   & 0xff) <<  8) |
+         (PRODUCT_VERSION_BUILD & 0xff);
+    pEapPeerMethodRoutines->pEapType = NULL;
 
     pEapPeerMethodRoutines->EapPeerInitialize            = EapPeerInitialize;
     pEapPeerMethodRoutines->EapPeerShutdown              = EapPeerShutdown;

EAPMethods/Main_UI.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH_UI.h"
@@ -42,6 +28,7 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
     if (fdwReason == DLL_PROCESS_ATTACH) {
 #ifdef _DEBUG
         //Sleep(10000);
+        _CrtSetDbgFlag(_crtDbgFlag | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_CHECK_CRT_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
         g_peer.m_instance = hinstDLL;
 
@@ -55,10 +42,6 @@ BOOL WINAPI DllMain(_In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID l
     } 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;
@@ -188,7 +171,7 @@ DWORD WINAPI EapPeerConfigBlob2Xml(
 
     // Create configuration XML document.
     com_obj<IXMLDOMDocument2> pConfigDoc;
-    if (FAILED(hr = pConfigDoc.create(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER)))
+    if (FAILED(hr = CoCreateInstance(CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, pConfigDoc)))
         return dwResult = g_peer.log_error(ppEapError, HRESULT_CODE(hr), _T(__FUNCTION__) _T(" Error creating XML document."));
 
     pConfigDoc->put_async(VARIANT_FALSE);

EAPMethods/PCH.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"

EAPMethods/PCH.h

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
@@ -27,3 +13,5 @@
 #else
 #error Unknown EAP Method type.
 #endif
+
+extern EAPMETHOD_PEER g_peer;

EAPMethods/PCH_UI.cpp

@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 G<EFBFBD>ANT
-
-    This file is part of G<EFBFBD>ANTLink.
-
-    G<EFBFBD>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<EFBFBD>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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH_UI.h"

EAPMethods/PCH_UI.h

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
@@ -29,3 +15,5 @@
 #else
 #error Unknown EAP Method type.
 #endif
+
+extern EAPMETHOD_PEER_UI g_peer;

EAPMethods/Register.cpp

@@ -0,0 +1,89 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2020-2022 Amebis
+    Copyright © 2016 GÉANT
+*/
+
+#include "PCH.h"
+
+using namespace std;
+using namespace winstd;
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ LPCTSTR sValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_SZ, reinterpret_cast<LPCBYTE>(sValue), (DWORD)((_tcslen(sValue) + 1) * sizeof(tstring::value_type)));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ const tstring &sValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_SZ, reinterpret_cast<LPCBYTE>(sValue.c_str()), (DWORD)((sValue.length() + 1) * sizeof(tstring::value_type)));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ DWORD dwValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_DWORD, reinterpret_cast<LPCBYTE>(&dwValue), sizeof(dwValue));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+///
+/// Registers method in EapHost registry
+///
+/// \returns S_OK if successful; E_FAIL otherwise
+///
+STDAPI DllRegisterServer()
+{
+    try {
+        tstring sz, sz2;
+        reg_key key_methods, key_author, key_method;
+        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_CREATE_SUB_KEY, key_methods);
+        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        sprintf(sz, _T("%u"), EAPMETHOD_AUTHOR_ID);
+        s = RegCreateKeyEx(key_methods, sz.c_str(), NULL, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, key_author, NULL);
+        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        set_value(key_author, NULL, _T(PRODUCT_NAME_STR));
+        sprintf(sz, _T("%u"), EAPMETHOD_TYPE);
+        s = RegCreateKeyEx(key_author, sz.c_str(), NULL, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, key_method, NULL);
+        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!GetModuleFileName(g_peer.m_instance, sz)) throw win_runtime_error("GetModuleFileName failed.");
+        sprintf(sz2, _T("@%s,-1"), sz.c_str());
+        set_value(key_method, _T("PeerDllPath")     , sz);
+        set_value(key_method, _T("PeerFriendlyName"), sz2);
+        set_value(key_method, _T("Properties")      , (DWORD)389871807);
+
+        return S_OK;
+    } catch(win_runtime_error &err) {
+        OutputDebugStr(_T("%hs (error %u)\n"), err.what(), err.number());
+        return E_FAIL;
+    } catch(...) {
+        OutputDebugStr(_T("Registering DLL failed.\n"));
+        return E_FAIL;
+    }
+}
+
+
+///
+/// Unregisters method from EapHost registry
+///
+/// \returns Always S_OK
+///
+STDAPI DllUnregisterServer()
+{
+    try {
+        tstring sz;
+        reg_key key_methods;
+        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_READ, key_methods);
+        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        sprintf(sz, _T("%u\\%u"), EAPMETHOD_AUTHOR_ID, EAPMETHOD_TYPE);
+        if (!key_methods.delete_subkey(sz.c_str())) throw win_runtime_error();
+    } catch(...) {}
+    return S_OK;
+}

EAPMethods/Register_UI.cpp

@@ -0,0 +1,90 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2020-2022 Amebis
+    Copyright © 2016 GÉANT
+*/
+
+#include "PCH_UI.h"
+
+using namespace std;
+using namespace winstd;
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ LPCTSTR sValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_SZ, reinterpret_cast<LPCBYTE>(sValue), (DWORD)((_tcslen(sValue) + 1) * sizeof(tstring::value_type)));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ const tstring &sValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_SZ, reinterpret_cast<LPCBYTE>(sValue.c_str()), (DWORD)((sValue.length() + 1) * sizeof(tstring::value_type)));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+static void set_value(_In_ HKEY hKey, _In_opt_z_ LPCTSTR lpValueName, _In_ DWORD dwValue)
+{
+    LSTATUS s = RegSetValueEx(hKey, lpValueName, 0, REG_DWORD, reinterpret_cast<LPCBYTE>(&dwValue), sizeof(dwValue));
+    if (s != ERROR_SUCCESS)
+        throw win_runtime_error(s, "RegSetValueEx failed.");
+}
+
+
+///
+/// Registers method UI in EapHost registry
+///
+/// \returns S_OK if successful; E_FAIL otherwise
+///
+STDAPI DllRegisterServer()
+{
+    try {
+        tstring sz;
+        reg_key key_methods, key_author, key_method;
+        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_CREATE_SUB_KEY, key_methods);
+        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        sprintf(sz, _T("%u"), EAPMETHOD_AUTHOR_ID);
+        s = RegCreateKeyEx(key_methods, sz.c_str(), NULL, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, key_author, NULL);
+        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        set_value(key_author, NULL, _T(PRODUCT_NAME_STR));
+        sprintf(sz, _T("%u"), EAPMETHOD_TYPE);
+        s = RegCreateKeyEx(key_author, sz.c_str(), NULL, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, key_method, NULL);
+        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        if (!GetModuleFileName(g_peer.m_instance, sz)) throw win_runtime_error("GetModuleFileName failed.");
+        set_value(key_method, _T("PeerConfigUIPath")        , sz);
+        set_value(key_method, _T("PeerIdentityPath")        , sz);
+        set_value(key_method, _T("PeerInteractiveUIPath")   , sz);
+        set_value(key_method, _T("PeerInvokePasswordDialog"), (DWORD)0);
+        set_value(key_method, _T("PeerInvokeUsernameDialog"), (DWORD)0);
+
+        return S_OK;
+    } catch(win_runtime_error &err) {
+        OutputDebugStr(_T("%hs (error %u)\n"), err.what(), err.number());
+        return E_FAIL;
+    } catch(...) {
+        OutputDebugStr(_T("Registering DLL failed.\n"));
+        return E_FAIL;
+    }
+}
+
+
+///
+/// Unregisters method UI from EapHost registry
+///
+/// \returns Always S_OK
+///
+STDAPI DllUnregisterServer()
+{
+    try {
+        tstring sz;
+        reg_key key_methods;
+        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods"), 0, KEY_READ, key_methods);
+        if (s != ERROR_SUCCESS) throw win_runtime_error(s);
+        sprintf(sz, _T("%u\\%u"), EAPMETHOD_AUTHOR_ID, EAPMETHOD_TYPE);
+        key_methods.delete_subkey(sz.c_str());
+    } catch(...) {}
+    return S_OK;
+}

EAPMethods/locale/EAPMethods.pot

@@ -2,14 +2,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+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 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
@@ -22,71 +22,71 @@ msgstr ""
 "X-Poedit-SearchPath-6: lib/TTLS_UI\n"
 "X-Poedit-SearchPath-7: EAPMethods\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid "Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr ""
 
@@ -118,217 +118,201 @@ msgstr ""
 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"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 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:258
 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:268
+msgid "Use from &profile configuration:"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
+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:276
+msgid "Profile configuration credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
 msgid "&Clear Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
 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:294
 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:295
 msgid "Click here to set or modify your credentials"
 msgstr ""
 
-#: 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 ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
-msgid "Profile configuration credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 msgid "User ID and Password"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 msgid "Please provide your user ID."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
 msgid "Your Organization"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 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:464
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:550
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 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:568
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 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:632
 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:635
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 msgid "Omit my user name and use @mydomain.org only"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr ""
 
@@ -525,7 +509,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr ""
 
@@ -545,32 +529,40 @@ msgstr ""
 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
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:329
 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:330
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:331
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr ""
 
@@ -595,17 +587,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr ""
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr ""

EAPMethods/locale/ca_ES.po

@@ -1,13 +1,14 @@
+# 
 # Translators:
 # eduki <ecercos@xtec.cat>, 2018
-# jmontane, 2019
+# Joan Montané, 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"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n"
@@ -16,7 +17,7 @@ msgstr ""
 "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 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -29,31 +30,31 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, 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
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Alerta"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "Credencials EAP"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Ajustos del proveidor"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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)"
@@ -61,43 +62,43 @@ 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, 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
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(error %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(ID buit)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Recordar"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr "Marqueu si voleu desar les credencials"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(La vostra organització)"
 
@@ -130,11 +131,11 @@ msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
 "Selecciona la font on es desen les credencials de connexió utilitzades"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Utilitzar del Credential &Manager: "
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -142,40 +143,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:258
 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
-msgid "&Clear Credentials"
-msgstr "&Esborra les credencials"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Utilitzeu de la configuració del vostre &perfil:"
 
-#: 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 ""
-"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
-msgid "&Set Credentials..."
-msgstr "&Desa les credencials..."
-
-#: 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 "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:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -183,49 +160,69 @@ 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:276
 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:289
+msgid "&Clear Credentials"
+msgstr "&Esborra les credencials"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+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:294
+msgid "&Set Credentials..."
+msgstr "&Desa les credencials..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+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:332
 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:342
 msgid "Please provide your user ID and password."
 msgstr "Introduïu 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 "Introduïu 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:361
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Introduïu la vostra contrasenya aquí"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "ID d'usuari"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 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:446
 msgid "Your Organization"
 msgstr "La vostra organització"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -233,54 +230,42 @@ 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:464
 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:469
 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:473
 msgid "(Keep it short, please)"
 msgstr "(Sigueu breu)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 msgid "Helpdesk contact &information:"
 msgstr "Contacte d'ajuda i &informació:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "Adreça web del centre de suport"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "Adreça de correu del centre de suport"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 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:550
 msgid "Provider Unique Identifier"
 msgstr "Identificador únic del proveidor"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -288,33 +273,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:568
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "&Identificador únic del proveidor:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr "Bloqueig de configuració"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -322,7 +307,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:632
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -330,53 +315,53 @@ 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:635
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
-msgstr ""
+msgstr "Identitat:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "Identitat &real"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Utitlitza el meu usuari real"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
-msgstr ""
+msgstr "Utilitza una identitat &buida"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
-msgstr ""
+msgstr "Personalitza la &identitat:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
-msgstr ""
+msgstr "Especifiqueu la identitat personalitzada"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
-msgstr ""
+msgstr "Identitat a utilitzar:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Configuració de la connexió EAP"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "Proveïdor d'Identitat EAP"
 
@@ -596,7 +581,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Certificat d'usuari"
 
@@ -620,32 +605,40 @@ 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
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Conflicte de validació"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Afegeix un certificat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 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:329
 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:330
 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:331
 msgid "All Files (*.*)"
 msgstr "Tots els fitxers (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Error"
 
@@ -671,17 +664,17 @@ 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
+msgid "Outer Authentication"
+msgstr "Autenticació externa"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Autenticació interna"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 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
-msgid "Outer Authentication"
-msgstr "Autenticació externa"
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"
@@ -712,7 +705,7 @@ msgstr "EAP-TTLS"
 #: 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 ""
+msgstr "Mètode EAP-TTLS"
 
 #: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4

EAPMethods/locale/de_DE.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # 
@@ -5,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n"
@@ -14,7 +15,7 @@ msgstr ""
 "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 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -27,7 +28,7 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
@@ -35,24 +36,24 @@ 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
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Warnung"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "EAP Nutzerdaten"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Identitätsprovider Einstellungen"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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)"
@@ -60,43 +61,43 @@ 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr "Löschen der Nutzerdaten fehlgeschlagen (Fehler %u)."
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr "(keine)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(Fehler %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(leere ID)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Speichern"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(Ihre Organisation)"
 
@@ -128,11 +129,11 @@ msgstr "Öffnet den Dialog mit den Einstellungen für den Anbieter"
 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 ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Verwende aus dem Schlüsselbund"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -140,19 +141,31 @@ 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:258
 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:268
+msgid "Use from &profile configuration:"
+msgstr "Verwende aus der &Profilkonfiguration:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
+msgid ""
+"Select this option if you would like to store credentials as a part of  "
+"profile configuration"
+msgstr ""
+"Wählren Sie diese Option, wenn sie ihre Anmeldedaten als Teil der "
+"Profilkonfiguration speichern wollen"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Profile configuration credentials"
+msgstr "Profilkonfiguration"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
 msgid "&Clear Credentials"
 msgstr "Nutzerdaten &löschen"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:273
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
@@ -161,69 +174,53 @@ 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:294
 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:295
 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:289
-msgid ""
-"Select this option if you would like to store credentials as a part of  "
-"profile configuration"
-msgstr ""
-"Wählren Sie diese Option, wenn sie ihre Anmeldedaten als Teil der "
-"Profilkonfiguration speichern wollen"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
-msgid "Profile configuration credentials"
-msgstr "Profilkonfiguration"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 msgid "User ID and Password"
 msgstr "Benutzername und Passwort"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Passwort:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Geben Sie hier Ihr Passwort ein"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "Benutzername"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 msgid "Please provide your user ID."
-msgstr ""
+msgstr "Bitte geben Sie Ihren Benutzernamen ein."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
 msgid "Your Organization"
 msgstr "Ihre Organisation"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -232,54 +229,42 @@ 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:464
 msgid "Your organization &name:"
 msgstr "&Name der Organisation:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 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:483
 msgid "Helpdesk contact &information:"
 msgstr "&Hilfe und Kontaktmöglichkeiten:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "Webseite für Hilfe und Kontakt"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "E-Mail Adresse für Hilfe und Kontakt"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 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:550
 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:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -287,33 +272,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:568
 msgid "&Namespace:"
 msgstr "Namens&raum:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "&Identifikation im Namensraum:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr "Konfiguration sperren"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -322,7 +307,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:632
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -330,56 +315,57 @@ 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:635
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
-msgstr ""
+msgstr "Identität"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "Echten Nutzernamen &verwenden"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
-msgstr ""
+msgstr "L&eeren Identität verwenden"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
-msgstr ""
+msgstr "Abwei&chender Identität:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr ""
+"Im unverschlüsselten Teil einen selbst festgelegte Identität verwenden"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
-msgstr ""
+msgstr "Zu verwendender Identität"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "EAP Verbindungseinstellungen"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "EAP Identitätsprovider"
 
@@ -524,7 +510,7 @@ msgstr ""
 
 #: lib/GTC_UI/src/GTC_UI.cpp:41
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
 #: lib/GTC_UI/src/GTC_UI.cpp:119
 #, c-format
@@ -546,6 +532,8 @@ msgstr "Vertrauenseinstellungen: Server"
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
 msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
 msgstr ""
+"Definieren Sie welche Server vertrauenswürdig sind um der Man-in-the-Middle "
+"Angriffe zu verhindern."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -602,7 +590,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Benutzerzertifikat"
 
@@ -627,32 +615,40 @@ 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
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Fehler bei der Validierung"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Zertifikat hinzufügen"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 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:329
 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:330
 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:331
 msgid "All Files (*.*)"
 msgstr "Alle Dateien (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Fehler"
 
@@ -678,18 +674,18 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Unverschlüsselte Anmeldungsphase"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Verschlüsselte Anmeldungsphase"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 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
 msgid "PAP"
 msgstr "PAP"
@@ -720,7 +716,7 @@ msgstr "EAP-TTLS"
 #: 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 ""
+msgstr "EAP-TTLS Methode"
 
 #: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4

EAPMethods/locale/el_GR.po

@@ -1,23 +1,23 @@
+# 
 # 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
+# Simon Rozman <simon@rozman.si>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Halil Adem <hadem@noc.grnet.gr>, 2020\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\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 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -30,7 +30,7 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
@@ -38,24 +38,24 @@ msgstr ""
 "Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %s από τη "
 "διαμόρφωση;"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "Διαπιστευτήρια EAP"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Ρυθμίσεις παρόχων"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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)"
@@ -63,43 +63,43 @@ msgstr ""
 "Σφάλμα κατά την εγγραφή των διαπιστευτηρίων στο Credential Manager: %hs "
 "(σφάλμα %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
+#: lib/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr "Η διαγραφή των διαπιστευτηρίων απέτυχε (σφάλμα %u)."
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr "(κανένα)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(σφάλμα %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(κενό ID)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Υπενθύμιση"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr "Ελέγξτε αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(Ο Φορέας σας)"
 
@@ -133,11 +133,11 @@ msgstr ""
 "Επιλέξτε την πηγή όπου είναι αποθηκευμένα τα διαπιστευτήριά σας που "
 "χρησιμοποιείται για τη σύνδεση."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από τον Credential &Manager"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από τον Credential &Manager:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -145,41 +145,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:258
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 "Τα παρόντα διαπιστευτήρια είναι αποθηκευμένα στο Windows Credential Manager"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-msgid "&Clear Credentials"
-msgstr "&Καθαρίσμος διαπιστευτηρίων"
-
-#: 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 ""
-"Επιλέξτε να καθαρίσετε τα διαπιστευτήρια σας από τον Credential Manager\n"
-"Σημείωση: Θα σας ζητηθεί να εισαγάγετε τις πιστοποιήσεις σας κατά τη σύνδεση."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
-msgid "&Set Credentials..."
-msgstr "&Ρυθμίση των διαπιστευτηρίων..."
-
-#: 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 ""
-"Κάντε κλικ εδώ για να ρυθμίσετε ή να τροποποιήσετε τα διαπιστευτήριά σας"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
 msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από το &προφίλ ρύθμισης παραμέτρων:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -187,47 +162,68 @@ msgstr ""
 "Επιλέξτε αυτήν την επιλογή αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια ως "
 "μέρος της διαμόρφωσης προφίλ"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Profile configuration credentials"
 msgstr "Προφίλ ρύθμισης διαπιστευτηρίων"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "&Καθαρίσμος διαπιστευτηρίων"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+msgstr ""
+"Επιλέξτε να καθαρίσετε τα διαπιστευτήρια σας από τον Credential Manager\n"
+"Σημείωση: Θα σας ζητηθεί να εισαγάγετε τις πιστοποιήσεις σας κατά τη σύνδεση."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:294
+msgid "&Set Credentials..."
+msgstr "&Ρυθμίση των διαπιστευτηρίων..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+msgid "Click here to set or modify your credentials"
+msgstr ""
+"Κάντε κλικ εδώ για να ρυθμίσετε ή να τροποποιήσετε τα διαπιστευτήριά σας"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 msgid "User ID and Password"
 msgstr "ID χρήστη και κωδικός πρόσβασης"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Κωδικός Πρόσβασης:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Εισάγετε τον κωδικό πρόσβασης σας εδώ"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "ID Χρήστη"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 msgid "Please provide your user ID."
 msgstr "Παρακαλείσθε να δώσετε το όνομα χρήστη"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
 msgid "Your Organization"
 msgstr "Ο Φορέας σας"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -236,54 +232,42 @@ msgstr ""
 "παρουσιάζεται ο φορέας, οι τελικοί χρήστες κατανοούν πιο εύκολα τα μηνύματα "
 "των προγραμμάτων και τις ενέργειές τους."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:464
 msgid "Your organization &name:"
 msgstr "Το όνομα &του Φορέα σας:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 msgid "(Keep it short, please)"
 msgstr "(Παρακαλώ, περιοριστείτε)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 msgid "Helpdesk contact &information:"
 msgstr "Πληροφορίες& επικοινωνίας Helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "H διεύθυνση της ιστοσελίδας του Helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "Tο e-mail του Helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "Your helpdesk phone number"
 msgstr "Ο αριθμός τηλεφώνου του Helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:550
 msgid "Provider Unique Identifier"
 msgstr "Πάροχος Μοναδικoύ Αναγνωριστικού"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -291,33 +275,33 @@ msgstr ""
 "Αναθέστε στον φορέα σας ένα μοναδικό αναγνωριστικό για να επιτρέπεται να "
 "μοιράζεται τα ίδια διαπιστευτήρια σε διαφορετικά προφίλ του δικτύου."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "&Namespace:"
 msgstr "&Περιοχή:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "Πάροχος μοναδικού &αναγνωριστικού:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr "Διαμόρφωση κλειδώματος"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -326,7 +310,7 @@ msgstr ""
 "αλλαγές από τους τελικούς χρήστες. Στους  χρήστες θα επιτρέπεται μόνο να "
 "εισαγουν τα διαπιστευτήρια."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:632
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -334,56 +318,56 @@ msgstr ""
 "&Αποκλεισμός αυτής της διαμόρφωσης και αποτρέψτε οποιαδήποτε περαιτέρω "
 "τροποποίηση μέσω της διεπαφής χρήστη."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:635
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Προσοχή: Μόλις κλειδωθεί, δεν μπορείτε να το επαναφέρετε χρησιμοποιώντας "
 "αυτό το διάλογο!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
 msgstr "Ταυτότητα"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 "Επιλέξτε το αιτούμενο αναγνωριστικό χρήστη να εισάγει τον εαυτο του ως  "
 "πιστοποιητικό:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "&Επαληθευμένη Ταυτότητα"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Χρησιμοποιήσε το αληθινό όνομα χρήστη μου"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
 msgstr "Χρησιμοποιήστε &κενή ταυτότητα"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 msgid "Omit my user name and use @mydomain.org only"
 msgstr ""
 "Παραλείψτε το όνομα χρήστη μου και χρησιμοποιήστε μόνο το @mydomain.org"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
 msgstr "&Προσαρμοσμένη ταυτότητα:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr "Καθορίστε τη διαμόρφωση της ταυτότητας"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
 msgstr "Χρήση της προσαρμοσμένης ταυτότητας"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Διαμόρφωση σύνδεσης EAP"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "Πάροχος υπηρεσιών EAP"
 
@@ -612,7 +596,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Πιστοποιητικό χρήστη"
 
@@ -639,32 +623,40 @@ msgstr ""
 "Η ταυτότητά σας (username@domain) για να παρακάμψετε ένα πιστοποιητικό· ή "
 "κενό για να χρησιμοποιήσετε όποια ταυτότητα παρέχεται από πιστοποιητικό"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Πρόβλημα επικύρωσης"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Προσθήκη Πιστοποιητικού"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 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:329
 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:330
 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:331
 msgid "All Files (*.*)"
 msgstr "Όλα τα αρχεία (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -690,17 +682,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Η επίκληση της διαδραστικότητας του EAP UI απέτυχε (error %u)."
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Ταυτοποίηση εξωτερικής ταυτότητας"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Ταυτοποίηση εσωτερικής ταυτότητας"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr "Επιλέξτε την μέθοδο ταυτοποίησης εσωτερικής ταυτότητας από τη λίστα"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Ταυτοποίηση εξωτερικής ταυτότητας"
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"

EAPMethods/locale/es_ES.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # Alberto Martínez Setién, 2020
@@ -6,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Alberto Martínez Setién, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n"
@@ -14,8 +15,8 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -28,7 +29,7 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
@@ -36,67 +37,67 @@ msgstr ""
 "¿está seguro de que quiere borrar permanentemente la configuración del "
 "proveedor %s?"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Advertencia"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "Credenciales EAP"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Configuración del proveedor"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr "Fallo al borrar credenciales (error %u)."
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr "(ninguno)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(error %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(ID en blanco)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Recordar"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr "Marca si quieres guardar las credenciales"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(Su organización)"
 
@@ -129,11 +130,11 @@ 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"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Usar desde el &Administrador de Credenciales:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -141,41 +142,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:258
 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
-msgid "&Clear Credentials"
-msgstr "&Limpiar Credenciales"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Usar desde la configuración del &perfil:"
 
-#: 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 ""
-"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
-msgid "&Set Credentials..."
-msgstr "&Establecer Credenciales..."
-
-#: 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 "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:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -183,49 +160,69 @@ 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:276
 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:289
+msgid "&Clear Credentials"
+msgstr "&Limpiar Credenciales"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+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:294
+msgid "&Set Credentials..."
+msgstr "&Establecer Credenciales..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+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:332
 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:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Introduzca su contraseña aquí"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "ID de usuario"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 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:446
 msgid "Your Organization"
 msgstr "Su organización"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -234,54 +231,42 @@ 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:464
 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:469
 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:473
 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:483
 msgid "Helpdesk contact &information:"
 msgstr "&Información de contacto de soporte:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "La dirección web para ofrecer soporte"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "La dirección de correo para soporte"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 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:550
 msgid "Provider Unique Identifier"
 msgstr "Identificador único del proveedor"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -289,33 +274,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:568
 msgid "&Namespace:"
 msgstr "&Espacio de nombres:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "&Identificador único de proveedor:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr "Bloqueo de configuración"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -324,7 +309,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:632
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -332,55 +317,55 @@ 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:635
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
 msgstr "Identidad"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "Identidad &Real"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Usar mi nombre de usuario real"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
 msgstr "Usar una identidad &vacía"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
 msgstr "Identidad &personalizada:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr "Especificar identidad personalizada"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
 msgstr "Identidad personalizada a usar"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Configuración de conexiones EAP"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "Proveedor de identidad EAP"
 
@@ -606,7 +591,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Certificado de usuario"
 
@@ -630,32 +615,40 @@ 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
+msgid "No certificate selected"
+msgstr "Ningún certificado seleccionado"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Conflicto de validación"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Añadir Certificado"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 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:329
 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:330
 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:331
 msgid "All Files (*.*)"
 msgstr "Todos los ficheros (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Error"
 
@@ -682,17 +675,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Fallo al lanzar la interfaz de usuario interactiva EAP (error %u)."
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Autenticación externa"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Autenticación interna"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 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
-msgid "Outer Authentication"
-msgstr "Autenticación externa"
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"

EAPMethods/locale/et_EE.po

@@ -1,22 +1,23 @@
+# 
 # Translators:
 # Indrek Rokk <indrek.rokk@eenet.ee>, 2018
-# Anne M <anne@eenet.ee>, 2019
 # Simon Rozman <simon@rozman.si>, 2020
+# Anne M <anne@eenet.ee>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"Last-Translator: Anne M <anne@eenet.ee>, 2021\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-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -29,7 +30,7 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
@@ -37,24 +38,24 @@ msgstr ""
 "Kas oled kindel, et soovid %s teenusepakkuja seadistusest püsivalt "
 "eemaldada?"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "EAP kasutajakonto"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Teenusepakkuja seadistused"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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)"
@@ -62,43 +63,43 @@ 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr "Kasutajakonto andmete kustutamine ebaõnnestus (viga %u)."
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr "(ei midagi)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(viga %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(tühi ID)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Jäta meelde"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr "Linnuta, kui soovid kasutajakonto andmeid salvestada"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(Sinu asutus)"
 
@@ -132,11 +133,11 @@ 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:250
+msgid "Use from Credential &Manager:"
+msgstr "Kasuta andmeid kasutajakontode hal&durist (Credential Manager):"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -144,41 +145,17 @@ 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:258
 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:268
+msgid "Use from &profile configuration:"
+msgstr "Kasuta andmeid &profiili seadistusest:"
 
-#: 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -186,47 +163,67 @@ msgstr ""
 "Vali see võimalus, kui soovid salvestada kasutajakonto andmed profiili "
 "seadistustesse."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Profile configuration credentials"
 msgstr "Profiili seadistuse kasutajaandmed"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "&Kustuta kasutajakonto andmed"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+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:294
+msgid "&Set Credentials..."
+msgstr "&Määra kasutajakonto andmed..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+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:332
 msgid "User ID and Password"
 msgstr "Kasutaja ID ja parool"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 msgid "User ID:"
 msgstr "Kasutaja ID:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:361
 msgid "Password:"
 msgstr "Parool:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Sisesta siin oma parool"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "Kasutaja ID"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 msgid "Please provide your user ID."
 msgstr "Palun sisesta oma kasutaja ID (kasutajanimi)."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
 msgid "Your Organization"
 msgstr "Sinu asutus"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -235,53 +232,41 @@ msgstr ""
 "kirjeldatud, on lõppkasutajatel lihtsam programmi sõnumeid mõista ja neist "
 "juhinduda."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:464
 msgid "Your organization &name:"
 msgstr "Sinu asutuse &nimi:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
 msgid "(Keep it short, please)"
 msgstr "(Palun kirjuta lühidalt)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "Your helpdesk phone number"
 msgstr "Sinu kasutajatoe telefoninumber"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:550
 msgid "Provider Unique Identifier"
 msgstr "Teenusepakkuja unikaalne identifikaator"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -289,31 +274,31 @@ msgstr ""
 "Määra oma asutusele unikaalne ID, et samu kontoandmeid saaks kasutada "
 "erinevatel võrguprofiilidel."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "&Namespace:"
 msgstr "&Nimeruum:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "Teenusepakkuja unikaalne &identifikaator:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:614
 msgid "Configuration Lock"
 msgstr "Seadistuslukk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -321,60 +306,60 @@ msgstr ""
 "Seadistuslukk ei lase lõppkasutajatel kogemata muudatusi teha. Kasutajad "
 "saavad ainult kasutajakontoandmeid sisestada."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:632
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:635
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
-msgstr ""
+msgstr "Identiteet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "&Tõene identiteet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Kasuta mu tõest kasutajanime"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
-msgstr ""
+msgstr "Kasuta t&ühja identiteeti"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
-msgstr ""
+msgstr "Kohandatud &identiteet:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
-msgstr ""
+msgstr "Määra kohandatud identiteet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
-msgstr ""
+msgstr "Kohandatud identiteet kasutamiseks"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "EAP ühenduse seadistus"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "EAP identiteedipakkuja"
 
@@ -536,7 +521,7 @@ 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 ""
+msgstr "Loetle serverid, mida usaldad vahendusrünnete tõrjumiseks."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -591,7 +576,7 @@ msgstr ""
 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
+#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Kasutaja sertifikaat"
 
@@ -615,32 +600,40 @@ 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
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "No certificate selected"
+msgstr "Sertifikaati ei ole valitud"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Valideerimiskonflikt"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Lisa sertifikaat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "Sertifikaadi failid (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:329
 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
+#: lib/TLS_UI/src/TLS_UI.cpp:330
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "PKCS #7 sertifikaadi failid (*.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:331
 msgid "All Files (*.*)"
 msgstr "Kõik failid (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "Vigane või mittetoetatud sertifikaadifail %s"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 msgid "Error"
 msgstr "Viga"
 
@@ -665,17 +658,17 @@ 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 "Outer Authentication"
+msgstr "Väline autentimine"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Sisemine autentimine"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 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"
@@ -706,7 +699,7 @@ msgstr "EAP-TTLS"
 #: 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 ""
+msgstr "EAP-TTLS meetod"
 
 #: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4

EAPMethods/locale/hr_HR.po

@@ -1,21 +1,22 @@
+# 
 # Translators:
-# Dubravko Penezic <dpenezic@gmail.com>, 2018
 # Simon Rozman <simon@rozman.si>, 2020
+# Dubravko Penezic <dpenezic@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"Last-Translator: Dubravko Penezic <dpenezic@gmail.com>, 2022\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 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -28,7 +29,7 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
@@ -36,24 +37,24 @@ msgstr ""
 "Da li ste sigurni da želite za stalno opbrisati davatelja usluge %s iz "
 "konfiguracije ? "
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "EAP korisničke oznake"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Postavke davatelja usluge"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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)"
@@ -61,43 +62,43 @@ 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, 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
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr "(bez)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(greška %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(prazni ID)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Podsjeti"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr "Provjerite želite li spremiti vjerodajnice"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(Vaša organizacija)"
 
@@ -130,11 +131,11 @@ 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"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Upotrijebite iz Upravitelja vjerodajni&ca:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -142,39 +143,15 @@ 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:258
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr "Vaše vjerodajnice pohranjene u Windows upravitelju vjerodajnica"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-msgid "&Clear Credentials"
-msgstr "&Izbriši vjerodajnice"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Upotrijebite iz konfiguracije &profila:"
 
-#: 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 ""
-"Odaberi kako bi se obrisali korisnički podaci u Upravitelju vjerodajnica.\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
-msgid "&Set Credentials..."
-msgstr "&Postavi korisničke podatke..."
-
-#: 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 "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:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -182,47 +159,67 @@ 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:276
 msgid "Profile configuration credentials"
 msgstr "Potvrde o konfiguraciji profila"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "&Izbriši vjerodajnice"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+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"
+"Opaska: Biti će te pitani za korisničke podatke po spajanju."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:294
+msgid "&Set Credentials..."
+msgstr "&Postavi korisničke podatke..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+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:332
 msgid "User ID and Password"
 msgstr "Korisnički ID i lozinka"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Unesi svoju lozinku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "Korisnička oznaka"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 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:446
 msgid "Your Organization"
 msgstr "Vaša ustanova"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -231,52 +228,40 @@ 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:464
 msgid "Your organization &name:"
 msgstr "Ime vaše &ustanove:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 msgid "(Keep it short, please)"
 msgstr "(Ukratko, molim)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 msgid "Helpdesk contact &information:"
 msgstr "Kontakt &podaci helpdesk-a:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "Web adresa vašeg helpdesk-a"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "E-mail adresa vašeg helpdesk-a"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 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:550
 msgid "Provider Unique Identifier"
 msgstr "Jedinstveni identifikator davatelja usluge"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -284,31 +269,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:568
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "Davatelj jedinstvene &identifikacije:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr "Zaključaj posatvke"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -316,7 +301,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:632
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -324,54 +309,54 @@ 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:635
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
 msgstr "Identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "&Stvarna korisnička oznaka"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Koristi moju stvarnu korisničku oznaku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
 msgstr "Koristi &prazan identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
 msgstr "Samostalno odabrani &identitet:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr "Specijalni identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
 msgstr "Samostalno odabrani identitet koji će se koristiti"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Parametri EAP konekcije"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "Davatelj EAP identiteta"
 
@@ -589,7 +574,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Korisnički certifikat"
 
@@ -613,32 +598,40 @@ 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
+msgid "No certificate selected"
+msgstr "Nije odabran certifikat"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Problem s provjerom"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Dodaj certifikat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 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:329
 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:330
 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:331
 msgid "All Files (*.*)"
 msgstr "Sve datoteke (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Greška"
 
@@ -663,17 +656,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Pokretanje EAP interaktivnog korisničkog sučelja nije uspjelo."
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Vanjska autentikacija"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Unutrašnja autentikacija"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr "Odaberi unutrašnji autentikacijski mehanizam s liste"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Vanjska autentikacija"
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"

EAPMethods/locale/hu_HU.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # 
@@ -5,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Hungarian (https://www.transifex.com/eduroam_devel/teams/11799/hu/)\n"
@@ -14,7 +15,7 @@ msgstr ""
 "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 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -27,72 +28,72 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr ""
 
@@ -124,230 +125,214 @@ msgstr ""
 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"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 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:258
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-msgid "&Clear Credentials"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
 msgstr ""
 
-#: 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 ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
-msgid "&Set Credentials..."
-msgstr ""
-
-#: 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 ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 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:276
 msgid "Profile configuration credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+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:294
+msgid "&Set Credentials..."
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+msgid "Click here to set or modify your credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 msgid "User ID and Password"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 msgid "Please provide your user ID."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
 msgid "Your Organization"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 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:464
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:550
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 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:568
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 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:632
 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:635
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 msgid "Omit my user name and use @mydomain.org only"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr ""
 
@@ -554,7 +539,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr ""
 
@@ -576,32 +561,40 @@ msgid ""
 "to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:329
 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:330
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:331
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr ""
 
@@ -626,17 +619,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr ""
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"

EAPMethods/locale/it_IT.po

@@ -1,21 +1,23 @@
+# 
 # Translators:
 # Daniele Albrizio <daniele@albrizio.it>, 2018
 # Simon Rozman <simon@rozman.si>, 2020
+# Daniele Albrizio <dalbrizio@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"Last-Translator: Daniele Albrizio <dalbrizio@gmail.com>, 2022\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/eduroam_devel/teams/11799/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -28,7 +30,7 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
@@ -36,24 +38,24 @@ msgstr ""
 "Sei sicuro di voler rimuovere definitivamente il provider %s dalla "
 "configurazione?"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Attenzione"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "Credenziali EAP"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Impostazioni del provider"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
 #, c-format
 msgid "%s User Credentials"
 msgstr "Credenziali utente %s"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196
+#: lib/EAPBase_UI/include/EAP_UI.h:866 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)"
@@ -61,45 +63,45 @@ msgstr ""
 "Errore durante la scrittura delle credenziali nel Credential Manager: %hs "
 "(errore %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198
+#: lib/EAPBase_UI/include/EAP_UI.h:869 lib/TTLS_UI/src/Module.cpp:198
 #: lib/TTLS_UI/src/Module.cpp:307
 msgid "Writing credentials failed."
 msgstr "Scrittura delle credenziali non riuscita."
 
-#: lib/EAPBase_UI/include/EAP_UI.h:899
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr "Cancellazione delle credenziali non riuscita (errore %u)."
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr "(nessuno)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
-msgstr ""
+msgstr "(errore %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 msgid "(error)"
-msgstr ""
+msgstr "(errore)"
 
-#: 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
-msgstr ""
+msgstr "(ID vuoto)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Ricorda"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr "Smarca se desideri salvare le credenziali"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
-msgstr ""
+msgstr "(La tua organizzazione)"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
@@ -131,11 +133,11 @@ msgstr ""
 "Seleziona l'origine in cui sono archiviate le credenziali utilizzate per la "
 "connessione."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
-msgid "Use from Credential &Manager"
-msgstr ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Utilizza dal Credential &Manager:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -143,39 +145,15 @@ msgstr ""
 "Selezionare questa opzione se si desidera utilizzare le credenziali "
 "memorizzate in Gestione Credenziali di Windows"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 lib/EAPBase_UI/res/wxEAP_UI.cpp:299
-msgid "Identity:"
-msgstr "Identità:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:258
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr "Le tue credenziali attuali memorizzate in Windows Credential Manager"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-msgid "&Clear Credentials"
-msgstr "&Cancella credenziali"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Utilizza da &configurazione profilo:"
 
-#: 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 ""
-"Clicca per cancellare le tue credenziali dal Credential Manager.\n"
-"Nota: ti verrà richiesto di inserire le credenziali al momento della connessione."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
-msgid "&Set Credentials..."
-msgstr "&Imposta credenziali..."
-
-#: 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 "Clicca qui per impostare o modificare le tue credenziali"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -183,48 +161,68 @@ msgstr ""
 "Selezionare questa opzione se desideri memorizzare le credenziali come parte"
 " della configurazione del profilo"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:306
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Profile configuration credentials"
 msgstr "Credenziali per la configurazione del profilo"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "&Cancella credenziali"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+msgstr ""
+"Clicca per cancellare le tue credenziali dal Credential Manager.\n"
+"Nota: ti verrà richiesto di inserire le credenziali al momento della connessione."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:294
+msgid "&Set Credentials..."
+msgstr "&Imposta credenziali..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+msgid "Click here to set or modify your credentials"
+msgstr "Clicca qui per impostare o modificare le tue credenziali"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 msgid "User ID and Password"
 msgstr "ID utente e password"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 msgid "Please provide your user ID and password."
 msgstr "Si prega di fornire l'ID utente e la password."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 msgid "User ID:"
 msgstr "Udser ID"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 "Inserisci qui il tuo nome utente (utente@dominio.org, DOMINIO\\Utente, ecc.)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:361
 msgid "Password:"
 msgstr "Password"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Inserisci la tua password qui"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "ID utente"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 msgid "Please provide your user ID."
 msgstr "Si prega di fornire il proprio ID utente."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
 msgid "Your Organization"
 msgstr "La tua organizzazione"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -233,54 +231,42 @@ msgstr ""
 "Quando viene introdotta l'organizzazione, gli utenti finali trovano i "
 "messaggi del programma più facili da comprendere e da interpretare."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:491
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:464
 msgid "Your organization &name:"
 msgstr "&Nome della tua organizzazione:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
 "Il nome della tua organizzazione come apparirà sulle notifiche di contatto "
 "dell'helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
 msgid "(Keep it short, please)"
 msgstr "(Mantienilo breve, per favore)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 msgid "Helpdesk contact &information:"
 msgstr "Contatto &informazioni di helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "Indirizzo del sito web del tuo helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "Indirizzo e-mail del tuo helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "Your helpdesk phone number"
 msgstr "Numero di telefono del tuo helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:550
 msgid "Provider Unique Identifier"
 msgstr "Identificativo univoco del provider"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -288,33 +274,33 @@ msgstr ""
 "Assegna alla tua organizzazione un ID univoco per consentire la condivisione"
 " dello stesso set di credenziali tra diversi profili di rete."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:595
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "&Namespace:"
 msgstr "&Namespace"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "&Identificativo univoco del provider:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
 "Il tuo ID di organizzazione per assegnare le stesse credenziali da altri "
 "profili"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:641
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:614
 msgid "Configuration Lock"
 msgstr "Blocco della configurazione"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -323,7 +309,7 @@ msgstr ""
 " da parte degli utenti finali. Gli utenti saranno autorizzati solamente ad "
 "inserire le credenziali."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:659
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:632
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -331,53 +317,54 @@ msgstr ""
 "&Blocca questa configurazione e impedisce ulteriori modifiche tramite "
 "l'interfaccia utente."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:662
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:635
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 "(Attenzione: una volta bloccato, non è possibile annullare l'uso di questa "
 "finestra di dialogo!)"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
-msgstr ""
+msgstr "Identità"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
+"Seleziona l'ID utente con cui il supplicant si presenta all'autenticatore:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "&Vera identità"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Usa il mio vero nome utente"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
-msgstr ""
+msgstr "Usa una identità &vuota"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 msgid "Omit my user name and use @mydomain.org only"
 msgstr "Ometti il mio nome utente e usa solo @mydomain.org"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
-msgstr ""
+msgstr "&Identità personalizzata:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
-msgstr ""
+msgstr "Specifica l'identità personalizzata"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
-msgstr ""
+msgstr "Identità personalizzata da usare"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Configurazione della connessione EAP"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "Identity Provider EAP"
 
@@ -543,6 +530,7 @@ msgstr "Fiducia nel Server"
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
 msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
 msgstr ""
+"Descrivi i server di cui ti fidi per prevenire attacchi man-in-the-middle."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -599,7 +587,7 @@ msgstr ""
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr "(Esempio: 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Certificato utente"
 
@@ -623,32 +611,40 @@ msgstr ""
 "La tua identità (nomeutente@dominio) per sovrascriverne quella del "
 "certificato; o vuoto per utilizzare quella fornita nel certificato"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "No certificate selected"
+msgstr "Nessun certificato selezionato "
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Conflitto durante la validazione"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Aggiungi certificato"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr "File di certificato (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:329
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr "File di certificato X.509 (*.cer;*.crt;*.der;*.pem)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:259
+#: lib/TLS_UI/src/TLS_UI.cpp:330
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr "File di certificato PKCS #7 (.p7b)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:331
 msgid "All Files (*.*)"
 msgstr "Tutti i file (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr "File di certificato non valido o non supportato %s"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 msgid "Error"
 msgstr "Errore"
 
@@ -680,17 +676,17 @@ msgstr ""
 "%u)."
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Autenticazione esterna"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Autenticazione interna"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr "Seleziona dalla lista il metodo per l'autenticazione interna"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Autenticazione esterna"
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"
@@ -721,7 +717,7 @@ msgstr "EAP-TTLS"
 #: 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 ""
+msgstr "Metodo EAP-TTLS"
 
 #: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4

EAPMethods/locale/nb_NO.po

@@ -1,12 +1,13 @@
+# 
 # Translators:
-# Tom Ivar Myren <tom.myren@uninett.no>, 2017
+# Tom Ivar Myren <tom.myren@sikt.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"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n"
@@ -15,7 +16,7 @@ msgstr ""
 "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 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -28,31 +29,31 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, 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
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Advarsel"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "EAP brukeropplysninger"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Tilbyder innstillinger"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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)"
@@ -60,43 +61,43 @@ 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr "Sletting av brukeropplysninger feilet (feil %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(feil %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Husk"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(Din organisasjon)"
 
@@ -128,11 +129,11 @@ msgstr "Åpner dialog med tilbyder innstillinger"
 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 ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Bruk fra Credential &Manager:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -140,39 +141,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:258
 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
-msgid "&Clear Credentials"
-msgstr "&Fjern påloggingsinformasjon"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Bruk fra &profil konfigurasjon:"
 
-#: 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 ""
-"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
-msgid "&Set Credentials..."
-msgstr "&Sett påloggingsinformasjon"
-
-#: 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 "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:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -180,47 +157,67 @@ 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:276
 msgid "Profile configuration credentials"
 msgstr "Profil konfigurasjon brukerinformasjon"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "&Fjern påloggingsinformasjon"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+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:294
+msgid "&Set Credentials..."
+msgstr "&Sett påloggingsinformasjon"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+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:332
 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:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Passord:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Oppgi ditt passord"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "Bruker ID"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 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:446
 msgid "Your Organization"
 msgstr "Din organisasjon"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -229,53 +226,41 @@ 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:464
 msgid "Your organization &name:"
 msgstr "Din organisasjons %navn:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 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:483
 msgid "Helpdesk contact &information:"
 msgstr "Helpdesk kontakt&informasjon:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "Nettadresse til din helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "E-post adresse til din helpdesk"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 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:550
 msgid "Provider Unique Identifier"
 msgstr "Oppgi unik identifikator"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -283,33 +268,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:568
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "Oppgi unik &identifikator:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr "Konfigurasjonslås"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -317,59 +302,59 @@ 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:632
 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:635
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
-msgstr ""
+msgstr "Identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "&Faktisk identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Bruke mitt faktiske brukernavn"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
-msgstr ""
+msgstr "Bruk &tom identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
-msgstr ""
+msgstr "Tilpasset &identitet:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
-msgstr ""
+msgstr "Spesifiser tilpasset identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
-msgstr ""
+msgstr "Tilpasset identitet som brukes"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Konfigurasjon av EAP forbindelse"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "EAP Identitetstilbyder"
 
@@ -589,7 +574,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Bruker sertifikat"
 
@@ -613,32 +598,40 @@ 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
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Valideringskonflikt"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Legg til sertifikat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 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:329
 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:330
 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:331
 msgid "All Files (*.*)"
 msgstr "Alle filer (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Feil"
 
@@ -663,17 +656,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Kall av EAP interaktivt UI feilet (feil %u)."
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Ytre autentisering"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Indre autentisering"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr "Velg den indre autentiseringsmetoden fra listen"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Ytre autentisering"
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"
@@ -704,7 +697,7 @@ msgstr "EAP-TTLS"
 #: 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 ""
+msgstr "EAP-TTLS metode"
 
 #: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4

EAPMethods/locale/pl_PL.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # 
@@ -5,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Polish (Poland) (https://www.transifex.com/eduroam_devel/teams/11799/pl_PL/)\n"
@@ -14,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_PL\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -27,73 +28,73 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, 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
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "Poświadczenia EAP"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, 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
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(błąd %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(puste ID)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Zapamiętaj"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(Twoja Instytucja)"
 
@@ -126,11 +127,11 @@ 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"
-msgstr ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Użyj z &Managera poświadczeń:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -138,39 +139,15 @@ 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:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:258
 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
-msgid "&Clear Credentials"
-msgstr "&Usuń poświadczenia"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Użyj &profilu konfiguracyjnego:"
 
-#: 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 ""
-"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
-msgid "&Set Credentials..."
-msgstr "&Ustaw poświadczenia"
-
-#: 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 "Kliknij tutaj, aby zmodyfikować poświadczenia logowania"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -178,49 +155,69 @@ 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:276
 msgid "Profile configuration credentials"
 msgstr "Poświadczenia z profilu konfiguracyjnego"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "&Usuń poświadczenia"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+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:294
+msgid "&Set Credentials..."
+msgstr "&Ustaw poświadczenia"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+msgid "Click here to set or modify your credentials"
+msgstr "Kliknij tutaj, aby zmodyfikować poświadczenia logowania"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 msgid "User ID and Password"
 msgstr "Identyfikator i hasło"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Hasło:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Wprowadź hasło"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "Identyfikator"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 msgid "Please provide your user ID."
-msgstr ""
+msgstr "Proszę wprowadzić identyfikator."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
 msgid "Your Organization"
 msgstr "Twoja Instytucja"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -228,54 +225,42 @@ 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:464
 msgid "Your organization &name:"
 msgstr "&Nazwa Twojej instytucji:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 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:483
 msgid "Helpdesk contact &information:"
 msgstr "&Kontakt do helpdesku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "Adres WWW twojego helpdesku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "Adres e-mail Twojego helpdesku"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 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:550
 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:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -283,33 +268,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:568
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 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:589
 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:614
 msgid "Configuration Lock"
 msgstr "Blokada konfiguracji"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -318,62 +303,62 @@ 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:632
 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:635
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
-msgstr ""
+msgstr "Tożsamość"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "&Rzeczywista tożsamość"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Korzystaj z mojego rzeczywistego identyfikatora"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
-msgstr ""
+msgstr "Użyj &pustego identyfikatora"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
-msgstr ""
+msgstr "Niestandardowy &identyfikator:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
-msgstr ""
+msgstr "Podaj niestandardowy identyfikator"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
-msgstr ""
+msgstr "Niestandardowy identyfikator"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Konfiguracja Połączenia EAP"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "Dostawca tożsamości EAP"
 
@@ -520,7 +505,7 @@ msgstr ""
 
 #: lib/GTC_UI/src/GTC_UI.cpp:41
 msgid "Password"
-msgstr ""
+msgstr "Hasło"
 
 #: lib/GTC_UI/src/GTC_UI.cpp:119
 #, c-format
@@ -596,7 +581,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Certyfikat użytkownika"
 
@@ -622,32 +607,40 @@ 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
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Błąd walidacji danych"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Dodaj certyfikat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 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:329
 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:330
 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:331
 msgid "All Files (*.*)"
 msgstr "Wszystkie pliki (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Błąd"
 
@@ -673,17 +666,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Uwierzytelnienie "
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Uwierzytelnienie wewnętrzne"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr "Wymierz metodę uwierzytelnienia wewnętrznego z listy"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Uwierzytelnienie "
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"
@@ -714,7 +707,7 @@ msgstr "EAP-TTLS"
 #: 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 ""
+msgstr "Metoda EAP-TTLS"
 
 #: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4

EAPMethods/locale/pt_PT.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Pedro Simões <psimoes@fccn.pt>, 2017
 # Simon Rozman <simon@rozman.si>, 2020
@@ -6,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n"
@@ -14,8 +15,8 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -28,72 +29,72 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Alerta"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "Credenciais EAP"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Definições do Fornecedor"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Memorizar"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr ""
 
@@ -125,230 +126,214 @@ msgstr ""
 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"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 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 "Identidade:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:258
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-msgid "&Clear Credentials"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
 msgstr ""
 
-#: 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 ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
-msgid "&Set Credentials..."
-msgstr "&Definir Credenciais..."
-
-#: 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 ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 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:276
 msgid "Profile configuration credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+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:294
+msgid "&Set Credentials..."
+msgstr "&Definir Credenciais..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+msgid "Click here to set or modify your credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 msgid "User ID and Password"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 msgid "User ID:"
 msgstr "ID do utilizador:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Palavra passe:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Coloque aqui a sua palavra passe"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "ID do utilizador"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 msgid "Please provide your user ID."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
 msgid "Your Organization"
 msgstr "A sua Organização"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 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:464
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:550
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 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:568
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 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:632
 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:635
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 msgid "Omit my user name and use @mydomain.org only"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr ""
 
@@ -555,7 +540,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Certificado do Utilizador"
 
@@ -577,32 +562,40 @@ msgid ""
 "to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Adicionar Certificado"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:329
 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:330
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:331
 msgid "All Files (*.*)"
 msgstr "Todos os Ficheiros (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Erro"
 
@@ -627,17 +620,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr ""
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"

EAPMethods/locale/ro_RO.po

@@ -0,0 +1,729 @@
+# 
+# Translators:
+# Simon Rozman <simon@rozman.si>, 2020
+# Raul Opruta <raul.opruta@roedu.net>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: EAPMethods\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
+"PO-Revision-Date: 2016-08-25 06:18+0000\n"
+"Last-Translator: Raul Opruta <raul.opruta@roedu.net>, 2020\n"
+"Language-Team: Romanian (Romania) (https://www.transifex.com/eduroam_devel/teams/11799/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"X-Generator: Poedit 2.3\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:295
+#, c-format
+msgid ""
+"Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+"Sunteți sigur că doriți să eliminați definitiv furnizorul %s din "
+"configurație?"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:295
+msgid "Warning"
+msgstr "Avertizare"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
+msgid "EAP Credentials"
+msgstr "Credenţiale EAP"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:725
+msgid "Provider Settings"
+msgstr "Setări de provider"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:758 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#, c-format
+msgid "%s User Credentials"
+msgstr "%s Credenţiale utilizator"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:866 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 ""
+"Eroare la scriere a credențialelor în Managerul de credențiale: % hs "
+"(eroare%u)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:869 lib/TTLS_UI/src/Module.cpp:198
+#: lib/TTLS_UI/src/Module.cpp:307
+msgid "Writing credentials failed."
+msgstr " Scrierea credențialele nu au reușit."
+
+#: lib/EAPBase_UI/include/EAP_UI.h:897
+#, c-format
+msgid "Deleting credentials failed (error %u)."
+msgstr "Ştergerea credenţialelor eşuată (eroare %u)."
+
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr "(nici unul)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
+#, c-format
+msgid "(error %u)"
+msgstr "(eroare %u )"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:932
+msgid "(error)"
+msgstr "(eroare)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(blank ID)"
+msgstr "(ID gol)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:992
+msgid "&Remember"
+msgstr "&Ţine minte"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:993
+msgid "Check if you would like to save credentials"
+msgstr " Verificați dacă doriți să salvați datele de acreditare"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
+msgid "(Your Organization)"
+msgstr "(Organizaţia ta)"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
+msgid "+"
+msgstr "+"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
+msgid "Adds new provider"
+msgstr "Adaugă un nou furnizor"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
+msgid "-"
+msgstr "-"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
+msgid "Removes selected provider"
+msgstr "Înlătură furnizorul selectat"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
+msgid "Advanced..."
+msgstr "Avansat..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:48
+msgid "Opens dialog with provider settings"
+msgstr "Deschide dialogul cu setările furnizorului"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
+msgid "Select the source where your credentials used to connect are stored."
+msgstr ""
+"Selectați sursa în care sunt stocate datele de acreditare folosite pentru a "
+"vă conecta."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Utilizați de la Credențiale & Management:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
+msgid ""
+"Select this option if you would like to use credentials stored in Windows "
+"Credential Manager"
+msgstr ""
+"Selectați această opțiune dacă doriți să utilizați credețialele stocate în "
+"Windows Credential Manager"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:258
+msgid "Your present credentials stored in Windows Credential Manager"
+msgstr "Credențiele dvs. actuale sunt stocate în Windows Credential Manager"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Utilizați din configurarea profilului:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
+msgid ""
+"Select this option if you would like to store credentials as a part of  "
+"profile configuration"
+msgstr ""
+"Selectați această opțiune dacă doriți să stocați credențialele  ca parte a "
+"configurației profilului"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
+msgid "Profile configuration credentials"
+msgstr " Credențialele de configurare a profilului"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "%Ştergere Credenţiale"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+msgstr ""
+"Faceți clic pentru a șterge credențialele din Managerul de credenţiale.\n"
+"Notă: Vi se va solicita să introduceți credențialele atunci când vă conectați."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:294
+msgid "&Set Credentials..."
+msgstr "&Setare credenţiale"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+msgid "Click here to set or modify your credentials"
+msgstr "Apasă aici pentru a modifica credenţialele"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
+msgid "User ID and Password"
+msgstr "ID de utilizator și parolă"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
+msgid "Please provide your user ID and password."
+msgstr "Vă rugăm să furnizați ID-ul de utilizator și parola."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
+msgid "User ID:"
+msgstr "ID utilizator:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
+msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
+msgstr ""
+"Introduceți numele de utilizator aici (user@domain.org, DOMENIU \\ User "
+"etc.)"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:361
+msgid "Password:"
+msgstr "Parolă:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
+msgid "Enter your password here"
+msgstr "Introduceţi parola aici:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
+msgid "User ID"
+msgstr "ID Utilizator"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
+msgid "Please provide your user ID."
+msgstr "Vă rugăm să furnizați ID-ul de utilizator."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:446
+msgid "Your Organization"
+msgstr "Organizaţia dumneavostră"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
+msgid ""
+"Describe your organization to customize user prompts.  When organization is "
+"introduced, end-users find program messages easier to understand and act."
+msgstr ""
+"Descrieți organizația dumneavoastră pentru a personaliza solicitările "
+"utilizatorilor. Când este introdusă organizația, utilizatorii finali găsesc "
+"mesajele de program mai ușor de înțeles și de acționat."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:464
+msgid "Your organization &name:"
+msgstr "Numele organizaţiei dumneavoastră &:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
+msgid ""
+"Your organization name as it will appear on helpdesk contact notifications"
+msgstr ""
+"Numele organizației dumneavoastră, așa cum va apărea în notificările de "
+"contact ale helpdesk"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:473
+msgid "(Keep it short, please)"
+msgstr "(Păstrați-l scurt, vă rog)"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
+msgid "Helpdesk contact &information:"
+msgstr "Contact și informații despre asistență:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
+msgid "Your helpdesk website address"
+msgstr "Adresa web de asistență"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
+msgid "Your helpdesk e-mail address"
+msgstr "Adresa de e-mail de asistență"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
+msgid "Your helpdesk phone number"
+msgstr "Numărul de telefon de asistență"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:550
+msgid "Provider Unique Identifier"
+msgstr "Identificator unic al furnizorului"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
+msgid ""
+"Assign your organization a unique ID to allow sharing the same credential "
+"set across different network profiles."
+msgstr ""
+"Alocați organizației dumneavostră un ID unic care să permită partajarea "
+"aceluiași set de credințiale pe diferite profiluri de rețea."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
+msgid "&Namespace:"
+msgstr "&Spaţiu de nume:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
+msgid "urn:RFC4282:realm"
+msgstr "urn:RFC4282:realm"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
+msgid "urn:uuid"
+msgstr "urn:uuid"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
+msgid "Provider unique &identifier:"
+msgstr "Identificator unic și identificator:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
+msgid "Your organization ID to assign same credentials from other profiles"
+msgstr ""
+"ID-ul organizației dumneavoastră pentru a atribui aceleași date de "
+"acreditare de la alte profiluri"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:614
+msgid "Configuration Lock"
+msgstr "Configurare Blocată"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
+msgid ""
+"Your configuration can be locked to prevent accidental modification by end-"
+"users. Users will only be allowed to enter credentials."
+msgstr ""
+"Configurația dumneavoastră poate fi blocată pentru a preveni modificarea "
+"accidentală de către utilizatorii finali. Utilizatorii vor avea voie să "
+"introducă numai datele de acreditare."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:632
+msgid ""
+"&Lock this configuration and prevent any further modification via user "
+"interface."
+msgstr ""
+"& Blocați această configurație și preveniți alte modificări prin interfața "
+"utilizatorului"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:635
+msgid "(Warning: Once locked, you can not revert using this dialog!)"
+msgstr "(Avertisment: odată blocat, nu puteți reveni folosind acest dialog!)"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
+msgid "Identity"
+msgstr "Identitate"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
+msgid "Select the user ID supplicant introduces itself as to authenticator:"
+msgstr ""
+"Selectați ID-ul utilizatorului implicit care se introduce ca autentificator:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
+msgid "&True identity"
+msgstr "&Identitate adevărată"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
+msgid "Use my true user name"
+msgstr "Utilizați numele meu de utilizator adevărat"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
+msgid "Use &empty identity"
+msgstr "Utilizați & identitate goală"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
+msgid "Omit my user name and use @mydomain.org only"
+msgstr "Omiteți numele meu de utilizator si folositi doar @ mydomain.org"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
+msgid "&Custom identity:"
+msgstr "& Identitate personalizată:"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
+msgid "Specify custom identity"
+msgstr "Precizați identitatea personalizată"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
+msgid "Custom identity to use"
+msgstr "Identitate personalizată de utilizat"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
+msgid "EAP Connection Configuration"
+msgstr "Configurare conexiune EAP"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
+msgid "EAP Identity Provider"
+msgstr "Furnizor de identitate EAP"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:103
+#, c-format
+msgid "%s Credentials"
+msgstr "%s Credenţiale"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:139
+#, c-format
+msgid "For additional help and instructions, please contact %s at:"
+msgstr ""
+"Pentru ajutor și instrucțiuni suplimentare, vă rugăm să contactați %s la : "
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:140
+msgid "your provider"
+msgstr "providerul dumneavoastră"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:159
+msgid "Open the default web browser"
+msgstr "Deschideți browserul web implicit"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:170
+msgid "Open your e-mail program"
+msgstr "Deschideți programul de e-mail"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:181
+msgid "Dial the phone number"
+msgstr "Apelează numărul de telefon"
+
+#: 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 are părți prestabilite ale acestei configurații. Aceste piese sunt "
+"blocate pentru a preveni modificarea accidentală."
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:204
+msgid "Your provider"
+msgstr "Furnizorul dumneavostră"
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:225
+msgid "Previous attempt to connect reported invalid credentials."
+msgstr "Încercarea anterioară de conectare a raportat credențiale nevalide ."
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:226
+msgid "Previous attempt to connect reported your credentials expired."
+msgstr ""
+"Încercarea anterioară de conectare a raportat datele de acreditare expirate."
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+msgid ""
+"Previous attempt to connect reported your credentials are being changed."
+msgstr ""
+"Încercarea anterioară de conectare a raportat că datele de acreditare au "
+"fost modificate."
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
+msgid "Previous attempt to connect failed."
+msgstr "Încercarea anterioară de conectare a eșuat."
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:229
+msgid "Please, make sure your credentials are correct, or try again later."
+msgstr ""
+"Vă rugăm, asigurați-vă că datele de acreditare sunt corecte sau încercați "
+"din nou mai târziu."
+
+#: 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 ""
+"Versiunea instalată %s pe acest computer înregistrează datele de acreditare "
+"în mod vizibil și ușor de citit."
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
+msgid "Please, reconsider necessity to enter your credentials."
+msgstr ""
+"Vă rugăm să reconsiderați necesitatea de a introduce datele de acreditare."
+
+#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
+msgid "Inner EAP Method"
+msgstr "Metoda EAP interioară"
+
+#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
+msgid "Select and configure inner EAP method"
+msgstr "Selectați și configurați metoda EAP interioară"
+
+#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
+msgid "&Settings"
+msgstr "&Setări"
+
+#: lib/EapHost_UI/src/EapHost_UI.cpp:59
+#, c-format
+msgid "Enumerating EAP methods failed (error %u, %s, %s)."
+msgstr "Enumerarea metodelor EAP a eșuat (eroare %u , %s , %s )."
+
+#: lib/EapHost_UI/src/EapHost_UI.cpp:61
+#, c-format
+msgid "Enumerating EAP methods failed (error %u)."
+msgstr "Enumerarea metodelor EAP a eșuat (eroare %u )."
+
+#: lib/EapHost_UI/src/EapHost_UI.cpp:136
+#, c-format
+msgid "Configuring EAP method failed (error %u, %s, %s)."
+msgstr "Configurarea metodei EAP a eșuat (eroare %u,%s,%s)."
+
+#: lib/EapHost_UI/src/EapHost_UI.cpp:138
+#, c-format
+msgid "Configuring EAP method failed (error %u)."
+msgstr "Configurarea metodei EAP a eșuat (eroare %u )."
+
+#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16
+msgid "GTC Challenge"
+msgstr "Provocarea GTC"
+
+#: lib/GTC_UI/res/wxGTC_UI.cpp:26
+msgid "Please provide your response."
+msgstr "Vă rugăm să ne oferiți răspunsul."
+
+#: lib/GTC_UI/res/wxGTC_UI.cpp:38
+msgid "Server challenge"
+msgstr "Provocarea serverului"
+
+#: lib/GTC_UI/res/wxGTC_UI.cpp:43
+msgid "Enter your response here"
+msgstr "Introduceți răspunsul aici"
+
+#: lib/GTC_UI/res/wxGTC_UI.cpp:70
+msgid "EAP-GTC authentication &mode:"
+msgstr "Autentificare și &mod EAP-GTC:"
+
+#: lib/GTC_UI/res/wxGTC_UI.cpp:75
+msgid "Select EAP-GTC authentication mode from the list"
+msgstr "Selectați modul de autentificare EAP-GTC din listă"
+
+#: lib/GTC_UI/src/GTC_UI.cpp:39
+msgid "Challenge/Response"
+msgstr "Provocare/Răspuns"
+
+#: lib/GTC_UI/src/GTC_UI.cpp:41
+msgid "Password"
+msgstr "Parolă"
+
+#: lib/GTC_UI/src/GTC_UI.cpp:119
+#, c-format
+msgid "%s Challenge"
+msgstr "%s Provocare"
+
+#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
+msgid "MSCHAPv2 User ID and Password"
+msgstr "MSCHAPv2 Utilizator şi Parolă"
+
+#: lib/PAP_UI/src/PAP_UI.cpp:33
+msgid "PAP User ID and Password"
+msgstr "PAP Utilizator şi Parolă"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:17
+msgid "Server Trust"
+msgstr "Server de încredere"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:28
+msgid "Describe the servers you trust to prevent man-in-the-middle attacks."
+msgstr ""
+"Descrieți serverele de încredere pentru a preveni atacurile de tipul man-in-"
+"the-middle."
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:35
+msgid "Acceptable Certificate Authorities:"
+msgstr "Autorități de certificare acceptate:"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:40
+msgid ""
+"Server's certificate must be issued by one of certificate authorities listed"
+" here"
+msgstr ""
+"Certificatul de server trebuie eliberat de una dintre autoritățile de "
+"certificare enumerate aici"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:47
+msgid "Add CA from Store..."
+msgstr "Adăugare CA din magazin..."
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:48
+msgid ""
+"Adds a new certificate authority from the certificate store to the list"
+msgstr ""
+"Adaugă o nouă autoritate de certificare din magazinul de certificate în "
+"listă"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:52
+msgid "Add CA from File..."
+msgstr "Adăugare CA din fişier..."
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:53
+msgid "Adds a new certificate authority from the file to the list"
+msgstr "Adaugă o nouă autoritate de certificare din fișier în listă"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:57
+msgid "&Remove CA"
+msgstr "&Ştergere CA"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:58
+msgid "Removes selected certificate authorities from the list"
+msgstr "Îndepărtează autoritățile de certificare selectate din listă"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:71
+msgid "Acceptable server &names:"
+msgstr "Server și nume acceptate:"
+
+#: 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 ""
+"Punct și virgulă delimitează lista de nume de servere FQDN ; lăsați spațiu "
+"gol pentru a omite verificarea numelui; Caractere Unicode permise"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:80
+msgid "(Example: foo.bar.com;server2.bar.com)"
+msgstr "(Exemplu: foo.bar.com;server2.bar.com)"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:400
+msgid "User Certificate"
+msgstr "Certificatul de utilizator"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:128
+msgid "Please select your &certificate to use for authentication."
+msgstr ""
+"Vă rugăm să selectați certificatul dumneavoastră de utilizat pentru "
+"autentificare."
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:135
+msgid "Client certificate to use for authentication"
+msgstr "Certificat de client de folosit pentru autentificare"
+
+#: lib/TLS_UI/res/wxTLS_UI.cpp:142
+msgid "Custom &identity:"
+msgstr "Personalizare și identitate:"
+
+#: 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 ""
+"Identitatea dumneavoastră (nume de utilizator @ domeniu) pentru a trece "
+"peste un certificat; sau necompletat pentru a utiliza unul prevăzut în "
+"certificat"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "No certificate selected"
+msgstr "Niciun certificat selectat"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Conflict la validare"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
+msgid "Add Certificate"
+msgstr "Adaugă certificat"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:328
+msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
+msgstr "Fişierele Certificat  (*.cer;*.crt;*.der;*.p7b;*.pem)"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:329
+msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
+msgstr "X.509 Fişierele Certificat (*.cer;*.crt;*.der;*.pem)"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:330
+msgid "PKCS #7 Certificate Files (*.p7b)"
+msgstr "PKCS #7 Fişierele Certificat (*.p7b)"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:331
+msgid "All Files (*.*)"
+msgstr "Toate filele (*.*)"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:345
+#, c-format
+msgid "Invalid or unsupported certificate file %s"
+msgstr "Fișier de certificat %s nevalid sau neacceptat "
+
+#: lib/TLS_UI/src/TLS_UI.cpp:345
+msgid "Error"
+msgstr "Eroare"
+
+#: lib/TTLS_UI/src/Module.cpp:249
+#, c-format
+msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
+msgstr " Invocarea interfaței de identitate EAP a eșuat (eroare%u,%s,%s)."
+
+#: lib/TTLS_UI/src/Module.cpp:252
+#, c-format
+msgid "Invoking EAP identity UI failed (error %u)."
+msgstr "Invocarea interfaței de identitate EAP a eșuat (eroare%u)."
+
+#: lib/TTLS_UI/src/Module.cpp:376
+#, c-format
+msgid "Invoking EAP interactive UI failed (error %u, %s, %s)."
+msgstr "Invocarea  EAP EI interactivă  a eșuat (eroare %u,%s,%s)."
+
+#: lib/TTLS_UI/src/Module.cpp:379
+#, c-format
+msgid "Invoking EAP interactive UI failed (error %u)."
+msgstr "Invocarea EAP EI interactivă a eșuat (eroare %u)."
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Autentificare exterioară"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
+msgid "Inner Authentication"
+msgstr "Autentificare interioară"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
+msgid "Select inner authentication method from the list"
+msgstr "Selectați metoda de autentificare interioară din listă"
+
+#: 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 "Alte metode 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"
+msgstr "Metoda EAP-TTLS"
+
+#: 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 "Metodele EAP"
+
+#: 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 "Module pentru a sprijini metodele individuale EAP"

EAPMethods/locale/sl_SI.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2020
 # 
@@ -5,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n"
@@ -14,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl_SI\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -27,7 +28,7 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
@@ -35,67 +36,67 @@ msgstr ""
 "Ali ste prepričani, da želite trajno izbrisati ponudnika %s iz "
 "konfiguracije?"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "Poverilnice EAP"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Nastavitve ponudnika"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr "Izbris poverilnic ni uspel (napaka %u)."
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr "(brez)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(napaka %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(prazen ID)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "Za&pomni si"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr "Odkljukajte, če želite shraniti poverilnice"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(vaša organizacija)"
 
@@ -127,11 +128,11 @@ msgstr "Odpre dialog z nastavitvami ponudnika"
 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"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Uporabi iz &Upravitelja poverilnic:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -139,39 +140,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:258
 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
-msgid "&Clear Credentials"
-msgstr "Počisti poverilni&ce"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Uporabi iz nastavitev &profila:"
 
-#: 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 ""
-"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
-msgid "&Set Credentials..."
-msgstr "Na&stavi poverilnice ..."
-
-#: 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 "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:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -179,47 +156,67 @@ 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:276
 msgid "Profile configuration credentials"
 msgstr "Poverilnice nastavitev profila"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "Počisti poverilni&ce"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+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:294
+msgid "&Set Credentials..."
+msgstr "Na&stavi poverilnice ..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+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:332
 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:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Geslo:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Tukaj vnesite svoje geslo"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "ID uporabnika"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 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:446
 msgid "Your Organization"
 msgstr "Vaša organizacija"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -228,54 +225,42 @@ 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:464
 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:469
 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:473
 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:483
 msgid "Helpdesk contact &information:"
 msgstr "Podatk&i centra za pomoč:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "Naslov spletne strani vašega centra za pomoč"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "E-poštni naslov vašega centra za pomoč"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 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:550
 msgid "Provider Unique Identifier"
 msgstr "Enolični identifikator ponudnika"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -283,33 +268,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:568
 msgid "&Namespace:"
 msgstr "Ime&nski prostor:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "Enolični &identifikator ponudnika:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr "Zaklep konfiguracije"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -317,7 +302,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:632
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -325,51 +310,51 @@ 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:635
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
 msgstr "Identiteta"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "Prava iden&titeta"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Uporabi moje pravo uporabniško ime"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
 msgstr "Uporabi prazno id&entiteto"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
 msgstr "&Identiteta po meri:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr "Navedite identiteto po meri"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
 msgstr "Zunanja po meri za uporabo"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Konfiguracija povezave EAP"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "Ponudnik identitete EAP"
 
@@ -587,7 +572,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Uporabnikovo potrdilo"
 
@@ -611,32 +596,40 @@ 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
+msgid "No certificate selected"
+msgstr "Digitalno potrdilo ni izbrano"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Nesoglasje pri preverjanju"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Dodaj potrdilo"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 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:329
 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:330
 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:331
 msgid "All Files (*.*)"
 msgstr "Vse datoteke (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Napaka"
 
@@ -661,17 +654,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr "Zagon interaktivnega up. vmesnika EAP ni uspel (napaka %u)."
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Zunanje overovljanje"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Notranje overovljanje"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr "Izberite metodo notranjega overovljanja s seznama"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Zunanje overovljanje"
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"

EAPMethods/locale/sr_RS.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Marko Eremija <marko.eremija@amres.ac.rs>, 2017
 # Simon Rozman <simon@rozman.si>, 2020
@@ -6,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n"
@@ -15,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -28,7 +29,7 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
@@ -36,67 +37,67 @@ msgstr ""
 "Da li ste sigurni da želite da trajno uklonite %s provajdera iz "
 "konfiguracije?"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr "EAP kredencijali"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr "Podešavanja provajdera"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr "Brisanje kredencijala neuspešno (greška %u)."
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr "(bez)"
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr "(greška %u)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr "(prazan ID)"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr "&Zapamti"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr "(Vaša organizacija)"
 
@@ -128,11 +129,11 @@ msgstr "Otvara dijalog sa podešavanjima za provajdera"
 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 ""
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
+msgstr "Koristi iz &Manager kredencijala:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
@@ -140,39 +141,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:258
 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
-msgid "&Clear Credentials"
-msgstr "&Clear kredencijale"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
+msgstr "Koristi iz konfiguracije &profila:"
 
-#: 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 ""
-"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
-msgid "&Set Credentials..."
-msgstr "&Set kredencijale..."
-
-#: 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 "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:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
@@ -180,49 +157,69 @@ 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:276
 msgid "Profile configuration credentials"
 msgstr "Kredencijali za konfiguraciju profila"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr "&Clear kredencijale"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+msgid ""
+"Click to clear your credentials from Credential Manager.\n"
+"Note: You will be prompted to enter credentials when connecting."
+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:294
+msgid "&Set Credentials..."
+msgstr "&Set kredencijale..."
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+msgid "Click here to set or modify your credentials"
+msgstr "Kliknite ovde kako biste promenili svoje kredencijale"
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 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:342
 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:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 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:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Unesite lozinku ovde"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "Korisničko ime"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 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:446
 msgid "Your Organization"
 msgstr "Vaša organizacija"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
@@ -231,54 +228,42 @@ 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:464
 msgid "Your organization &name:"
 msgstr "&name vaše organizacije:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 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:483
 msgid "Helpdesk contact &information:"
 msgstr "Helpdesk kontakt &information:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr "Web stranice službe za podršku korisnicima"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr "e-mail adresa službe za podršku korisnicima"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 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:550
 msgid "Provider Unique Identifier"
 msgstr "Jedinstveni identifikator provajdera"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
@@ -286,33 +271,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:568
 msgid "&Namespace:"
 msgstr "&Namespace:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr "Jedinstveni &identifier provajdera: "
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr "Zaključavanje konfiguracije"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
@@ -321,7 +306,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:632
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
@@ -329,54 +314,54 @@ 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:635
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
-msgstr ""
+msgstr "Identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr "&True identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr "Koristi moje pravo korisničko ime"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
-msgstr ""
+msgstr "Koristi &prazan identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 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
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
-msgstr ""
+msgstr "Proizvoljan &identity:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
-msgstr ""
+msgstr "Unesite proizvoljan identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
-msgstr ""
+msgstr "Koristi proizvoljan identitet"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr "Podešavanja za EAP povezivanje"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr "EAP davalac identiteta"
 
@@ -544,6 +529,7 @@ 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."
 msgstr ""
+"Opišite servere kojima verujete kako bi se izbegao man-in-the-middle napad."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
@@ -599,7 +585,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr "Korisnički sertifikat"
 
@@ -624,32 +610,40 @@ 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
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr "Konflikt prilikom validacije"
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr "Dodaj sertifikat"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 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:329
 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:330
 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:331
 msgid "All Files (*.*)"
 msgstr "Svi fajlovi (*.*)"
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Greška"
 
@@ -682,17 +676,17 @@ msgstr ""
 " %u). "
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr "Spoljna autentifikacija"
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr "Unutrašnja autentifikacija"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr "Izaberite unutrašnji metod autentifikacije sa liste"
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr "Spoljna autentifikacija"
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"
@@ -723,7 +717,7 @@ msgstr "EAP-TTLS"
 #: 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 ""
+msgstr "EAP-TTLS metod"
 
 #: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4

EAPMethods/locale/tr_TR.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Gokhan Eryol <gokhaneryol@gmail.com>, 2017
 # Simon Rozman <simon@rozman.si>, 2020
@@ -6,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2020-02-06 16:51+0100\n"
+"POT-Creation-Date: 2020-04-17 14:55+0200\n"
 "PO-Revision-Date: 2016-08-25 06:18+0000\n"
 "Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
 "Language-Team: Turkish (https://www.transifex.com/eduroam_devel/teams/11799/tr/)\n"
@@ -15,7 +16,7 @@ msgstr ""
 "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 2.3\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -28,72 +29,72 @@ msgstr ""
 "X-Poedit-SearchPath-7: EAPMethods\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 #, c-format
 msgid ""
 "Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:294
+#: lib/EAPBase_UI/include/EAP_UI.h:295
 msgid "Warning"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117
+#: lib/EAPBase_UI/include/EAP_UI.h:381 lib/EAPBase_UI/res/wxEAP_UI.h:116
 msgid "EAP Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:724
+#: lib/EAPBase_UI/include/EAP_UI.h:725
 msgid "Provider Settings"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229
+#: lib/EAPBase_UI/include/EAP_UI.h:758 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/EAPBase_UI/include/EAP_UI.h:866 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/EAPBase_UI/include/EAP_UI.h:869 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
+#: lib/EAPBase_UI/include/EAP_UI.h:897
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:938
+#: lib/EAPBase_UI/include/EAP_UI.h:924 lib/EAPBase_UI/include/EAP_UI.h:943
+#: lib/EAPBase_UI/include/EAP_UI.h:952
+msgid "(none)"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:928
 #, c-format
 msgid "(error %u)"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:942
+#: lib/EAPBase_UI/include/EAP_UI.h:932
 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
+#: lib/EAPBase_UI/include/EAP_UI.h:943 lib/EAPBase_UI/include/EAP_UI.h:952
 msgid "(blank ID)"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1002
+#: lib/EAPBase_UI/include/EAP_UI.h:992
 msgid "&Remember"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1003
+#: lib/EAPBase_UI/include/EAP_UI.h:993
 msgid "Check if you would like to save credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:1212
+#: lib/EAPBase_UI/include/EAP_UI.h:1214
 msgid "(Your Organization)"
 msgstr ""
 
@@ -125,231 +126,215 @@ msgstr ""
 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"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:250
+msgid "Use from Credential &Manager:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:251
 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 "Kimlik:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:262
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:258
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:272
-msgid "&Clear Credentials"
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:268
+msgid "Use from &profile configuration:"
 msgstr ""
 
-#: 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 ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 lib/EAPBase_UI/res/wxEAP_UI.cpp:316
-msgid "&Set Credentials..."
-msgstr ""
-
-#: 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 ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:288
-msgid "Use from &profile configuration"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:269
 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:276
 msgid "Profile configuration credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:359
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:289
+msgid "&Clear Credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:290
+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:294
+msgid "&Set Credentials..."
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:295
+msgid "Click here to set or modify your credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:332
 msgid "User ID and Password"
 msgstr "Kullanıcı Adı ve Parola"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:342
 msgid "Please provide your user ID and password."
 msgstr "Lütfen kullanıcı adı ve parolanızı sağlayınız."
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379 lib/EAPBase_UI/res/wxEAP_UI.cpp:443
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:352 lib/EAPBase_UI/res/wxEAP_UI.cpp:416
 msgid "User ID:"
 msgstr "Kullanıcı Adı:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384 lib/EAPBase_UI/res/wxEAP_UI.cpp:448
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:357 lib/EAPBase_UI/res/wxEAP_UI.cpp:421
 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:361
 msgid "Password:"
 msgstr "Parola:"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:393
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366
 msgid "Enter your password here"
 msgstr "Parolanızı buraya giriniz"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:396
 msgid "User ID"
 msgstr "Kullanıcı Adı"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:433
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:406
 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:446
 msgid "Your Organization"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:484
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457
 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:464
 msgid "Your organization &name:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 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:473
 msgid "(Keep it short, please)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:510
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:483
 msgid "Helpdesk contact &information:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:527
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:500
 msgid "Your helpdesk website address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:511
 msgid "Your helpdesk e-mail address"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:549
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "Your helpdesk phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:577
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:550
 msgid "Provider Unique Identifier"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:561
 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:568
 msgid "&Namespace:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:RFC4282:realm"
 msgstr "urn:RFC4282:realm"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:572
 msgid "urn:uuid"
 msgstr "urn:uuid"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:611
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:584
 msgid "Provider unique &identifier:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:616
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 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:614
 msgid "Configuration Lock"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:652
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:625
 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:632
 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:635
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:700
 msgid "Identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:711
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:718
 msgid "&True identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:719
 msgid "Use my true user name"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:723
 msgid "Use &empty identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:724
 msgid "Omit my user name and use @mydomain.org only"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:731
 msgid "&Custom identity:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:732
 msgid "Specify custom identity"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:737
 msgid "Custom identity to use"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:67
+#: lib/EAPBase_UI/res/wxEAP_UI.h:66
 msgid "EAP Connection Configuration"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:334
+#: lib/EAPBase_UI/res/wxEAP_UI.h:329
 msgid "EAP Identity Provider"
 msgstr ""
 
@@ -556,7 +541,7 @@ msgstr ""
 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:118 lib/TLS_UI/src/TLS_UI.cpp:400
 msgid "User Certificate"
 msgstr ""
 
@@ -578,32 +563,40 @@ msgid ""
 "to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:256
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "No certificate selected"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:118
+msgid "Validation conflict"
+msgstr ""
+
+#: lib/TLS_UI/src/TLS_UI.cpp:327
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:257
+#: lib/TLS_UI/src/TLS_UI.cpp:328
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:258
+#: lib/TLS_UI/src/TLS_UI.cpp:329
 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:330
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:260
+#: lib/TLS_UI/src/TLS_UI.cpp:331
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:274
+#: lib/TLS_UI/src/TLS_UI.cpp:345
 #, 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:345
 msgid "Error"
 msgstr "Hata"
 
@@ -628,17 +621,17 @@ msgid "Invoking EAP interactive UI failed (error %u)."
 msgstr ""
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:37
+msgid "Outer Authentication"
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:50
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:43
+#: lib/TTLS_UI/src/TTLS_UI.cpp:56
 msgid "Select inner authentication method from the list"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:48
-msgid "Outer Authentication"
-msgstr ""
-
 #: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "PAP"
 msgstr "PAP"

EventMonitor/App.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"

EventMonitor/App.h

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 ///

EventMonitor/ETWLog.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
@@ -78,8 +64,8 @@ wxEventTraceProcessorThread::wxEventTraceProcessorThread(wxEvtHandler *parent, c
     for (size_t i = 0, i_end = sessions.GetCount(); i < i_end; i++) {
         // Open trace.
         tlf.LoggerName = const_cast<LPTSTR>((LPCTSTR)(sessions[i]));
-        event_trace trace;
-        if (!trace.create(&tlf)) {
+        event_trace trace(OpenTrace(&tlf));
+        if (!trace) {
             wxLogError(_("Error opening event trace (error %u)."), GetLastError());
             continue;
         }
@@ -608,33 +594,34 @@ wxString wxETWListCtrl::OnGetItemText(const winstd::event_rec &rec, long column)
         // Get event meta-info.
         unique_ptr<TRACE_EVENT_INFO> info;
         ULONG ulResult;
-        if ((ulResult = TdhGetEventInformation((PEVENT_RECORD)&rec, 0, NULL, info)) == ERROR_SUCCESS) {
-            if (info->DecodingSource != DecodingSourceWPP) {
-                if (rec.EventHeader.Flags & EVENT_HEADER_FLAG_STRING_ONLY) {
-                    // This is a string-only event. Print it.
-                    return reinterpret_cast<LPCWSTR>(rec.UserData);
-                } else {
-                    // This is not a string-only event. Prepare parameters.
+        if ((ulResult = TdhGetEventInformation((PEVENT_RECORD)&rec, 0, NULL, info)) != ERROR_SUCCESS)
+            return tstring_printf(_T("(Error getting event information (error %u))"), ulResult).c_str();
 
-                    BYTE nPtrSize = (rec.EventHeader.Flags & EVENT_HEADER_FLAG_32_BIT_HEADER) ? 4 : 8;
-                    vector<tstring> props;
-                    vector<DWORD_PTR> props_msg;
-                    props.reserve(info->TopLevelPropertyCount);
-                    props_msg.reserve(info->TopLevelPropertyCount);
-                    for (ULONG i = 0; i < info->TopLevelPropertyCount; i++) {
-                        props.push_back(std::move(PropertyToString((PEVENT_RECORD)&rec, info.get(), i, NULL, 0, nPtrSize)));
-                        props_msg.push_back((DWORD_PTR)props[i].c_str());
-                    }
+        if (info->DecodingSource != DecodingSourceWPP) {
+            if (rec.EventHeader.Flags & EVENT_HEADER_FLAG_STRING_ONLY) {
+                // This is a string-only event. Print it.
+                return reinterpret_cast<LPCWSTR>(rec.UserData);
+            } else {
+                // This is not a string-only event. Prepare parameters.
 
-                    if (info->EventMessageOffset) {
-                        // Format the message.
-                        return wstring_msg(0, reinterpret_cast<LPCTSTR>(reinterpret_cast<LPCBYTE>(info.get()) + info->EventMessageOffset), props_msg.data()).c_str();
-                    }
+                BYTE nPtrSize = (rec.EventHeader.Flags & EVENT_HEADER_FLAG_32_BIT_HEADER) ? 4 : 8;
+                vector<tstring> props;
+                vector<DWORD_PTR> props_msg;
+                props.reserve(info->TopLevelPropertyCount);
+                props_msg.reserve(info->TopLevelPropertyCount);
+                for (ULONG i = 0; i < info->TopLevelPropertyCount; i++) {
+                    props.push_back(std::move(PropertyToString((PEVENT_RECORD)&rec, info.get(), i, NULL, 0, nPtrSize)));
+                    props_msg.push_back((DWORD_PTR)props[i].c_str());
+                }
+
+                if (info->EventMessageOffset) {
+                    // Format the message.
+                    return wstring_msg(0, reinterpret_cast<LPCTSTR>(reinterpret_cast<LPCBYTE>(info.get()) + info->EventMessageOffset), props_msg.data()).c_str();
                 }
-            } else if (info->EventMessageOffset) {
-                // This is a WPP event.
-                return reinterpret_cast<LPCWSTR>(reinterpret_cast<LPCBYTE>(info.get()) + info->EventMessageOffset);
             }
+        } else if (info->EventMessageOffset) {
+            // This is a WPP event.
+            return reinterpret_cast<LPCWSTR>(reinterpret_cast<LPCBYTE>(info.get()) + info->EventMessageOffset);
         }
     }
     }
@@ -1059,7 +1046,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;

EventMonitor/ETWLog.h

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <wx/event.h>
@@ -45,6 +31,7 @@ class wxPersistentETWListCtrl;
 #include <wx/persist/window.h>
 #include <wx/thread.h>
 
+#include <stdex/vector_queue.hpp>
 #include <WinStd/ETW.h>
 
 #include <memory>
@@ -168,7 +155,7 @@ protected:
     ///
     /// Functor for GUID comparison
     ///
-    struct less_guid : public std::binary_function<GUID, GUID, bool>
+    struct less_guid
     {
         ///
         /// Compares two GUIDs
@@ -321,8 +308,8 @@ protected:
     guidset m_sources;                                  ///< Set of enabled sources
 
     wxListItemAttr m_item_attr[2][4];                   ///< Current item attributes
-    winstd::vector_queue<winstd::event_rec> m_rec_db;   ///< Event record database
-    winstd::vector_queue<size_t> m_rec_idx;             ///< Event record database indices of shown records
+    stdex::vector_queue<winstd::event_rec> m_rec_db;    ///< Event record database
+    stdex::vector_queue<size_t> m_rec_idx;              ///< Event record database indices of shown records
 
     size_t m_col_format_width[5];                       ///< Column widths for pre-formatted row display (0 = unlimited)
 };

EventMonitor/EventMonitor.vcxproj

@@ -28,90 +28,42 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <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">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\include\$(Platform).props" />
     <Import Project="..\include\$(Configuration).props" />
   </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>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\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>
@@ -137,10 +89,7 @@
     <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>
-    <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>
@@ -175,6 +124,7 @@
     <POCompile Include="locale\pt_PT.po" />
     <POCompile Include="locale\ru_RU.po" />
     <POCompile Include="locale\sk_SK.po" />
+    <POCompile Include="locale\ro_RO.po" />
     <POCompile Include="locale\sl_SI.po" />
     <POCompile Include="locale\sr_RS.po" />
     <POCompile Include="locale\sv_SE.po" />

EventMonitor/EventMonitor.vcxproj.filters

@@ -75,6 +75,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <POCompile Include="locale\ro_RO.po">
+      <Filter>Resource Files\Localization</Filter>
+    </POCompile>
     <POCompile Include="locale\sl_SI.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>

EventMonitor/Frame.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
@@ -47,14 +33,9 @@ wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const
     wxString prod_status_bar;
     prod_status_bar.Printf(_("Toggles display of %s records"), wxT(PRODUCT_NAME_STR));
 
-    winstd::library lib_comres;
-    lib_comres.load(_T("comres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
-
-    winstd::library lib_ieframe;
-    lib_ieframe.load(_T("ieframe.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
-
-    winstd::library lib_shell32;
-    lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
+    winstd::library lib_comres(LoadLibraryEx(_T("comres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE));
+    winstd::library lib_ieframe(LoadLibraryEx(_T("ieframe.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE));
+    winstd::library lib_shell32(LoadLibraryEx(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE));
 
     wxSize size_menu(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
     wxSize size_tool(size_menu);

EventMonitor/Frame.h

@@ -1,27 +1,13 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 class wxEventMonitorFrame;
 class wxPersistentEventMonitorFrame;
 
-#pragma once;
+#pragma once
 
 #include "LogPanel.h"
 

EventMonitor/LogPanel.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"

EventMonitor/LogPanel.h

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 class wxEventMonitorLogPanel;

EventMonitor/PCH.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"

EventMonitor/PCH.h

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once

EventMonitor/locale/ca_ES.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # eduki <ecercos@xtec.cat>, 2016
 # 

EventMonitor/locale/de_DE.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # eduroam_devel <stefan.winter@restena.lu>, 2016
 # Eric Hoch <eric.hoch@hhu.de>, 2016

EventMonitor/locale/el_GR.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Vicky Kons <vickyk@admin.grnet.gr>, 2016
 # Zenon Mousmoulas <zenon@mousmoulas.gr>, 2016

EventMonitor/locale/es_ES.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # José Manuel Macías, 2016
 # 
@@ -13,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"

EventMonitor/locale/et_EE.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Indrek Rokk <indrek.rokk@eenet.ee>, 2018
 # Anne M <anne@eenet.ee>, 2019

EventMonitor/locale/hr_HR.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Dubravko Penezic <dpenezic@gmail.com>, 2016
 # 

EventMonitor/locale/it_IT.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Nunzio Napolitano <nunzio.napolitano@uniparthenope.it>, 2017
 # Daniele Albrizio <daniele@albrizio.it>, 2018
@@ -14,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"

EventMonitor/locale/nb_NO.po

@@ -1,5 +1,6 @@
+# 
 # Translators:
-# Tom Ivar Myren <tom.myren@uninett.no>, 2016
+# Tom Ivar Myren <tom.myren@sikt.no>, 2016
 # 
 #, fuzzy
 msgid ""
@@ -7,7 +8,7 @@ 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: Tom Ivar Myren <tom.myren@uninett.no>, 2016\n"
+"Last-Translator: Tom Ivar Myren <tom.myren@sikt.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"

EventMonitor/locale/pl_PL.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Tomasz Wolniewicz <tw2529@gmail.com>, 2016
 # 

EventMonitor/locale/pt_PT.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Pedro Simões <psimoes@fccn.pt>, 2017
 # 
@@ -13,7 +14,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"

EventMonitor/locale/ro_RO.po

@@ -0,0 +1,233 @@
+# 
+# Translators:
+# Raul Opruta <raul.opruta@roedu.net>, 2020
+# 
+#, 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: Raul Opruta <raul.opruta@roedu.net>, 2020\n"
+"Language-Team: Romanian (Romania) (https://www.transifex.com/eduroam_devel/teams/11799/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2: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 "Monitor de evenimente"
+
+#: ETWLog.cpp:83
+#, c-format
+msgid "Error opening event trace (error %u)."
+msgstr "Eroare la deschiderea urmării evenimentului (eroare %u )."
+
+#: ETWLog.cpp:171
+msgid "Time"
+msgstr "Timp"
+
+#: ETWLog.cpp:172
+msgid "PID"
+msgstr "PID"
+
+#: ETWLog.cpp:173
+msgid "TID"
+msgstr "TID"
+
+#: ETWLog.cpp:174
+msgid "Source"
+msgstr "Sursă"
+
+#: ETWLog.cpp:175
+msgid "Event"
+msgstr "Eveniment"
+
+#: 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 ""
+"Accesul refuzat la crearea sesiunii de evenimente: aveți nevoie de "
+"privilegii administrative (Run As Administrator) sau să fiți membru al "
+"grupului Utilizatori de performantă pentru a începe sesiunea de urmărire a "
+"evenimentelor."
+
+#: ETWLog.cpp:235
+#, c-format
+msgid "The %s event session already exists."
+msgstr "Sesiunea de eveniment %s există deja."
+
+#: ETWLog.cpp:239
+#, c-format
+msgid "Error creating event session (error %u)."
+msgstr "Eroare la crearea sesiunii evenimentului (eroare %u )."
+
+#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
+#, c-format
+msgid "Error enabling %s event provider (error %u)."
+msgstr "Eroare la activarea %s furnizorului de evenimente (eroare %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 "Afișarea comutatorilor de pe %s înregistrări"
+
+#: Frame.cpp:65
+msgid "E&xit"
+msgstr "Ieşire"
+
+#: Frame.cpp:65
+msgid "Quits this program"
+msgstr "Renunță la acest program"
+
+#: Frame.cpp:69
+msgid "&Program"
+msgstr "&Program"
+
+#: Frame.cpp:73
+msgid "&Copy"
+msgstr "&Copie"
+
+#: Frame.cpp:73 Frame.cpp:154
+msgid "Copies selected records to clipboard"
+msgstr "Copiază înregistrările selectate în clipboard"
+
+#: Frame.cpp:78
+msgid "Copy A&ll"
+msgstr "Copiați toate"
+
+#: Frame.cpp:78 Frame.cpp:156
+msgid "Copies all records to clipboard (including hidden)"
+msgstr "Copiază toate înregistrările în clipboard (inclusiv ascunse)"
+
+#: Frame.cpp:83 Frame.cpp:158
+msgid "Clear"
+msgstr "Clar"
+
+#: Frame.cpp:83 Frame.cpp:158
+msgid "Clears all records from the log"
+msgstr "Șterge toate înregistrările din jurnal"
+
+#: Frame.cpp:90
+msgid "Select &All"
+msgstr "Selectează &tot"
+
+#: Frame.cpp:90
+msgid "Selects all visible records"
+msgstr "Selectează toate înregistrările vizibile"
+
+#: Frame.cpp:94
+msgid "Select &None"
+msgstr "Selectați & Nici unul"
+
+#: Frame.cpp:94
+msgid "Clears record selection"
+msgstr "Șterge selecția recordului"
+
+#: Frame.cpp:97 Frame.cpp:142
+msgid "&Edit"
+msgstr "&Editează"
+
+#: Frame.cpp:101
+msgid "Auto &Scroll"
+msgstr "Auto & scroll"
+
+#: Frame.cpp:101 Frame.cpp:164
+msgid "Automatically scrolls to the most recent records as they come-in"
+msgstr "Derulați automat la cele mai recente înregistrări pe măsură ce intră"
+
+#: Frame.cpp:123 Frame.cpp:176
+msgid "Verbose"
+msgstr "Prolix "
+
+#: Frame.cpp:123 Frame.cpp:176
+msgid "Displays all levels of records"
+msgstr "Afișează toate nivelurile de înregistrări"
+
+#: Frame.cpp:127 Frame.cpp:178
+msgid "Informational"
+msgstr "Informațional"
+
+#: Frame.cpp:127 Frame.cpp:178
+msgid "Displays all records up to informational level"
+msgstr "Afișează toate înregistrările până la nivel informațional "
+
+#: Frame.cpp:131 Frame.cpp:180
+msgid "Warning"
+msgstr "Avertizare"
+
+#: Frame.cpp:131 Frame.cpp:180
+msgid "Displays all records up to warning level"
+msgstr "Afișează toate înregistrările până la nivelul de avertizare"
+
+#: Frame.cpp:135 Frame.cpp:182
+msgid "Error"
+msgstr "Eroare"
+
+#: Frame.cpp:135 Frame.cpp:182
+msgid "Displays error level records only"
+msgstr "Afișează doar înregistrări la nivel de eroare"
+
+#: Frame.cpp:142 Frame.cpp:146
+#, c-format
+msgid "%s toolbar"
+msgstr "%s Bara de instrumente"
+
+#: Frame.cpp:142 Frame.cpp:146
+#, c-format
+msgid "Toggles display of %s toolbar"
+msgstr "Comută afișarea barei de instrumente %s"
+
+#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
+msgid "View"
+msgstr "Vezi"
+
+#: Frame.cpp:146 Frame.cpp:149
+msgid "&View"
+msgstr "&Vezi"
+
+#: Frame.cpp:154
+msgid "Copy"
+msgstr "Copiază"
+
+#: Frame.cpp:156
+msgid "Copy All"
+msgstr "Copiați toate"
+
+#: Frame.cpp:161
+msgid "Edit"
+msgstr "Editați "
+
+#: Frame.cpp:164
+msgid "Auto Scroll"
+msgstr "Derulare automată"
+
+#: Frame.cpp:189
+msgid "Trace Log"
+msgstr "Jurnal de urmărire"
+
+#: 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 "Afișare în timp real a evenimentelor interne"
+
+#: 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ÉANT  Monitor de evenimente de legătură "

EventMonitor/locale/sl_SI.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # 

EventMonitor/locale/sr_RS.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Marko Eremija <marko.eremija@amres.ac.rs>, 2016
 # 

GEANTLink.sln

@@ -15,8 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS", "EAPMethods\EAP-
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-16.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}"
@@ -45,7 +43,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsiUseFeature", "MsiUseFeat
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventMonitor", "EventMonitor\EventMonitor.vcxproj", "{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}"
 EndProject
@@ -83,18 +81,6 @@ Global
 		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|Win32.Build.0 = Release|Win32
 		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.ActiveCfg = Release|x64
 		{331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.Build.0 = Release|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.Build.0 = Debug|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.ActiveCfg = Release|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.Build.0 = Release|ARM64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -353,7 +339,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{331B6077-E3E2-4867-B93E-9D3F57280DE7} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
 		{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{DD7A97CA-F18E-43B7-95C4-D06E6A291624} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C}

MSI/Base/locale/ca_ES.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # eduki <ecercos@xtec.cat>, 2016

MSI/Base/locale/de_DE.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # eduroam_devel <stefan.winter@restena.lu>, 2016

MSI/Base/locale/el_GR.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Vicky Kons <vickyk@admin.grnet.gr>, 2016

MSI/Base/locale/es_ES.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # José Manuel Macías, 2016
@@ -14,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"

MSI/Base/locale/et_EE.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2018
 # Anne M <anne@eenet.ee>, 2018

MSI/Base/locale/hr_HR.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Dubravko Penezic <dpenezic@gmail.com>, 2016

MSI/Base/locale/hu_HU.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # 

MSI/Base/locale/it_IT.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Nunzio Napolitano <nunzio.napolitano@uniparthenope.it>, 2017
@@ -14,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"

MSI/Base/locale/nb_NO.po

@@ -1,6 +1,7 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
-# Tom Ivar Myren <tom.myren@uninett.no>, 2016
+# Tom Ivar Myren <tom.myren@sikt.no>, 2016
 # 
 #, fuzzy
 msgid ""
@@ -8,7 +9,7 @@ msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2019-08-12 14:04+0200\n"
 "PO-Revision-Date: 2016-09-10 07:51+0000\n"
-"Last-Translator: Tom Ivar Myren <tom.myren@uninett.no>, 2016\n"
+"Last-Translator: Tom Ivar Myren <tom.myren@sikt.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"

MSI/Base/locale/pl_PL.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Tomasz Wolniewicz <tw2529@gmail.com>, 2016

MSI/Base/locale/pt_PT.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Pedro Simões <psimoes@fccn.pt>, 2016
@@ -14,7 +15,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"

MSI/Base/locale/ro_RO.po

@@ -0,0 +1,45 @@
+# 
+# Translators:
+# Raul Opruta <raul.opruta@roedu.net>, 2020
+# Simon Rozman <simon@rozman.si>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: GÉANTLink MSI\n"
+"POT-Creation-Date: 2019-08-12 14:04+0200\n"
+"PO-Revision-Date: 2016-09-10 07:51+0000\n"
+"Last-Translator: Simon Rozman <simon@rozman.si>, 2020\n"
+"Language-Team: Romanian (Romania) (https://www.transifex.com/eduroam_devel/teams/11799/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"X-Generator: Poedit 2.2.3\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-SearchPath-0: Main\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: Main/en_US.ARM64.Release.LaunchCondition-2.idtx:4
+#: Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
+#: Main/en_US.x64.Release.LaunchCondition-2.idtx:4
+msgid "[ProductName] requires Windows Vista or later version of Windows."
+msgstr ""
+"[ProductName] necesită Windows Vista sau versiunea ulterioară a Windows."
+
+#: Main/en_US.ARM64.Release.Property-2.idtx:4
+#: Main/en_US.ARM64.Release.Property-2.idtx:5
+#: Main/en_US.Win32.Release.Property-2.idtx:4
+#: Main/en_US.Win32.Release.Property-2.idtx:5
+#: Main/en_US.x64.Release.Property-2.idtx:4
+#: Main/en_US.x64.Release.Property-2.idtx:5
+msgid "http://www.geant.org/"
+msgstr "http://www.geant.org/"
+
+#: Main/en_US.ARM64.Release.Property-2.idtx:6
+#: Main/en_US.Win32.Release.Property-2.idtx:6
+#: Main/en_US.x64.Release.Property-2.idtx:6
+msgid "https://github.com/Amebis/GEANTLink/releases"
+msgstr "https://github.com/Amebis/GEANTLink/releases"

MSI/Base/locale/sl_SI.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # 

MSI/Base/locale/sr_RS.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Marko Eremija <marko.eremija@amres.ac.rs>, 2016

MSI/Base/locale/tr_TR.po

@@ -1,3 +1,4 @@
+# 
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2016
 # Gokhan Eryol <gokhaneryol@gmail.com>, 2017

MSI/MSIBuild

@@ -1 +1 @@
-Subproject commit 29009bb892cd31686fa40fab56770f9467865c33
+Subproject commit eccce8c523c9193c1e3a627e4dd8a80cd3cd5703

MsiUseFeature/Main.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
@@ -54,13 +40,14 @@ static int MsiUseFeature()
 
     if (nArgs > 2) {
         reg_key key;
-        if (!key.open(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\") _T(VENDOR_NAME_STR) _T("\\") _T(PRODUCT_NAME_STR), 0, KEY_READ)) {
-            OutputDebugStr(_T("Product registry key cannot be opened (error %u).\n"), GetLastError());
+        LSTATUS s = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\") _T(VENDOR_NAME_STR) _T("\\") _T(PRODUCT_NAME_STR), 0, KEY_READ, key);
+        if (s != ERROR_SUCCESS) {
+            OutputDebugStr(_T("Product registry key cannot be opened (error %u).\n"), s);
             return 3;
         }
 
         wstring lang;
-        LSTATUS s = RegQueryStringValue(key, _T("Language"), lang);
+        s = RegQueryStringValue(key, _T("Language"), lang);
         if (s != ERROR_SUCCESS) {
             OutputDebugStr(_T("Error reading registry value (error %u).\n"), s);
             return 3;
@@ -84,7 +71,8 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
     UNREFERENCED_PARAMETER(lpCmdLine);
     UNREFERENCED_PARAMETER(nCmdShow);
 
+    _CrtSetDbgFlag(_crtDbgFlag | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_CHECK_CRT_DF | _CRTDBG_LEAK_CHECK_DF);
+
     int res = MsiUseFeature();
-    assert(!_CrtDumpMemoryLeaks());
     return res;
 }

MsiUseFeature/MsiUseFeature.vcxproj

@@ -28,87 +28,39 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{679D03C5-CD70-4FFA-93F8-A4AB3637509B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
     <RootNamespace>MsiUseFeature</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <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>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\include\$(Platform).props" />
     <Import Project="..\include\$(Configuration).props" />
   </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\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" />
   </ItemGroup>
@@ -124,12 +76,6 @@
   <ItemGroup>
     <ResourceCompile Include="MsiUseFeature.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

MsiUseFeature/PCH.cpp

@@ -1,21 +1,7 @@
 /*
-    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/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"