From bda31a487fecd020db92f9f1582842f769304c37 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 9 Feb 2017 09:33:39 +0100 Subject: [PATCH] Revert "EAP-GTC method renamed to "EAP-GTC (Token Generator)"" This reverts commit 2908bc31a3ce309b866ab1b2eeae2b706a7feb29. --- EAPMethods/locale/EAPMethods.pot | 28 ++++++++++++++++++++++++++-- lib/TTLS_UI/src/TTLS_UI.cpp | 6 +++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/EAPMethods/locale/EAPMethods.pot b/EAPMethods/locale/EAPMethods.pot index 85806d9..5b2877d 100644 --- a/EAPMethods/locale/EAPMethods.pot +++ b/EAPMethods/locale/EAPMethods.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2017-02-09 08:06+0100\n" +"POT-Creation-Date: 2017-02-02 18:14+0100\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -782,7 +782,7 @@ msgid "EAP-MSCHAPv2" msgstr "" #: master/lib/TTLS_UI/src/TTLS_UI.cpp:132 -msgid "EAP-GTC (Token Generator)" +msgid "EAP-GTC" msgstr "" #: master/lib/TTLS_UI/src/TTLS_UI.cpp:135 @@ -884,38 +884,62 @@ msgstr "" msgid "EAP Identity Provider" msgstr "" +#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" +#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" +#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 +#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 +#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" +#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 +#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 +#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index d8726ef..060dc31 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -129,7 +129,7 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m wxMSCHAPv2ConfigPanel *panel_eapmschapv2 = new wxMSCHAPv2ConfigPanel(m_prov, m_cfg_eapmschapv2, m_inner_type); m_inner_type->AddPage(panel_eapmschapv2, _("EAP-MSCHAPv2")); wxGTCConfigPanel *panel_eapgtc = new wxGTCConfigPanel(m_prov, m_cfg_eapgtc, m_inner_type); - m_inner_type->AddPage(panel_eapgtc, _("EAP-GTC (Token Generator)")); + m_inner_type->AddPage(panel_eapgtc, _("EAP-GTC")); #if EAP_INNER_EAPHOST wxEapHostConfigPanel *panel_eaphost = new wxEapHostConfigPanel(m_prov, m_cfg_eaphost, m_inner_type); m_inner_type->AddPage(panel_eaphost, _("Other EAP methods...")); @@ -203,7 +203,7 @@ bool wxTTLSConfigWindow::TransferDataToWindow() case winstd::eap_type_gtc: m_cfg_eapgtc = dynamic_cast(*cfg_ttls.m_inner); - m_inner_type->SetSelection(3); // 3=EAP-GTC (Token Generator) + m_inner_type->SetSelection(3); // 3=EAP-GTC break; default: @@ -245,7 +245,7 @@ bool wxTTLSConfigWindow::TransferDataFromWindow() cfg_ttls.m_inner.reset(new eap::config_method_eapmschapv2(m_cfg_eapmschapv2)); break; - case 3: // 3=EAP-GTC (Token Generator) + case 3: // 3=EAP-GTC cfg_ttls.m_inner.reset(new eap::config_method_eapgtc(m_cfg_eapgtc)); break;