From 38afc6172ebfdbe023d981472431e396dca7b339 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 29 Sep 2016 14:36:36 +0200 Subject: [PATCH 01/54] Localization and compilation separated, as satisfied Localization target skipped building --- Makefile | Bin 172762 -> 187040 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index d72d9fe87a8577de59bbbd377a86d7cf7fc11040..56d67aa1e225d0aeb0a343dd0e4c6e7e1e188816 100644 GIT binary patch delta 174 zcmcb0lxx9O?hR_*%^u#{J-iv`2~JkquQdHaEThEszF5W|ykKraE|9C0!?*{^t!5ON z4wQA8-T-86zf;B72bP$ea7bo4P?-~mG1=ju%Cu@mH6Yt&I!_#<(PV>z0^4l@7<+i8 vZ|G)Z+x{Ykv4Ic5?8s(xfHGfHGNwS7(}AK9lVf;!+Anl4ZokmM#3cm)<8(ox delta 90 zcmZ3mmHXCFt_^D5(=SvoN;J!OZ99*ha><$#Ogb(_bxSRGRJ(%P6t^Uku|9 nUXX;}_H&CFzwk~!SHUQ^9mr4P12e%=?R5tjx7QtDQj!7yo9HD% From 67003bd478e1af2c16e922fcbf7bc974affd658e Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 29 Sep 2016 14:37:43 +0200 Subject: [PATCH 02/54] Switching inner authentication method re-layouts configuration dialog now --- lib/TTLS_UI/include/TTLS_UI.h | 1 + lib/TTLS_UI/src/TTLS_UI.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h index 0007799..5ceaf70 100644 --- a/lib/TTLS_UI/include/TTLS_UI.h +++ b/lib/TTLS_UI/include/TTLS_UI.h @@ -132,6 +132,7 @@ protected: virtual bool TransferDataFromWindow(); virtual void OnInitDialog(wxInitDialogEvent& event); virtual void OnUpdateUI(wxUpdateUIEvent& event); + virtual void OnInnerTypeChoice(wxCommandEvent& event); /// \endcond protected: diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index 27f1eeb..c4e406c 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -219,12 +219,14 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m panel_pap->SetFocusFromKbd(); this->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI)); + m_inner_type->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this); } wxTTLSConfigWindow::~wxTTLSConfigWindow() { this->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI)); + m_inner_type->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this); } @@ -291,3 +293,9 @@ void wxTTLSConfigWindow::OnUpdateUI(wxUpdateUIEvent& /*event*/) { m_inner_type->GetChoiceCtrl()->Enable(!m_prov.m_read_only); } + + +void wxTTLSConfigWindow::OnInnerTypeChoice(wxCommandEvent& /*event*/) +{ + Layout(); +} From 8d44e750d1d8fbd9e7006968eb530e545a1d6669 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 29 Sep 2016 15:28:35 +0200 Subject: [PATCH 03/54] Revert "Switching inner authentication method re-layouts configuration dialog now" This reverts commit 67003bd478e1af2c16e922fcbf7bc974affd658e. --- lib/TTLS_UI/include/TTLS_UI.h | 1 - lib/TTLS_UI/src/TTLS_UI.cpp | 8 -------- 2 files changed, 9 deletions(-) diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h index 5ceaf70..0007799 100644 --- a/lib/TTLS_UI/include/TTLS_UI.h +++ b/lib/TTLS_UI/include/TTLS_UI.h @@ -132,7 +132,6 @@ protected: virtual bool TransferDataFromWindow(); virtual void OnInitDialog(wxInitDialogEvent& event); virtual void OnUpdateUI(wxUpdateUIEvent& event); - virtual void OnInnerTypeChoice(wxCommandEvent& event); /// \endcond protected: diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index c4e406c..27f1eeb 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -219,14 +219,12 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m panel_pap->SetFocusFromKbd(); this->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI)); - m_inner_type->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this); } wxTTLSConfigWindow::~wxTTLSConfigWindow() { this->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI)); - m_inner_type->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this); } @@ -293,9 +291,3 @@ void wxTTLSConfigWindow::OnUpdateUI(wxUpdateUIEvent& /*event*/) { m_inner_type->GetChoiceCtrl()->Enable(!m_prov.m_read_only); } - - -void wxTTLSConfigWindow::OnInnerTypeChoice(wxCommandEvent& /*event*/) -{ - Layout(); -} From 1d94f44d733b575375aaff4e1a7aabf9f40cfb39 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 30 Sep 2016 09:46:51 +0200 Subject: [PATCH 04/54] OnUpdateUI events are propagated to parent classes now --- lib/EAPBase_UI/include/EAP_UI.h | 8 ++++++-- lib/TLS_UI/src/TLS_UI.cpp | 8 ++++++-- lib/TTLS_UI/src/TTLS_UI.cpp | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index ed4026f..b82c83e 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -240,8 +240,10 @@ protected: } - virtual void OnUpdateUI(wxUpdateUIEvent& /*event*/) + virtual void OnUpdateUI(wxUpdateUIEvent& event) { + wxEAPConfigDialogBase::OnUpdateUI(event); + int idx = m_providers->GetSelection(); if (idx != wxNOT_FOUND) { eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider(); @@ -630,8 +632,10 @@ protected: } - virtual void OnUpdateUI(wxUpdateUIEvent& /*event*/) + virtual void OnUpdateUI(wxUpdateUIEvent& event) { + wxEAPCredentialsConfigPanelBase::OnUpdateUI(event); + if (m_cfg.m_allow_save) { if (m_storage->GetValue()) { m_storage_identity->Enable(true); diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index 7fd432d..9acc0c9 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -382,8 +382,10 @@ bool wxTLSCredentialsPanel::TransferDataFromWindow() } -void wxTLSCredentialsPanel::OnUpdateUI(wxUpdateUIEvent& /*event*/) +void wxTLSCredentialsPanel::OnUpdateUI(wxUpdateUIEvent& event) { + wxEAPCredentialsPanel::OnUpdateUI(event); + if (!m_is_config && m_cfg.m_use_cred) { // Credential prompt mode & Using configured credentials m_certificate->Enable(false); @@ -452,8 +454,10 @@ bool wxTLSServerTrustPanel::TransferDataFromWindow() } -void wxTLSServerTrustPanel::OnUpdateUI(wxUpdateUIEvent& /*event*/) +void wxTLSServerTrustPanel::OnUpdateUI(wxUpdateUIEvent& event) { + wxTLSServerTrustPanelBase::OnUpdateUI(event); + if (m_prov.m_read_only) { // This is provider-locked configuration. Disable controls. m_root_ca_add_store->Enable(false); diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index 27f1eeb..c2bcfd1 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -144,8 +144,10 @@ bool wxTTLSConfigPanel::TransferDataFromWindow() } -void wxTTLSConfigPanel::OnUpdateUI(wxUpdateUIEvent& /*event*/) +void wxTTLSConfigPanel::OnUpdateUI(wxUpdateUIEvent& event) { + wxTTLSConfigPanelBase::OnUpdateUI(event); + if (m_prov.m_read_only) { // This is provider-locked configuration. Disable controls. m_outer_identity_same ->Enable(false); @@ -287,7 +289,9 @@ void wxTTLSConfigWindow::OnInitDialog(wxInitDialogEvent& event) } -void wxTTLSConfigWindow::OnUpdateUI(wxUpdateUIEvent& /*event*/) +void wxTTLSConfigWindow::OnUpdateUI(wxUpdateUIEvent& event) { m_inner_type->GetChoiceCtrl()->Enable(!m_prov.m_read_only); + + event.Skip(); } From 420cf112645357f0919d726193b3768affef2efb Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 30 Sep 2016 10:09:11 +0200 Subject: [PATCH 05/54] OnInitDialog events are propagated to parent classes now --- lib/EAPBase_UI/include/EAP_UI.h | 2 ++ lib/EAPBase_UI/src/EAP_UI.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index b82c83e..daf5415 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -231,6 +231,8 @@ protected: virtual void OnInitDialog(wxInitDialogEvent& event) { + wxEAPConfigDialogBase::OnInitDialog(event); + // Forward the event to child panels. for (wxWindowList::compatibility_iterator provider = m_providers->GetChildren().GetFirst(); provider; provider = provider->GetNext()) { wxWindow *prov = wxDynamicCast(provider->GetData(), wxWindow); diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp index 7a18485..04c6c5f 100644 --- a/lib/EAPBase_UI/src/EAP_UI.cpp +++ b/lib/EAPBase_UI/src/EAP_UI.cpp @@ -81,6 +81,8 @@ void wxEAPGeneralDialog::AddContent(wxPanel *content) void wxEAPGeneralDialog::OnInitDialog(wxInitDialogEvent& event) { + wxEAPGeneralDialogBase::OnInitDialog(event); + for (wxSizerItemList::compatibility_iterator panel = m_panels->GetChildren().GetFirst(); panel; panel = panel->GetNext()) panel->GetData()->GetWindow()->GetEventHandler()->ProcessEvent(event); } @@ -127,6 +129,8 @@ wxEAPCredentialsConnectionDialog::wxEAPCredentialsConnectionDialog(wxWindow *par void wxEAPCredentialsConnectionDialog::OnInitDialog(wxInitDialogEvent& event) { + wxEAPCredentialsConnectionDialogBase::OnInitDialog(event); + // Forward the event to child panels. for (wxWindowList::compatibility_iterator provider = m_providers->GetChildren().GetFirst(); provider; provider = provider->GetNext()) { wxWindow *prov = wxDynamicCast(provider->GetData(), wxWindow); @@ -282,10 +286,12 @@ wxEAPConfigWindow::~wxEAPConfigWindow() } -void wxEAPConfigWindow::OnInitDialog(wxInitDialogEvent& /*event*/) +void wxEAPConfigWindow::OnInitDialog(wxInitDialogEvent& event) { // Call TransferDataToWindow() manually, as wxScrolledWindow somehow skips that. TransferDataToWindow(); + + event.Skip(); } From 03699691934b81f8d59f0ef7018fef7668927165 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 30 Sep 2016 10:57:08 +0200 Subject: [PATCH 06/54] Remove CA button enable/disable logic fixed after CA list box switched to single selection in c371187edcc407ae7a1927ceefc1fa3c3220adf5 commit --- lib/TLS_UI/src/TLS_UI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index 9acc0c9..d3a605e 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -468,7 +468,7 @@ void wxTLSServerTrustPanel::OnUpdateUI(wxUpdateUIEvent& event) // This is not a provider-locked configuration. Selectively enable/disable controls. m_root_ca_add_store->Enable(true); m_root_ca_add_file ->Enable(true); - m_root_ca_remove ->Enable(ListBox_GetSelCount(m_root_ca->GetHWND()) ? true : false); // * + m_root_ca_remove ->Enable(m_root_ca->HasMultipleSelection() && ListBox_GetSelCount(m_root_ca->GetHWND()) > 0 || m_root_ca->GetSelection() != wxNOT_FOUND); // * m_server_names ->Enable(true); // * ListBox_GetSelCount() is not cross-platform, but this is Windows EAP Supplicant, From 2e6d8941b252e1def1d355b1dae607ef53d825d9 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 30 Sep 2016 10:58:46 +0200 Subject: [PATCH 07/54] Various events are propagated to parent classes now --- EventMonitor/Frame.cpp | 3 ++- lib/EAPBase_UI/include/EAP_UI.h | 32 ++++++++++++++++++++++++-------- lib/TLS_UI/src/TLS_UI.cpp | 16 +++++++++++----- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/EventMonitor/Frame.cpp b/EventMonitor/Frame.cpp index a9e05d6..b07f305 100644 --- a/EventMonitor/Frame.cpp +++ b/EventMonitor/Frame.cpp @@ -261,9 +261,10 @@ wxEventMonitorFrame::~wxEventMonitorFrame() } -void wxEventMonitorFrame::OnExit(wxCommandEvent& /*event*/) +void wxEventMonitorFrame::OnExit(wxCommandEvent& event) { Close(); + event.Skip(); } diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index daf5415..006f538 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -258,8 +258,10 @@ protected: } - virtual void OnProvAdd(wxCommandEvent& /*event*/) + virtual void OnProvAdd(wxCommandEvent& event) { + wxEAPConfigDialogBase::OnProvAdd(event); + // One method std::unique_ptr cfg_method(m_cfg.m_module.make_config_method()); @@ -288,8 +290,10 @@ protected: } - virtual void OnProvRemove(wxCommandEvent& /*event*/) + virtual void OnProvRemove(wxCommandEvent& event) { + wxEAPConfigDialogBase::OnProvRemove(event); + int idx = m_providers->GetSelection(); eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider(); @@ -308,8 +312,10 @@ protected: } - virtual void OnProvAdvanced(wxCommandEvent& /*event*/) + virtual void OnProvAdvanced(wxCommandEvent& event) { + wxEAPConfigDialogBase::OnProvAdvanced(event); + int idx = m_providers->GetSelection(); eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider(); @@ -681,8 +687,10 @@ protected: } - virtual void OnSetStorage(wxCommandEvent& /*event*/) + virtual void OnSetStorage(wxCommandEvent& event) { + wxEAPCredentialsConfigPanelBase::OnSetStorage(event); + m_timer_storage.Stop(); // Read credentials from Credential Manager. @@ -711,8 +719,10 @@ protected: } - virtual void OnClearStorage(wxCommandEvent& /*event*/) + virtual void OnClearStorage(wxCommandEvent& event) { + wxEAPCredentialsConfigPanelBase::OnClearStorage(event); + m_timer_storage.Stop(); if (CredDelete(m_cred_storage.target_name(m_prov.get_id().c_str(), m_cfg.m_level).c_str(), CRED_TYPE_GENERIC, 0)) { @@ -726,8 +736,10 @@ protected: } - virtual void OnSetConfig(wxCommandEvent& /*event*/) + virtual void OnSetConfig(wxCommandEvent& event) { + wxEAPCredentialsConfigPanelBase::OnSetConfig(event); + wxEAPCredentialsDialog dlg(m_prov, this); _wxT *panel = new _wxT(m_prov, m_cfg, m_cred_config, &dlg, true); @@ -738,8 +750,10 @@ protected: } - virtual void OnTimerStorage(wxTimerEvent& /*event*/) + virtual void OnTimerStorage(wxTimerEvent& event) { + wxEAPCredentialsConfigPanelBase::OnTimerStorage(event); + if (m_storage_identity->IsShownOnScreen()) RetrieveStorageCredentials(); } @@ -928,8 +942,10 @@ protected: return true; } - virtual void OnPasswordText(wxCommandEvent& /*event*/) + virtual void OnPasswordText(wxCommandEvent& event) { + wxEAPCredentialsPanel<_Tcred, _Tbase>::OnPasswordText(event); + m_password_set = true; } diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index d3a605e..ff9572f 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -480,14 +480,18 @@ void wxTLSServerTrustPanel::OnUpdateUI(wxUpdateUIEvent& event) void wxTLSServerTrustPanel::OnRootCADClick(wxCommandEvent& event) { + wxTLSServerTrustPanelBase::OnRootCADClick(event); + wxCertificateClientData *cert = dynamic_cast(event.GetClientObject()); if (cert) CryptUIDlgViewContext(CERT_STORE_CERTIFICATE_CONTEXT, cert->m_cert, this->GetHWND(), NULL, 0, NULL); } -void wxTLSServerTrustPanel::OnRootCAAddStore(wxCommandEvent& /*event*/) +void wxTLSServerTrustPanel::OnRootCAAddStore(wxCommandEvent& event) { + wxTLSServerTrustPanelBase::OnRootCAAddStore(event); + winstd::cert_store store; if (store.create(NULL, _T("ROOT"))) { winstd::cert_context cert; @@ -500,6 +504,8 @@ void wxTLSServerTrustPanel::OnRootCAAddStore(wxCommandEvent& /*event*/) void wxTLSServerTrustPanel::OnRootCAAddFile(wxCommandEvent& event) { + wxTLSServerTrustPanelBase::OnRootCAAddFile(event); + const wxString separator(wxT("|")); wxFileDialog open_dialog(this, _("Add Certificate"), wxEmptyString, wxEmptyString, _("Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)") + separator + wxT("*.cer;*.crt;*.der;*.p7b;*.pem") + separator + @@ -507,10 +513,8 @@ void wxTLSServerTrustPanel::OnRootCAAddFile(wxCommandEvent& event) _("PKCS #7 Certificate Files (*.p7b)") + separator + wxT("*.p7b") + separator + _("All Files (*.*)") + separator + wxT("*.*"), wxFD_OPEN|wxFD_FILE_MUST_EXIST|wxFD_MULTIPLE); - if (open_dialog.ShowModal() == wxID_CANCEL) { - event.Skip(); + if (open_dialog.ShowModal() == wxID_CANCEL) return; - } wxArrayString paths; open_dialog.GetPaths(paths); @@ -526,8 +530,10 @@ void wxTLSServerTrustPanel::OnRootCAAddFile(wxCommandEvent& event) } -void wxTLSServerTrustPanel::OnRootCARemove(wxCommandEvent& /*event*/) +void wxTLSServerTrustPanel::OnRootCARemove(wxCommandEvent& event) { + wxTLSServerTrustPanelBase::OnRootCARemove(event); + wxArrayInt selections; for (int i = m_root_ca->GetSelections(selections); i--; ) m_root_ca->Delete(selections[i]); From 1afbef7e2eafb545dcf31ba440e9d12223661616 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 30 Sep 2016 14:24:49 +0200 Subject: [PATCH 08/54] Explicit server certificate check introduced --- lib/Events/res/EventsETW.man | Bin 103110 -> 103654 bytes lib/TLS/src/Method.cpp | 10 ++++++++++ 2 files changed, 10 insertions(+) diff --git a/lib/Events/res/EventsETW.man b/lib/Events/res/EventsETW.man index 9366d8da6c33d46d86d307b3da3cdbb3a14c15bc..2e586a0062936175ad85cb8cd3caf49946797ed6 100644 GIT binary patch delta 143 zcmX@MlB-`X^7k#ErU}9`wc4erTZ1_)g zx(PF*6{E@ad}hXjz0-5j82P3fw%<7s+=A@kx_BF+9bvW0Esg$SO5S3 delta 73 zcmaF1lI_@1wuUW?GR%|h{z*)q#lmRCZp@$uf|CuoM7MunVO-Wb{arny!1Onh8TqDf Vn#9-w=c-N5n#?FS-E9iv0szSP8tDK4 diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index 800457c..25ebfbc 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -1306,6 +1306,16 @@ void eap::method_tls::verify_server_trust() const throw sec_runtime_error(status, __FUNCTION__ " Error retrieving server certificate from Schannel."); #endif + for (list::const_iterator c = m_cfg.m_trusted_root_ca.cbegin(), c_end = m_cfg.m_trusted_root_ca.cend(); c != c_end; ++c) { + if (cert->cbCertEncoded == (*c)->cbCertEncoded && + memcmp(cert->pbCertEncoded, (*c)->pbCertEncoded, cert->cbCertEncoded) == 0) + { + // Server certificate found directly on the trusted root CA list. + m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_TRUSTED_EX, event_data::blank); + return; + } + } + // Check server name. if (!m_cfg.m_server_names.empty()) { bool From f0f3d5bbced6b6cd9d5e1dba4618d27a4fbbfaa6 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 30 Sep 2016 14:32:42 +0200 Subject: [PATCH 09/54] Translation update --- EAPMethods/locale/bg_BG.po | 317 +++++++++++++++---------------- EAPMethods/locale/ca_ES.po | 317 +++++++++++++++---------------- EAPMethods/locale/cs_CZ.po | 317 +++++++++++++++---------------- EAPMethods/locale/cy_UK.po | 317 +++++++++++++++---------------- EAPMethods/locale/de_DE.po | 359 +++++++++++++++++------------------ EAPMethods/locale/el_GR.po | 350 ++++++++++++++++------------------ EAPMethods/locale/es_ES.po | 350 +++++++++++++++++----------------- EAPMethods/locale/eu_ES.po | 317 +++++++++++++++---------------- EAPMethods/locale/fi_FI.po | 317 +++++++++++++++---------------- EAPMethods/locale/fr_CA.po | 317 +++++++++++++++---------------- EAPMethods/locale/fr_FR.po | 317 +++++++++++++++---------------- EAPMethods/locale/gl_ES.po | 317 +++++++++++++++---------------- EAPMethods/locale/hr_HR.po | 337 ++++++++++++++++---------------- EAPMethods/locale/hu_HU.po | 317 +++++++++++++++---------------- EAPMethods/locale/is_IS.po | 317 +++++++++++++++---------------- EAPMethods/locale/it_IT.po | 321 ++++++++++++++++--------------- EAPMethods/locale/lt_LT.po | 348 +++++++++++++++++---------------- EAPMethods/locale/nb_NO.po | 341 ++++++++++++++++----------------- EAPMethods/locale/nl_NL.po | 317 +++++++++++++++---------------- EAPMethods/locale/pl_PL.po | 339 ++++++++++++++++----------------- EAPMethods/locale/pt_PT.po | 317 +++++++++++++++---------------- EAPMethods/locale/ru_RU.po | 317 +++++++++++++++---------------- EAPMethods/locale/sk_SK.po | 317 +++++++++++++++---------------- EAPMethods/locale/sl_SI.po | 354 +++++++++++++++++----------------- EAPMethods/locale/sr_RS.po | 317 +++++++++++++++---------------- EAPMethods/locale/sv_SE.po | 317 +++++++++++++++---------------- EAPMethods/locale/tr_TR.po | 317 +++++++++++++++---------------- EAPMethods/locale/vi_VN.po | 317 +++++++++++++++---------------- EventMonitor/locale/bg_BG.po | 34 ++-- EventMonitor/locale/ca_ES.po | 34 ++-- EventMonitor/locale/cs_CZ.po | 34 ++-- EventMonitor/locale/cy_UK.po | 34 ++-- EventMonitor/locale/de_DE.po | 56 +++--- EventMonitor/locale/el_GR.po | 33 ++-- EventMonitor/locale/es_ES.po | 33 ++-- EventMonitor/locale/eu_ES.po | 34 ++-- EventMonitor/locale/fi_FI.po | 34 ++-- EventMonitor/locale/fr_CA.po | 34 ++-- EventMonitor/locale/fr_FR.po | 34 ++-- EventMonitor/locale/gl_ES.po | 34 ++-- EventMonitor/locale/hr_HR.po | 33 ++-- EventMonitor/locale/hu_HU.po | 34 ++-- EventMonitor/locale/is_IS.po | 34 ++-- EventMonitor/locale/it_IT.po | 34 ++-- EventMonitor/locale/lt_LT.po | 33 ++-- EventMonitor/locale/nb_NO.po | 33 ++-- EventMonitor/locale/nl_NL.po | 34 ++-- EventMonitor/locale/pl_PL.po | 33 ++-- EventMonitor/locale/pt_PT.po | 33 ++-- EventMonitor/locale/ru_RU.po | 34 ++-- EventMonitor/locale/sk_SK.po | 34 ++-- EventMonitor/locale/sl_SI.po | 33 ++-- EventMonitor/locale/sr_RS.po | 34 ++-- EventMonitor/locale/sv_SE.po | 34 ++-- EventMonitor/locale/tr_TR.po | 34 ++-- EventMonitor/locale/vi_VN.po | 34 ++-- MSI/Base/locale/bg_BG.po | 18 +- MSI/Base/locale/ca_ES.po | 18 +- MSI/Base/locale/cs_CZ.po | 18 +- MSI/Base/locale/cy_UK.po | 18 +- MSI/Base/locale/de_DE.po | 18 +- MSI/Base/locale/el_GR.po | 20 +- MSI/Base/locale/es_ES.po | 18 +- MSI/Base/locale/eu_ES.po | 18 +- MSI/Base/locale/fi_FI.po | 18 +- MSI/Base/locale/fr_CA.po | 18 +- MSI/Base/locale/fr_FR.po | 18 +- MSI/Base/locale/gl_ES.po | 18 +- MSI/Base/locale/hr_HR.po | 18 +- MSI/Base/locale/hu_HU.po | 18 +- MSI/Base/locale/is_IS.po | 18 +- MSI/Base/locale/it_IT.po | 18 +- MSI/Base/locale/lt_LT.po | 18 +- MSI/Base/locale/nb_NO.po | 18 +- MSI/Base/locale/nl_NL.po | 18 +- MSI/Base/locale/pl_PL.po | 18 +- MSI/Base/locale/pt_PT.po | 18 +- MSI/Base/locale/ru_RU.po | 18 +- MSI/Base/locale/sk_SK.po | 24 +-- MSI/Base/locale/sl_SI.po | 18 +- MSI/Base/locale/sr_RS.po | 18 +- MSI/Base/locale/sv_SE.po | 18 +- MSI/Base/locale/tr_TR.po | 18 +- MSI/Base/locale/vi_VN.po | 18 +- MSI/MSIBuild | 2 +- WLANManager/locale/bg_BG.po | 30 ++- WLANManager/locale/ca_ES.po | 30 ++- WLANManager/locale/cs_CZ.po | 30 ++- WLANManager/locale/cy_UK.po | 30 ++- WLANManager/locale/de_DE.po | 30 ++- WLANManager/locale/el_GR.po | 30 ++- WLANManager/locale/es_ES.po | 30 ++- WLANManager/locale/eu_ES.po | 30 ++- WLANManager/locale/fi_FI.po | 30 ++- WLANManager/locale/fr_CA.po | 30 ++- WLANManager/locale/fr_FR.po | 30 ++- WLANManager/locale/gl_ES.po | 30 ++- WLANManager/locale/hr_HR.po | 30 ++- WLANManager/locale/hu_HU.po | 30 ++- WLANManager/locale/is_IS.po | 30 ++- WLANManager/locale/it_IT.po | 30 ++- WLANManager/locale/lt_LT.po | 30 ++- WLANManager/locale/nb_NO.po | 30 ++- WLANManager/locale/nl_NL.po | 30 ++- WLANManager/locale/pl_PL.po | 30 ++- WLANManager/locale/pt_PT.po | 30 ++- WLANManager/locale/ru_RU.po | 30 ++- WLANManager/locale/sk_SK.po | 33 ++-- WLANManager/locale/sl_SI.po | 29 ++- WLANManager/locale/sr_RS.po | 30 ++- WLANManager/locale/sv_SE.po | 30 ++- WLANManager/locale/tr_TR.po | 30 ++- WLANManager/locale/vi_VN.po | 30 ++- 113 files changed, 5495 insertions(+), 5949 deletions(-) diff --git a/EAPMethods/locale/bg_BG.po b/EAPMethods/locale/bg_BG.po index bd70511..9c07256 100644 --- a/EAPMethods/locale/bg_BG.po +++ b/EAPMethods/locale/bg_BG.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1251" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/ca_ES.po b/EAPMethods/locale/ca_ES.po index 1203e72..a6642d2 100644 --- a/EAPMethods/locale/ca_ES.po +++ b/EAPMethods/locale/ca_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: ca_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/cs_CZ.po b/EAPMethods/locale/cs_CZ.po index 9629240..e03995c 100644 --- a/EAPMethods/locale/cs_CZ.po +++ b/EAPMethods/locale/cs_CZ.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/eduroam_devel/teams/11799/cs_CZ/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/cy_UK.po b/EAPMethods/locale/cy_UK.po index a4f6f37..6e2a069 100644 --- a/EAPMethods/locale/cy_UK.po +++ b/EAPMethods/locale/cy_UK.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Welsh (https://www.transifex.com/eduroam_devel/teams/11799/cy/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: cy\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/de_DE.po b/EAPMethods/locale/de_DE.po index 27cdc0c..22d689c 100644 --- a/EAPMethods/locale/de_DE.po +++ b/EAPMethods/locale/de_DE.po @@ -3,23 +3,24 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: eduroam_devel , 2016\n" +"Last-Translator: Eric Hoch , 2016\n" "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -28,7 +29,7 @@ msgstr "+" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38 msgid "Adds new provider" -msgstr "Fügt einen neuen Identitätsprovider hinzu" +msgstr "Fügt einen neuen Anbieter hinzu" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42 msgid "-" @@ -36,7 +37,7 @@ msgstr "-" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43 msgid "Removes selected provider" -msgstr "Entfernt den ausgewählten Identitätsprovider" +msgstr "Entfernt den ausgewählten Anbieter" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47 msgid "Advanced..." @@ -44,100 +45,101 @@ msgstr "Fortgeschritten..." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:48 msgid "Opens dialog with provider settings" -msgstr "Öffnet den Dialog mit den Einstellungen für den Identitätsprovider" +msgstr "Öffnet den Dialog mit den Einstellungen für den Anbieter" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" -msgstr "Nutzerdaten" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" +msgstr "%s Benutzername" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." -msgstr "Verwaltet die Nutzerdaten die zum Einloggen nötig sind." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." +msgstr "Wählen sie die Datei in der ihre Anmeldedateien gespeichert sind" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" -msgstr "&Eigene Zugangsdaten eingeben:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" +msgstr "Benutze die Daten aus dem Schlüsselbund" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" msgstr "" -"Wählen Sie diese Option wenn Sie Ihre persönlichen Nutzerdaten selbst " -"eingeben möchten" +"Wählen sie diese Option aus um die Daten aus der Windowsanmeldung zu " +"verwenden. " + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" +msgstr "Ihre aktuell für die Windowsanmeldung gespeicherten Daten" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "Laden der Nutzerdaten aus der Anmeldeinformationsverwaltung" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "Nutzerdaten &löschen" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -"Klicken Sie hier, um Ihre Nutzerdaten aus der Anmeldeinformationsverwaltung " -"zu löschen. Hinweis: Sie werden dann bei der nächsten Verbindung zur Eingabe" -" Ihrer Nutzerdaten aufgefordert." +"Klicken Sie hier, um Ihre Anmeldedaten aus der Anmeldeinformationsverwaltung" +" zu löschen. Hinweis: Sie werden dann bei der nächsten Verbindung zur " +"Eingabe Ihrer Nutzerdaten aufgefordert." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "Nutzerdaten &festlegen..." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" -msgstr "Klicken Sie hier um Ihre Nutzerdaten einzugeben oder zu ändern" +msgstr "Klicken Sie hier um Ihre Anmeldedaten einzugeben oder zu ändern" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" -msgstr "Nutzderdaten aus der &Konfigurationsdatei verwenden:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" +msgstr "Verwende die Anmeldedaten aus der &Profilkonfiguration" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -"Verwenden Sie diese Option wenn Ihre Nutzerdaten bereits in der " -"Konfigurationsdatei geliefert wurden" +"Wählren Sie diese Option, wenn sie ihre Anmeldedaten als Teil der " +"Profilkonfiguration speichern wollen" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" -msgstr "Vorkonfigurierte Nutzerdaten" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" +msgstr "Profilkonfiguration" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "Benutzername und Passwort" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "Bitte geben Sie Ihren Benutzernamen und das Passwort ein." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "Benutzername:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" "Geben Sie hier Ihren Benutzernamen ein (z.B nutzer@domain.org, " "DOMAIN\\nutzer, ...)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "Passwort:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "Geben Sie hier Ihr Passwort ein" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "&Speichern" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "Wählen Sie hier, ob Sie Benutzername und Passwort speichern möchten" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "Ihre Organisation" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." @@ -146,54 +148,54 @@ msgstr "" "gestalten. Die organisationsspezifische Anpassung macht es Ihren Nutzern " "leichter, das Programm zu benutzen." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "&Name der Organisation:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" "Der Name Ihrer Organisation, so wie er dem Nutzer bei den Hilfe- und " "Kontaktmöglichkeiten angezeigt wird" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "(fassen Sie sich bitte kurz)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "&Hilfe und Kontaktmöglichkeiten:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "Webseite für Hilfe und Kontakt" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "E-Mail Adresse für Hilfe und Kontakt" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "Telefonnummer für Hilfe und Kontakt" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "Eindeutige Kennzeichnung des Identitätsproviders" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." @@ -201,33 +203,33 @@ msgstr "" "Geben Sie Ihrem Identitätsprovider eine eindeutige Bezeichnung damit er von " "anderen Konfigurationsdateien unterschieden werden kann." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "Namens&raum:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "&Identifikation im Namensraum:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" "Eindeutige Kennzeichnung Ihrer Organisation um Nutzerdaten " "profilübergreifend nutzen zu können" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "Konfiguration sperren" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." @@ -236,7 +238,7 @@ msgstr "" "den Nutzer zu verhindern. Der Nutzer kann dann nur seinen Benutzernamen und " "Passwort ändern." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." @@ -244,44 +246,44 @@ msgstr "" "Konfiguration s&perren und weitere Änderungen durch die " "Benutzerschnittstelle verhindern." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" "(Warnung: sobald die Konfiguration gesperrt ist, können Sie sie hier nicht " "mehr verändern!)" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "%s Nutzerdaten" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "EAP Nutzerdaten" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "Für Hilfe und weitere Anleitungen kontaktieren Sie bitte %s via:" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "ihren Identitätsprovider" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "Öffnen Sie im Webbrowser" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "Öffnen Sie Ihr E-Mail Programm" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "Wählen Sie die Telefonnummer" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " @@ -290,36 +292,44 @@ msgstr "" "%s hat einige der Konfigurationsdaten voreingestellt. Diese Daten sind " "gesperrt um unbeabsichtigte Änderungen zu vermeiden." -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "Ihr Identitätsprovider" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "Der vorige Anmeldeversuch schlug fehl wegen falscher Nutzerdaten." -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" "Der vorige Anmeldeversuch schlug fehl weil die Nutzerdaten abgelaufen sind." -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" "Der vorige Anmeldeversuch meldete dass Ihre Nutzerdaten geändert werden " "müssen." -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "Der vorige Anmeldeversuch schlug fehl." -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" "Bitte stellen Sie sicher dass ihre Nutzerdaten korrekt sind, oder versuchen " "Sie es später noch einmal." +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "Benutzername und Passwort für MSCHAPv2" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "Benutzername und Passwort für PAP" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "Vertrauenseinstellungen: Server" @@ -337,10 +347,12 @@ msgid "Acceptable Certificate Authorities:" msgstr "Vertrauenseinstellungen: Zertifizierungsstellen (CAs)" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" -"Liste der Zertifizierungsstellen (CAs), von denen das Serverzertifikat " -"stammen muss" +"Das Severzertifikat muss von einer der hier aufgeführten " +"Zertifizierungsstellen stammen" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." @@ -385,62 +397,31 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "(Beispiel: foo.bar.com;server2.bar.com)" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" -msgstr "Nutzerzertifikat" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" +msgstr "Benutzerzertifikat" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." -msgstr "" -"Bitte wählen Sie Ihr Nutzerzertifikat wenn eines für die Anmeldung benötigt " -"wird." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." +msgstr "Bitte wählen Sie ihr Benutzer&zertifikat für die Identifizierung aus" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "Anmelden &ohne Nutzerzertifikat" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" -"Wählen Sie diese Option aus, wenn ihr Identitätsprovider keine " -"Nutzerzertifikate fürs Anmelden fordert" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "Das folgende Nutzer&zertifkat nutzen:" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" -"Wählen Sie diese Option aus, wenn Sie zur Anmeldung ein Nutzerzertifikat " -"benötigen" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "Nutzerzertifikat für Anmeldung" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "Ab&weichender Nutzername:" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -"Ihr Nutzername (nutzer@domain) wenn abweichend vom Namen im " -"Nutzerzertifikat; oder leer lassen um den Namen im Nutzerzertifikat zu " +"Ihr Benutzername (nutzer@domain) wenn abweichend vom Namen im " +"Benutzerzertifikat; oder leer lassen um den Namen im Benutzerzertifikat zu " "verwenden" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "(Beispiel: nutzer@domain.com)" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "Möchten Sie diese Zertifikatseinstellungen speichern?" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -450,32 +431,37 @@ msgstr "Ungültiger Buchstabe im Servernamen gefunden: %c" msgid "Validation conflict" msgstr "Fehler bei der Validierung" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "Zertifikat hinzufügen" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "Zertifikatsdateien (*.cer;*.crt;*.der;*.p7b;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "X.509 Zertifikatsdateien (*.cer;*.crt;*.der;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "PKCS #7 Zertifikatsdateien (*.p7b)" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "Alle Dateien (*.*)" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "Ungültige oder nicht unterstützte Zertifikatsdatei %s" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "Fehler" @@ -519,41 +505,41 @@ msgstr "" msgid "Custom outer identity to use" msgstr "Zu verwendender Nutzername" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" "Fehler beim Speichern der Nutzerdaten in der Anmeldeinformationsverwaltung: " "%hs (Fehler %u)" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "Speichern der Nutzerdaten fehlgeschlagen." -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "Verschlüsselte Anmeldungsphase" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 +msgid "Outer Authentication" +msgstr "Unverschlüsselte Anmeldungsphase" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 msgid "Select inner authentication method from the list" msgstr "" "Wählen Sie die Anmeldemethode im verschlüsselten Teil der Verbindung aus" -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 msgid "PAP" msgstr "PAP" -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 -msgid "Outer Authentication" -msgstr "Unverschlüsselte Anmeldungsphase" - -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" @@ -561,36 +547,40 @@ msgstr "" "Sind Sie sicher, dass Sie den Identitätsprovider %ls aus der Konfiguration " "löschen möchten?" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "Warnung" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "Identitätsprovider Einstellungen" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "Löschen der Nutzerdaten fehlgeschlagen (Fehler %u)." -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" -msgstr "" - -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" msgstr "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "&Speichern" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" +msgstr "Klicken Sie hier um ihre Anmeldedaten zu speichern" + #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" msgstr "" @@ -599,27 +589,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "EAP Verbindungseinstellungen" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "EAP Methoden" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "Module zur Unterstützung einzelner EAP Methoden" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "TTLS" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "Tunneled Transport Layer Security" diff --git a/EAPMethods/locale/el_GR.po b/EAPMethods/locale/el_GR.po index 6e6908b..f54d0c0 100644 --- a/EAPMethods/locale/el_GR.po +++ b/EAPMethods/locale/el_GR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Zenon Mousmoulas , 2016\n" "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,33 +47,34 @@ msgstr "Προχωρημένο..." msgid "Opens dialog with provider settings" msgstr "Ανοίγει ένα παράθυρο διαλόγου με τις ρυθμίσεις του παρόχου" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" -msgstr "Διαπιστευτήρια πελάτη" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." -msgstr "Διαχειριστείτε διαπιστευτήρια που χρησιμοποιούνται για τη σύνδεση." - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" -msgstr "Χρησιμοποιήστε &τα δικά σας διαπιστευτήρια:" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" -"Επιλέξτε αυτήν την επιλογή εαν έχετε μοναδικά διαπιστευτήρια για να " -"συνδεθείτε" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "Τα διαπιστευτήρια σας φορτώθηκαν από τον Windows Credential Manager" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "&Καθαρίσμος διαπιστευτηρίων" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." @@ -80,64 +82,58 @@ msgstr "" "Επιλέξτε να καθαρίσετε τα διαπιστευτήρια σας από τον Credential Manager\n" "Σημείωση: Θα σας ζητηθεί να εισαγάγετε τις πιστοποιήσεις σας κατά τη σύνδεση." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "&Ρυθμίση των διαπιστευτηρίων..." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" "Κάντε κλικ εδώ για να ρυθμίσετε ή να τροποποιήσετε τα διαπιστευτήριά σας" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" -msgstr "Χρησιμοποιήστε προ-&μοιρασμένα διαπιστευτήρια:" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -"Επιλέξτε αυτή την επιλογή, εάν όλοι οι πελάτες χρησμοποιούν τα ίδια " -"διαπιστευτήρια για να συνδεθούν" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" -msgstr "Κοινά (προ-μοιρασμένα) διαπιστευτήρια" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "Παρακαλείσθε να δώσετε το όνομα χρήστη και τον κωδικό πρόσβασής σας." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "ID Χρήστη:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "Εισάγετε εδώ το όνομα χρήστη (user@domain.org, DOMAIN\\User,etc.)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "Κωδικός Πρόσβασης:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "Εισάγετε τον κωδικό πρόσβασης σας εδώ" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "&Υπενθύμιση" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" -"Έλεγξτε εάν επιθυμείτε να σώσετε το όνομα χρήστη και τον κωδικό πρόσβασης " -"σας" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "Ο Φορέας σας" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." @@ -146,54 +142,54 @@ msgstr "" "παρουσιάζεται ο φορέας, οι τελικοί χρήστες κατανοούν πιο εύκολα τα μηνύματα " "των προγραμμάτων και τις ενέργειές τους." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "Το όνομα &του Φορέα σας:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" "Το όνομα του φορέα σας, όπως αυτό θα εμφανίζεται στις ειδοποιήσεις των " "επαφών του helpdesk" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "(Παρακαλώ, περιοριστείτε)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "Πληροφορίες& επικοινωνίας Helpdesk" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "H διεύθυνση της ιστοσελίδας του Helpdesk" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "Tο e-mail του Helpdesk" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "Ο αριθμός τηλεφώνου του Helpdesk" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "Πάροχος Μοναδικoύ Αναγνωριστικού" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." @@ -201,33 +197,33 @@ msgstr "" "Αναθέστε στον φορέα σας ένα μοναδικό αναγνωριστικό για να επιτρέπεται να " "μοιράζεται τα ίδια διαπιστευτήρια σε διαφορετικά προφίλ του δικτύου." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "&Περιοχή:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "Πάροχος μοναδικού &αναγνωριστικού:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" "Το αναγνωριστικό του φορέα σας για να παρέχετε ίδια διαπιστευτήρια από άλλα " "προφίλ" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "Διαμόρφωση κλειδώματος" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." @@ -236,7 +232,7 @@ msgstr "" "αλλαγές από τους τελικούς χρήστες. Στους χρήστες θα επιτρέπεται μόνο να " "εισαγουν τα διαπιστευτήρια." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." @@ -244,46 +240,46 @@ msgstr "" "&Αποκλεισμός αυτής της διαμόρφωσης και αποτρέψτε οποιαδήποτε περαιτέρω " "τροποποίηση μέσω της διεπαφής χρήστη." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" "(Προσοχή: Μόλις κλειδωθεί, δεν μπορείτε να το επαναφέρετε χρησιμοποιώντας " "αυτό το διάλογο!)" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "%s Διαπιστευτήρια" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "Διαπιστευτήρια EAP" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" "Για περισσότερη βοήθεια και οδηγίες, παρακαλούμε επικοινωνήστε μαζί μας %s " "στο:" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "ο πάροχος σας" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "Ανοίξτε ένα προεπιλεγμένο φυλλομετρητή" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "Ανοίξτε το πρόγραμμα του e-mail σας" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "Πληκτρολογήστε το αριθμό τηλεφώνου" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " @@ -292,38 +288,46 @@ msgstr "" "%s έχει προ-ρυθμισεί τμήματα αυτής της διαμόρφωσης. Τα μέρη αυτά είναι " "κλειδωμένα για να εμποδίστει η τυχαία τροποποίηση." -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "Ο πάροχός σας" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" "Η προηγούμενη προσπάθεια για να συνδεθείτε ανέφερε μη έγκυρα διαπιστευτήρια." -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" "Η προηγούμενη προσπάθεια για να συνδεθείτε ανέφερε ότι τα διαπιστευτήριά σας" " έχουν λήξει." -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" "Η προηγούμενη προσπάθεια να συνδεθείτε ανέφερε ότι τα διαπιστευτήρια σας " "έχουν αλλάξει." -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "Η προηγούμενη προσπάθεια σύνδεσης απέτυχε." -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" "Παρακαλώ, βεβαιωθείτε ότι τα διαπιστευτήρια σας είναι σωστά ή δοκιμάστε ξανά" " αργότερα." +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "Εμπιστευτικό Διακομιστή" @@ -341,10 +345,10 @@ msgid "Acceptable Certificate Authorities:" msgstr "Αποδεκτές αρχές εκδόσεων πιστοποιητικών:" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" -"Λίστα των αρχών έκδοσης πιστοποιητικών για τα πιστοποιητικά των διακομιστών" -" που πρέπει να εκδίδονται από" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." @@ -390,46 +394,24 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "(Παράδειγμα: foo.bar.com;server2.bar.com)" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" -msgstr "TLS Πιστοποιητικό Πελάτη" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -"Παρακαλώ επιλέξετε το πιστοποιητικό του πελάτη σας για να το χρησιμοποιήσετε" -" στον έλεγχο της ταυτότητας." -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "Συνδέ&θείτε χωρίς να παρέχετε ένα πιστοποιητικό πελάτη" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -"Επιλέξτε αν ο διακομιστής σας δεν σας απαιτεί να παρέχετε ένα πιστοποιητικό " -"πελάτη" -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "Χρησιμοποιήστε το ακόλουθο &πιστοποιητικό:" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" -"Επιλέξτε εάν θα πρέπει να παρέχετε ένα πιστοποιητικό πελάτη κατά τη σύνδεση" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" "Το πιστοποιητικό πελάτη που θα χρησιμοποιηθεί για τον έλεγχο της ταυτότητας" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "Προσαρμοσμένη &ταυτότητα:" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" @@ -437,14 +419,6 @@ msgstr "" "Η ταυτότητά σας (username@domain) για να παρακάμψετε ένα πιστοποιητικό· ή " "κενό για να χρησιμοποιήσετε όποια ταυτότητα παρέχεται από πιστοποιητικό" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "(Παράδειγμα: user@contoso.com)" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "Ελέγξτε αν θέλετε να αποθηκεύσετε την επιλογή του πιστοποιητικού" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -454,32 +428,37 @@ msgstr "Βρέθηκε μη έγκυρος χαρακτήρας στο hostname: msgid "Validation conflict" msgstr "Πρόβλημα επικύρωσης" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "<κενό>" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "Προσθήκη Πιστοποιητικού" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "Αρχεία Πιστοποιητικών (*.cer;*.crt;*.der;*.p7b;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "X.509 Αρχεία Πιστοποιητικών (*.cer;*.crt;*.der;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "PKCS #7 Αρχεία Πιστοποιητικών (*.p7b)" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "Όλα τα αρχεία (*.*)" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "Άκυρο ή μη υποστηριζόμενο αρχείο πιστοποιητικού %s" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "Σφάλμα" @@ -522,40 +501,40 @@ msgstr "Καθορίστε τη διαμόρφωση της εξωτερικής msgid "Custom outer identity to use" msgstr "Προσαρμόστε την εξωτερική ταυτότητα για να την χρησιμοποιήσετε" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" "Σφάλμα κατά την εγγραφή των διαπιστευτηρίων στο Credential Manager: %hs " "(σφάλμα %u)" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "Η εγγραφή των διαπιστευτηρίων απέτυχε." -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "Ταυτοποίηση εσωτερικής ταυτότητας" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "Επιλέξτε την μέθοδο ταυτοποίησης εσωτερικής ταυτότητας από τη λίστα" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "PAP" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "Ταυτοποίηση εξωτερικής ταυτότητας" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "Επιλέξτε την μέθοδο ταυτοποίησης εσωτερικής ταυτότητας από τη λίστα" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "PAP" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "MSCHAPv2" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" @@ -563,36 +542,40 @@ msgstr "" "Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %ls από τη " "διαμόρφωση;" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "Προειδοποίηση" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "Ρυθμίσεις παρόχων" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "Η διαγραφή των διαπιστευτηρίων απέτυχε (σφάλμα %u)." -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "<σφάλμα %u>" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "<σφάλμα>" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" -msgstr "<κενό>" - -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" msgstr "<κενό ID>" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "&Υπενθύμιση" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" +msgstr "" + #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" msgstr "<Ο Φορέας σας>" @@ -601,27 +584,30 @@ msgstr "<Ο Φορέας σας>" msgid "EAP Connection Configuration" msgstr "Διαμόρφωση σύνδεσης EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1253" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "Μέθοδοι EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "Ενότητες για την ενίσχυση μεμονωμένων μεθόδων EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "TTLS" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "Tunneled Transport Layer Security" diff --git a/EAPMethods/locale/es_ES.po b/EAPMethods/locale/es_ES.po index 35cfb98..b25e271 100644 --- a/EAPMethods/locale/es_ES.po +++ b/EAPMethods/locale/es_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: José Manuel Macías , 2016\n" "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,33 +47,34 @@ msgstr "Avanzado..." msgid "Opens dialog with provider settings" msgstr "Abrir diálogo configuración de proveedores" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" -msgstr "Credenciales del cliente" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." -msgstr "Administrar credenciales usadas para conectar." - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" -msgstr "Usar credenciales &propias:" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" -"Seleccione esta opción si sólo tiene unas credenciales únicas para conectar" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" -"Sus credenciales cargadas del Administrador de Credenciales de Windows" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "&Limpiar Credenciales" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." @@ -80,63 +82,59 @@ 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:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "&Establecer Credenciales..." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "Haga clic aquí para establecer o modificar sus credenciales" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" -msgstr "Usar credenciales &compartidas" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -"Seleccionar estas opciones si todo los clientes conectan usando las mismas " -"credenciales" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" -msgstr "Credenciales comúnes (previamente compartidas)" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "Por favor proporciones su ID de usuario y contraseña." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "ID de usuario:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" "Introduzca su nombre de usuario aquí (usuario@dominio.org, DOMAIN\\User, " "etc.)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "Contraseña:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "Introduzca su contraseña aquí" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "&Recordar" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "Marcar si desea almacenar su nombre de usuario y contraseña" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "Su organización" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." @@ -145,54 +143,54 @@ msgstr "" "organización se muestre, los usuarios encontrarán los mensajes más fáciles " "de entender y actuar." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "&Nombre de su organización:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" "El nombre de su organización tal cual aparecerá en las notificaciones de " "contacto para soporte" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "(Se recomienda algo corto)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "&Información de contacto de soporte:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "La dirección web para ofrecer soporte" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "La dirección de correo para soporte" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "El teléfono para soporte" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "Identificador único del proveedor" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." @@ -200,33 +198,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:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "&Espacio de nombres:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "&Identificador único de proveedor:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" "El identificador de su organización para asignar las mismas credenciales de " "otros perfiles" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "Bloqueo de configuración" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." @@ -235,7 +233,7 @@ msgstr "" "accidentales por los usuarios. Estos sólo tendrán permitido introducir " "credenciales." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." @@ -243,44 +241,44 @@ msgstr "" "&Bloquear esta configuración y prevenir así cualquier modificación posterior" " en la interfaz de usuario." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" "(Advertencia: ¡Una vez bloqueada, no podrá volver atrás usando este " "diálogo!)" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "Credenciales %s" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "Credenciales EAP" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "Para ayuda o instrucciones adicionales, por favor contacte con %s en:" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "su proveedor" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "Abrir el navegador web por defecto" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "Abrir su cliente de correo electrónico" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "Llamar al teléfono" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " @@ -289,38 +287,46 @@ msgstr "" "%s tiene determinadas secciones de configuración pre-establecidas. Dichas " "secciones están bloqueadas para evitar modificaciones accidentales." -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "Su proveedor" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" "El intento anterior de conexión reportó que las credenciales no eran " "correctas." -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" "El intento anterior de conexión reportó que las credenciales han expirado." -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" "El intento anterior de conexión reportó que sus credenciales están siendo " "cambiadas." -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "Los intentos anteriores de conexión fallaron." -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" "Por favor, asegúrese de que sus credenciales son correctas, o inténtelo de " "nuevo más tarde." +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "Confianza en el servidor" @@ -338,10 +344,12 @@ msgid "Acceptable Certificate Authorities:" msgstr "Autoridades de Certificación Aceptadas:" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" -"Lista de las autoridades de certificación por las que debe ser firmado el " -"certificado de servidor" +"El certificado de servidor debe haber sido emitido por alguna de las " +"autoridades listadas aquí" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." @@ -387,45 +395,23 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "(Ejemplo: foo.bar.com;servidor2.bar.com)" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" -msgstr "Certificado de Cliente TLS" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -"Por favor seleccione su certificado de cliente a usar para autenticación." -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "Co&nectar sin proporcionar un certificado de cliente" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -"Seleccionar si su servidor no necesita que sea proporcionado un certificado " -"de cliente" -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "Usar el siguiente &certificado:" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" -"Seleccionar si se necesita proporcionar un certificado de cliente al " -"conectarse" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "Certificado de cliente a utilizar para autenticación" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "&Identidad personalizada:" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" @@ -433,14 +419,6 @@ msgstr "" "Su identidad (usuario@dominio) que sobreescribirá la del certificado; o en " "blanco para usar la proporcionada en el certificado" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "(Ejemplo: usuario@example.com)" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "Marcar si desea guardar la selección de certificado" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -450,32 +428,37 @@ msgstr "Carácter no válido en el nombre: %c" msgid "Validation conflict" msgstr "Conflicto de validación" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "Añadir Certificado" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "Ficheros de certificado (*.cer;*.crt;*.der;*.p7b;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "Ficheros de certificado X.509 (*.cer;*.crt;*.der;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "Ficheros de certificados PKCS #7 (*.p7b)" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "Todos los ficheros (*.*)" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "Fichero de certificado %s es inválido o no está soportado" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "Error" @@ -517,39 +500,39 @@ msgstr "Especificar identidad externa personalizada" msgid "Custom outer identity to use" msgstr "Identidad externa personalizada a usar" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" "Error escribiendo credenciales en el Gestor de Credenciales: %hs (error %u)" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "Fallo escribiendo credenciales." -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "Autenticación interna" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -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:116 -msgid "PAP" -msgstr "PAP" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "Autenticación externa" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "Seleccione un método de autenticación interna de la lista" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "PAP" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "MSCHAPv2" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" @@ -557,36 +540,40 @@ msgstr "" "¿está seguro de que quiere borrar permanentemente la configuración del " "proveedor %ls?" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "Advertencia" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "Configuración del proveedor" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "Fallo al borrar credenciales (error %u)." -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" -msgstr "" - -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" msgstr "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "&Recordar" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" +msgstr "" + #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" msgstr "" @@ -595,27 +582,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "Configuración de conexiones EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "Métodos EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "Módulos para soportar métodos EAP individualmente" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "TTLS" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "Tunneled Transport Layer Security" diff --git a/EAPMethods/locale/eu_ES.po b/EAPMethods/locale/eu_ES.po index 99687dd..7087a8c 100644 --- a/EAPMethods/locale/eu_ES.po +++ b/EAPMethods/locale/eu_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Basque (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/eu_ES/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: eu_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/fi_FI.po b/EAPMethods/locale/fi_FI.po index def75ba..e342fd2 100644 --- a/EAPMethods/locale/fi_FI.po +++ b/EAPMethods/locale/fi_FI.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/eduroam_devel/teams/11799/fi_FI/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/fr_CA.po b/EAPMethods/locale/fr_CA.po index 33d0899..1ff9c21 100644 --- a/EAPMethods/locale/fr_CA.po +++ b/EAPMethods/locale/fr_CA.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: French (Canada) (https://www.transifex.com/eduroam_devel/teams/11799/fr_CA/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/fr_FR.po b/EAPMethods/locale/fr_FR.po index f1db8ce..9f38cbd 100644 --- a/EAPMethods/locale/fr_FR.po +++ b/EAPMethods/locale/fr_FR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: French (France) (https://www.transifex.com/eduroam_devel/teams/11799/fr_FR/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/gl_ES.po b/EAPMethods/locale/gl_ES.po index 00d9b32..835884b 100644 --- a/EAPMethods/locale/gl_ES.po +++ b/EAPMethods/locale/gl_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Galician (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/gl_ES/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: gl_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/hr_HR.po b/EAPMethods/locale/hr_HR.po index 395a442..087a766 100644 --- a/EAPMethods/locale/hr_HR.po +++ b/EAPMethods/locale/hr_HR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Dubravko Penezic , 2016\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/eduroam_devel/teams/11799/hr_HR/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: hr_HR\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,31 +47,34 @@ msgstr "Napredno..." msgid "Opens dialog with provider settings" msgstr "Otvaranje dialoga s postavkama davatelja usluge" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" -msgstr "Korisnički podaci" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." -msgstr "Podešavanje korisničkih podataka za spajanje" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" -msgstr "Vlastiti korisnički podaci:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" -msgstr "Odaberi ovu opciju ako se koriste jedinstveni korisnički podaci" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" +msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "Vaši korisnički podaci se preuzimaju iz Windows Credential Manager-a" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "&Obriši korisničke podatke" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." @@ -78,59 +82,57 @@ msgstr "" "Odaberi kako bi se obrisali korisnički podaci u Credential Manager.\n" "Opaska: Biti će te pitani za korisničke podatke po spajanju." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "&Postavi korisničke podatke..." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "Odaberi ako je potrebno postaviti korisničke podatke" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" -msgstr "Koristi &prije izdane korisničke podatke: " +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" -msgstr "Odaberi ovu opciju ako svi klijenti koriste iste korisničke podatke" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" -msgstr "Zajednička (prije podjeljena) korisnička oznaka" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "Molimo postavite svoju korisničku oznaku i lozinku" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "Korisnička oznaka:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "Unesi svoju korisnicku oznaku (pero@pero.hr)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "Lozinka:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "Unesi svoju lozinku" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "&Podsjeti" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "Odaberi ako želis pohranjivanje korisničke oznake i lozinke" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "Vaša ustanova" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." @@ -139,52 +141,52 @@ msgstr "" "ustanova prestavljena, krajnji korisnik će lakše obaviti postavljanje " "postavki." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "Ime vaše &ustanove:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "Ime vaše ustanove će se pojaviti na obavijesti helpdesk-u" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "(Ukratko, molim)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "Kontakt &podaci helpdesk-a:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "Web adresa vašeg helpdesk-a" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "E-mail adresa vašeg helpdesk-a" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "Telefonski broj vašeg helpdesk-a" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "Jedinstveni identifikator davatelja usluge" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." @@ -192,31 +194,31 @@ msgstr "" "Prijavite ID vaše ustanove kako bi se mogao koristiti za različite mrežne " "profile" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "&Namespace:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "Davatelj jedinstvene &identifikacije:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "ID vaše ustanove se pojavljuje i kod drugih korisničkih podataka" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "Zaključaj posatvke" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." @@ -224,7 +226,7 @@ msgstr "" "Vaše postavke su zaključane kao bi se zaštile od nehotične promjene krajnjeg" " korisnika. Korisnik će moći unjeti samo svoje korisničke podatke." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." @@ -232,42 +234,42 @@ msgstr "" "&Zaključaj postavke kako bi onemomogučili kasniju promjenu kroz korisničko " "sučelje" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "(Upozorenje: Jednom zaključano, nemože se otključati ovim dijalogom!)" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "%s korisnički podatci" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "EAP korisničke oznake" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "Za dodatnu pomoć i postavke kontaktiraj %s :" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "vaš davatelj usluge" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "Otvori standardni web preglednik" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "Otvorite vaš e-mail program" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "Nazovi telefonski broj" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " @@ -276,35 +278,43 @@ msgstr "" "%s ima predefinirane postavke. Te postavke su zaključane kako bi spriječile " "slučajnu promjenu." -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "Vaš davatelj usluge" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" "Prethodni pokušaj spajanja je prijavio da su korišteni netočni korisnički " "podaci." -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" "Prethodni pokušaj spajanja je prijavio da su korisnički podaci istekli." -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" "Prethodni pokušaj spajanja je priojavio da su promjenjeni korisnički podaci." -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "Prethodni pokušaj spajanja nije uspio." -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "Molimo provjeritet da je certifikat dobar ili pokušajte kasnije." +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "Server Trust" @@ -321,8 +331,10 @@ msgid "Acceptable Certificate Authorities:" msgstr "Prihvatljivi certifikat autoriteti: " #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" -msgstr "Odabrani certifikat autoritet posljužitelj mora biti izdan od" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" +msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." @@ -365,42 +377,23 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "(Primjer: pero.hr;freeradius.primjer.hr)" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" -msgstr "Klijentski TLS certifikat" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." -msgstr "Molim odaberite vaš klijentski certifikat za autentikaciju" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "Po&vezivanje bez korištenja klijentskog certifikata" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -"Odabrati, ako vaš poslužitelj netreba klijentski certifikat za autentikaciju" -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "Koristi slijedeći &certifikat:" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -"Odabrati, ako je potrebno koristiti klijentski certifikat pri autentikaciji" -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "Klijentski certifikat za autentikaciju" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "Samostalno odabrani &identitet" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" @@ -408,14 +401,6 @@ msgstr "" "Vaš korisnički podatak (pero@pero.hr) će se koristiti umjesto podataka iz " "certifikata ili ostavite prazno kako bi se koristili podaci iz certifikata" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "(primjer: pero@pero.hr)" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "Odaberi da li želiš pohraniti odabrane certifikate" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -425,32 +410,37 @@ msgstr "Nevažeći znak u imenu poslužitelja %c" msgid "Validation conflict" msgstr "Problem s provjerom" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "Dodaj certifikat" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "PKCS #7 Certificate Files (*.p7b)" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "Sve datoteke (*.*)" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "Nevažeća ili nepodržana datoteka s certifikatom %s " -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "Greška" @@ -495,40 +485,40 @@ msgstr "Specijalni vanjski identitet" msgid "Custom outer identity to use" msgstr "Samostalno odabrani vanjski identitet koji će se koristiti" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" "Greška pri zapisivanju podataka o identitetu u Credential Manager: %hs " "(error %u)" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "Zapisivanje podataka o identitetu nije uspijelo." -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "Unutrašnja autentikacija" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "Odaberi unutrašnji autentikacijski mehanizam s liste" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "PAP" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "Vanjska autentikacija" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "Odaberi unutrašnji autentikacijski mehanizam s liste" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "PAP" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "MSCHAPv2" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" @@ -536,36 +526,40 @@ msgstr "" "Da li ste sigurni da želite za stalno opbrisati davatelja usluge %ls iz " "konfiguracije ? " -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "Upozorenje" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "Postavke davatelja usluge" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "Brisanje podataka o identitetu nije uspijelo (error %u)." -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" -msgstr "" - -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" msgstr "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "&Podsjeti" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" +msgstr "" + #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" msgstr "" @@ -574,27 +568,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "Parametri EAP konekcije" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "EAP metode" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "Moduli za podršku pojedinim EAP metodama" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "TTLS" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "Tunneled Transport Layer Security" diff --git a/EAPMethods/locale/hu_HU.po b/EAPMethods/locale/hu_HU.po index 3c0463c..aee4af4 100644 --- a/EAPMethods/locale/hu_HU.po +++ b/EAPMethods/locale/hu_HU.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Hungarian (https://www.transifex.com/eduroam_devel/teams/11799/hu/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/is_IS.po b/EAPMethods/locale/is_IS.po index 1610864..2d32b00 100644 --- a/EAPMethods/locale/is_IS.po +++ b/EAPMethods/locale/is_IS.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Icelandic (https://www.transifex.com/eduroam_devel/teams/11799/is/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/it_IT.po b/EAPMethods/locale/it_IT.po index 184e337..b0543b0 100644 --- a/EAPMethods/locale/it_IT.po +++ b/EAPMethods/locale/it_IT.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Nunzio Napolitano , 2016\n" "Language-Team: Italian (Italy) (https://www.transifex.com/eduroam_devel/teams/11799/it_IT/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: it_IT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "Avanzate..." msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" -msgstr "Credenziali del client" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "Udser ID" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "Password" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/lt_LT.po b/EAPMethods/locale/lt_LT.po index a785d52..f29df47 100644 --- a/EAPMethods/locale/lt_LT.po +++ b/EAPMethods/locale/lt_LT.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Rimas Kudelis , 2016\n" "Language-Team: Lithuanian (https://www.transifex.com/eduroam_devel/teams/11799/lt/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,33 +47,34 @@ msgstr "Išsamiau…" msgid "Opens dialog with provider settings" msgstr "Atverti teikėjo parametrų langą" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" -msgstr "Kliento kredencialai" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." -msgstr "Tvarkyti kredencialus, naudojamus jungiantis." - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" -msgstr "Naudoti &savo kredencialus:" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" -"Pažymėkite šią parinktį, jei turite savo asmeninius prisijungimo " -"kredencialus" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "Jūsų kredencialai įkelti iš „Windows“ kredencialų tvarkytuvo" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "&Valyti kredencialus" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." @@ -80,65 +82,59 @@ msgstr "" "Spustelėkite, jei norite pašalinti savo kredencialus iš Kredencialų tvarkytuvo.\n" "Pastaba: jūsų kredencialų bus paprašyta prisijungimo metu." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "&Nustatyti kredencialus…" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "Spustelėkite čia savo kredencialams nustatyti ar pakeisti" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" -msgstr "Naudoti išankstinio bendrinimo kredencialus:" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -"Pažymėkite šią parinktį, jei visi klientai jungiasi naudodamiesi tais " -"pačiais kredencialais" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" -msgstr "Išankstinio bendrinimo kredencialai" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "Įveskite savo vartotojo ID ir slaptažodį." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "Vartotojo ID:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" "Čia įveskite savo vartotojo vardą (vartotojas@domenas.lt, " "DOMENAS\\Vartotojas ar kt.)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "Slaptažodis:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "Čia įveskite savo slaptažodį" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "Įsi&minti" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" -"Pažymėkite, jei norite, kad jūsų vartotojo vardas ir slaptažodis būtų " -"įsiminti" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "Jūsų organizacija" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." @@ -147,53 +143,53 @@ msgstr "" "vartotojams. Pristačius organizaciją, vartotojams bus paprasčiau suprasti " "programos pranešimus ir jais vadovautis." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "Organizacijos &pavadinimas:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" "Organizacijos pavadinimas bus rodomas, siūlant kreiptis į pagalbos tarnybą" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "(Pasistenkite, kad jis būtų neilgas)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "Pagalbos tarnybos kontaktinė &informacija:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "Pagalbos tarnybos svetainės adresas" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "Pagalbos tarnybos el. pašto adresas" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "Pagalbos tarnybos telefono numeris" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "Teikėjo unikalus identifikatorius" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." @@ -201,32 +197,32 @@ msgstr "" "Suteikite savo organizacijai unikalų identifikatorių, kad tais pačiais " "kredencialais galima būtų naudotis su skirtingais tinklo profiliais." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "&Vardų sritis:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "Teikėjo unikalus &identifikatorius:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" "Organizacijos identifikatorius kredencialams iš kitų profilių priskirti" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "Užrakinti konfigūraciją" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." @@ -234,7 +230,7 @@ msgstr "" "Konfigūraciją galima užrakinti, siekiant išvengti atsitiktinių pakeitimų iš " "vartotojų pusės. Tokiu atveju vartotojams leidžiama įvesti tik kredencialus." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." @@ -242,43 +238,43 @@ msgstr "" "Už&rakinti šią konfigūraciją ir neleisti tolesnių keitimų naudojantis " "vartotojo sąsaja." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" "(Įspėjimas: užrakinę konfigūraciją, jos atrakinti šiame lange nebegalėsite!)" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "%s kredencialai" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "EAP kredencialai" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "Norėdami papildomos informacijos ar pagalbos, kreipkitės į %s:" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "savo teikėją" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "Atverti numatytąją naršyklę" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "Atverti el. pašto programą" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "Rinkti telefono numerį" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " @@ -287,39 +283,47 @@ msgstr "" "%s įrašė ir užrakino dalį konfigūracijos. Užrakintų parametrų keisti " "negalėsite." -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "Jūsų teikėjas" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" "Ankstesniojo bandymo prisijungti metu grąžintas atsakymas, jog kredencialai " "netinkami." -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" "Ankstesniojo bandymo prisijungti metu grąžintas atsakymas, jog jūsų " "kredencialai nebegalioja." -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" "Ankstesniojo bandymo prisijungti metu grąžintas atsakymas, jog jūsų " "kredencialai yra keičiami." -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "Ankstesnysis bandymas prisijungti nepavyko." -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" "Įsitikinkite, jog jūsų kredencialai teisingi, arba bandykite iš naujo " "vėliau." +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "Patikimi serveriai" @@ -337,9 +341,10 @@ msgid "Acceptable Certificate Authorities:" msgstr "Patikimos sertifikavimo tarnybos:" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" -" Sertifikavimo tarnybų, galinčių išduoti serverio sertifikatą, sąrašas" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." @@ -383,40 +388,23 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "(Pvz.: vienas.įstaiga.lt;du.įstaiga.lt)" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" -msgstr "TLS kliento sertifikatas" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" +msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." -msgstr "Pasirinkite kliento sertifikatą, naudotiną šio autentifikavimo metu." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." +msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "Jungtis &nepateikiant kliento sertifikavo" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "Pažymėkite, jei serveris nereikalauja pateikti kliento sertifikatą" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "Naudoti šį &sertifikatą:" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "Pažymėkite, jei jungiantis privaloma pateikti kliento sertifikatą" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "Kliento sertifikatas autentifikavimui" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "&Tinkinta tapatybė:" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" @@ -424,14 +412,6 @@ msgstr "" "Jūsų tapatybė (vartotojas@domenas), naudotina vietoje nurodytos sertifikate." " Palikite lauką tuščią sertifikate nurodytai tapatybei naudoti" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "(Pvz.: vartotojas@įstaiga.lt)" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "Pažymėkite, jei norite įsiminti pasirinktą sertifikatą" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -441,32 +421,37 @@ msgstr "Kompiuterio varde aptiktas netinkamas simbolis: %c" msgid "Validation conflict" msgstr "Patikra nesėkminga" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "Pridėti sertifikatą" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "Sertifikatų failai (*.cer;*.crt;*.der;*.p7b;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "X.509 sertifikatų failai (*.cer;*.crt;*.der;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "PKCS #7 sertifikatų failai (*.p7b)" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "Visi failai (*.*)" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "Sugadintas arba nepalaikomo tipo sertifikato failas – %s" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "Klaida" @@ -508,74 +493,78 @@ msgstr "Nurodykite tinkintą išorinę tapatybę" msgid "Custom outer identity to use" msgstr "Naudotina tinkinta išorinė tapatybė" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "Klaida įrašant kredencialus į Kredencialų tvarkytuvą: %hs (klaida %u)" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "Kredencialų įrašyti nepavyko." -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "Vidinis autentifikavimas" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "Pasirinkite vidinio autentifikavimo metodą iš sąrašo" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "PAP" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "Išorinis autentifikavimas" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "Pasirinkite vidinio autentifikavimo metodą iš sąrašo" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "PAP" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "MSCHAPv2" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" "Ar tikrai norite visam laikui pašalinti teikėją „%ls“ iš konfigūracijos?" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "Įspėjimas" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "Teikėjo parametrai" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "Kredencialų pašalinti nepavyko (klaida %u)." -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" -msgstr "" - -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" msgstr "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "Įsi&minti" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" +msgstr "" + #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" msgstr "" @@ -584,27 +573,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "EAP ryšio konfigūracija" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1257" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "EAP metodai" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "Moduliai atskirų EAP metodų palaikymui" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "TTLS" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "Tunneled Transport Layer Security" diff --git a/EAPMethods/locale/nb_NO.po b/EAPMethods/locale/nb_NO.po index 6c69254..be03232 100644 --- a/EAPMethods/locale/nb_NO.po +++ b/EAPMethods/locale/nb_NO.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Tom Ivar Myren , 2016\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,33 +47,34 @@ msgstr "Avansert..." msgid "Opens dialog with provider settings" msgstr "Åpner dialog med tilbyder innstillinger" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" -msgstr "Påloggingsinformasjon" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." -msgstr "Administrer påloggingsinformasjon som brukes til å koble til." - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" -msgstr "Bruk &egen påloggingsinformasjon:" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" -"Velg dette alternativet hvis du har din unike påloggingsinformasjon for å " -"koble til" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "Din påloggingsinformasjon lastet fra Windows Credential Manager" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "&Fjern påloggingsinformasjon" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." @@ -80,220 +82,224 @@ 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:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "&Sett påloggingsinformasjon" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "Klikk her for å sette eller endre påloggingsinformasjon" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" -msgstr "Bruk &pre-shared påloggingsinformasjon:" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" -msgstr "" -"Velg dette alternativet hvis alle klienter kobler til med samme " -"påloggingsinformasjon" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -309,7 +315,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -351,53 +359,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -407,32 +390,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -472,71 +460,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -547,27 +539,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/nl_NL.po b/EAPMethods/locale/nl_NL.po index 750de31..aa8f84a 100644 --- a/EAPMethods/locale/nl_NL.po +++ b/EAPMethods/locale/nl_NL.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Dutch (https://www.transifex.com/eduroam_devel/teams/11799/nl/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/pl_PL.po b/EAPMethods/locale/pl_PL.po index a56dd9b..cb711b5 100644 --- a/EAPMethods/locale/pl_PL.po +++ b/EAPMethods/locale/pl_PL.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Tomasz Wolniewicz , 2016\n" "Language-Team: Polish (Poland) (https://www.transifex.com/eduroam_devel/teams/11799/pl_PL/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pl_PL\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,31 +47,34 @@ msgstr "Zaawansowane..." msgid "Opens dialog with provider settings" msgstr "Otwiera okno z ustawieniami dostawcy tożsamości" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" -msgstr "Dane logowanie klienta" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." -msgstr "Zarządzaj poświadczeniami logowania." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" -msgstr "Użyj &własnych poświadczeń:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" -msgstr "Zaznacz tę opcję jeżeli masz unikatowe poświadczenia logowania" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" +msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "Twoje poświadczenia załadowane z Managera poświadczeń systemu Windows" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "&Usuń poświadczenia" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." @@ -78,62 +82,59 @@ msgstr "" "Kliknij aby usunąć poświadczenia z Menadżera poświadczeń.\n" "Uwaga: Przy ponownym połączeniu zostaniesz poproszony o wprowadzenie poświadczeń." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "&Ustaw poświadczenia" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "Kliknij tutaj, aby zmodyfikować poświadczenia logowania" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" -msgstr "Użyj pre-konfigurowanych poświadczeń" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -"Zaznacz tę opcję, jeżeli wszyscy klienci używają tych samych poświadczeń" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" -msgstr "Wspólne (pre-konfigurowane) poświadczenia" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" +msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "Proszę wprowadzić identyfikator i hasło." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "Identyfikator:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" "Wprowadź swój identyfikator (użytkownik@domena.org, DOMENA\\Użytkownik, " "itp.)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "Hasło:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "Wprowadź hasło" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "&Zapamiętaj" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "Zaznacz, jeżeli chcesz zachować identyfikator i hasło" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "Twoja Instytucja" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." @@ -141,54 +142,54 @@ msgstr "" "Opisz Twoją instytucję, aby spersonalizować komunikaty. Jeżeli instytucja " "jest ustawiona użytkownicy łatwiej rozumieją komunikaty i reagują na nie. " -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "&Nazwa Twojej instytucji:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" "Nazwa Twojej instytucji, tak jak ma być pokazana przy wskazaniach do " "helpdesku" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "(postaraj się, by było krótko)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "&Kontakt do helpdesku" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "Adres WWW twojego helpdesku" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "Adres e-mail Twojego helpdesku" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "Numer telefonu Twojego helpdesku" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "Unikatowy Identyfikator Dostawcy Tożsamości" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." @@ -196,33 +197,33 @@ msgstr "" "Nadaj Twojej instytucji unikatowy identyfikator, by umożliwić używanie tego " "samego zestawu poświadczeń w kilku profilach sieciowych." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "&Namespace:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "Unikatowy &identyfikator Dostawcy Tożsamości:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" "Unikatowy identyfikator Twojej instytucji umożliwiający używanie tych samych" " poświadczeń z innych profili" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "Blokada konfiguracji" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." @@ -231,51 +232,51 @@ msgstr "" "przez użytkowników końcowych. Użytkownicy będą mogli wprowadzać " "poświadczenia, ale nic poza tym. " -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" "&Zablokuj konfigurację przed modyfikacją poprzez interfejs użytkownika." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" "(Uwaga: Po zablokowaniu nie będziesz mógł tego wycofać przy pomocy tego " "interfejsu!)" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "Poświadczenia %s" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "Poświadczenia EAP" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "W celu otrzymania pomocy i instrukcji skontaktuj się z %s poprzez:" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "Twój dostawca tożsamości" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "Otwórz w domyślnej przeglądarce WWW" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "Otwórz w programie obsługi e-mail" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "Wybierz numer telefonu" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " @@ -284,37 +285,45 @@ msgstr "" "Ta konfiguracja dla %s jest częściowo pre-definiowana. Te części są " "zablokowane, aby zapobiec przypadkowej modyfikacji." -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "Twój dostawca tożsamości" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "Poprzednie próby połączenia zgłosiły błąd poświadczeń logowania." -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" "Poprzednie próby połączenia zgłosiły błąd przedawnienia poświadczeń " "logowania." -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" "Poprzednie próby połączenia zgłosiły, że poświadczenia logowania zostały " "zmienione." -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "Poprzednie próby połączenia były nieudane." -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" "Upewnij się, że Twoje poświadczenia logowania są poprawne, albo spróbuj " "ponownie później." +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "Zaufane serwery" @@ -332,10 +341,10 @@ msgid "Acceptable Certificate Authorities:" msgstr "Zaufane Urzędy Certyfikacji" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" -"Lista urzędów certyfikacyjnych uprawnionych do wystawienia certyfikatu " -"serwera" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." @@ -378,41 +387,23 @@ 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:120 -msgid "TLS Client Certificate" -msgstr "Certyfikat klienta" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -"Wybierz certyfikat klienta, który ma być używany przy uwierzytelnieniu." -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "&Połącz bez podawania certyfikatu klienta" +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." +msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "Zaznacz, jeżeli Twój serwer nie wymaga podania certyfikatu klienta" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "Użyj &certyfikatu:" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "Zaznacz, jeżeli w czasie łączenia musisz wskazać certyfikat klienta" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "Certyfikat klienta używany do uwierzytelnienia" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "Niestandardowy &identyfikator:" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" @@ -420,14 +411,6 @@ msgstr "" "Twój identyfikator (użytkownik@domena), który ma być użyty zamiast podanego " "w certyfikacie; pusty wpis spowoduje użycie identyfikatora z certyfikatu" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "(Przykład: user@contoso.com)" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "Zaznacz, jeżeli chcesz zapamiętać wybór certyfikatu" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -437,32 +420,37 @@ msgstr "W nazwie hosta znaleziono nieprawidłowy znak: %c" msgid "Validation conflict" msgstr "Błąd walidacji danych" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "Dodaj certyfikat" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "Pliki certyfikatów (*.cer;*.crt;*.der;*.p7b;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "Pliki certyfikatów X.509 (*.cer;*.crt;*.der;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "Pliki certyfikatów PKCS #7 (*.p7b)" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "Wszystkie pliki (*.*)" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "Nieprawidłowy, albo niewspierany plik certyfikatu %s" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "Błąd" @@ -504,74 +492,78 @@ msgstr "Podaj niestandardowy identyfikator zewnętrzny" msgid "Custom outer identity to use" msgstr "Niestandardowy identyfikator zewnętrzny" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "Błąd przy zapisie poświadczeń w Menadżerze poświadczeń: %hs (błąd %u)" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "Nie udało się zapisać poświadczeń." -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "Uwierzytelnienie wewnętrzne" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "Wymierz metodę uwierzytelnienia wewnętrznego z listy" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "PAP" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "Uwierzytelnienie " -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "Wymierz metodę uwierzytelnienia wewnętrznego z listy" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "PAP" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "MSCHAPv2" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" "Czy jesteś pewny, że chcesz usunąć konfigurację dostawcy tożsamości %ls?" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "Ostrzeżenie" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "Ustawienia dostawcy tożsamości" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "Błąd przy usuwaniu poświadczeń (błąd %u)." -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" -msgstr "" - -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" msgstr "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "&Zapamiętaj" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" +msgstr "" + #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" msgstr "" @@ -580,27 +572,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "Konfiguracja Połączenia EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "Metody EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "Moduły obsługujące konkretne metody EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "TTLS" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "Tunneled Transport Layer Security" diff --git a/EAPMethods/locale/pt_PT.po b/EAPMethods/locale/pt_PT.po index 3a6d086..6ad9be4 100644 --- a/EAPMethods/locale/pt_PT.po +++ b/EAPMethods/locale/pt_PT.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Pedro Simões , 2016\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "Avançadas..." msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "Palavra passe:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "Coloque aqui a sua palavra passe" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "&Memorizar" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "%s Credenciais" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "Credenciais EAP" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "Marcar o número de telefone" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "&Memorizar" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/ru_RU.po b/EAPMethods/locale/ru_RU.po index 6870b8f..c587455 100644 --- a/EAPMethods/locale/ru_RU.po +++ b/EAPMethods/locale/ru_RU.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Russian (Russia) (https://www.transifex.com/eduroam_devel/teams/11799/ru_RU/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1251" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/sk_SK.po b/EAPMethods/locale/sk_SK.po index 9ab03e7..a3ad28a 100644 --- a/EAPMethods/locale/sk_SK.po +++ b/EAPMethods/locale/sk_SK.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Slovak (Slovakia) (https://www.transifex.com/eduroam_devel/teams/11799/sk_SK/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/sl_SI.po b/EAPMethods/locale/sl_SI.po index f337e17..99740a3 100644 --- a/EAPMethods/locale/sl_SI.po +++ b/EAPMethods/locale/sl_SI.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: sl_SI\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,31 +47,36 @@ msgstr "Napredno ..." msgid "Opens dialog with provider settings" msgstr "Odpre dialog z nastavitvami ponudnika" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" -msgstr "Odjemalčeve poverilnice" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" +msgstr "Uporabnikove poverilnice za %s" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." -msgstr "Upravljajte s poverilnicami za povezovanje." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." +msgstr "Izberite vir, kjer so shranjene vaše poverilnice za povezovanje." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" -msgstr "Uporabi sv&oje poverilnice:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" +msgstr "Uporabi poverilnice iz &Upravitelja poverilnic:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" -msgstr "Izberite to možnost, če imate svoje lastne poverilnice za povezovanje" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" +"Izberite to možnost, če želite uporabiti poverilnice shranjene v Upravitelju" +" poverilnic Windows" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" +msgstr "Vaše trenutne poverilnice shranjene v Upravitelju poverilnic Windows" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "Vaše poverilnice naložene iz upravitelja poverilnic Windows" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "Počisti poverilni&ce" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." @@ -78,61 +84,59 @@ 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:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "Na&stavi poverilnice ..." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "Kliknite tukaj, da nastavite ali spremenite svoje poverilnice" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" -msgstr "Uporabi sku&pne poverilnice:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" +msgstr "Uporabi poverilnice iz nastavitev &profila:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -"Izberite to možnost, kadar se vsi odjemalci povezujejo z istimi " -"poverilnicami" +"Izberite to možnost, če želite shraniti poverilnice kot del nastavitev " +"profila" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" -msgstr "Skupne (deljene) poverilnice" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" +msgstr "Poverilnice nastavitev profila" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "ID uporabnika in geslo" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." -msgstr "Vnesite svoj uporabniški ID in geslo." +msgstr "Vnesite svoj ID uporabnika in geslo." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" -msgstr "Uporabniški ID:" +msgstr "ID uporabnika:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "Tukaj vnesite svoje up. ime (up. ime@domena.si, DOMENA\\Uporabnik ipd.)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "Geslo:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "Tukaj vnesite svoje geslo" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "Za&pomni si" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "Odkljukajte, če želite shraniti up. ime in geslo" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "Vaša organizacija" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." @@ -141,54 +145,54 @@ msgstr "" "predstavi, uporabniki lažje razumejo sporočila programa in ustrezneje " "reagirajo." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "Ime vaše orga&nizacije:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" "Ime vaše organizacije, kot bo nastopalo na obvestilih s stikom na center za " "pomoč" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "(Naj bo kratko, prosim)" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "Podatk&i centra za pomoč:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "Naslov spletne strani vašega centra za pomoč" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "E-poštni naslov vašega centra za pomoč" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "Telefonska številka vašega centra za pomoč" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "Enolični identifikator ponudnika" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." @@ -196,33 +200,33 @@ msgstr "" "Dodelite svoji organizaciji enoznačen identifikator, da omogočite souporabo " "istih poverilnic različnim omrežnim profilom." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "Ime&nski prostor:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "Enolični &identifikator ponudnika:" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" "Identifikator vaše organizacije za souporabo istih poverilnic različnih " "profilov" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "Zaklep konfiguracije" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." @@ -230,7 +234,7 @@ msgstr "" "Svojo konfiguracijo lahko zaklenete in preprečite končnim uporabnikom " "nenamerno spreminjanje. Uporabniki bodo lahko vnašali samo poverilnice." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." @@ -238,42 +242,42 @@ msgstr "" "Zak&leni to konfiguracijo in prepreči vse nadaljnje spremembe preko up. " "vmesnika." -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "(Pozor: Ko zaklenete, vrnitev ne bo več možna preko tega dialoga!)" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "Poverilnice za %s" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "Poverilnice EAP" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "Za dodtano pomoč ali navodila se obrnite na %s na:" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "vaš ponudnik" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "Odpre privzeto nastavljen spletni brskalnik" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "Odpre vaš program za e-pošto" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "Pokliče telefonsko številko" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " @@ -282,33 +286,41 @@ msgstr "" "%s je prednastavil dele te konfiguracije. Ti deli so zaklenjeni zaradi " "preprečevanja nenamernih sprememb." -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "Vaš ponudnik" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "Prejšnji poskus povezave je javil, da so poverilnice napačne." -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "Prejšnji poskus povezave je javil, da so poverilnice potekle." -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" "Prejšnji poskus povezave je javil, da so poverilnice v postopku " "spreminjanja." -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "Prejšnji poskus povezave ni uspel." -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "Preverite, ali so vaše poverilnice pravilne ali poskusite kasneje." +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "ID uporabnika in geslo za MSCHAPv2" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "ID uporabnika in geslo za PAP" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "Zaupanje strežniku" @@ -326,10 +338,12 @@ msgid "Acceptable Certificate Authorities:" msgstr "Sprejemljivi izdajatelji potrdil:" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" -"Seznam izdajateljev potrdil, od katerih mora biti izdano strežnikovo " -"potrdilo" +"Strežnikovo potrdilo mora biti izdano od enega izmed izdajateljev naštetih " +"tukaj" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." @@ -372,41 +386,23 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "(Primer: vzo.rec.si;streznik2.rec.si)" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" -msgstr "Odjemalčevo potrdilo TLS" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" +msgstr "Uporabnikovo potrdilo" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." -msgstr "Izberite svoje odjemalčevo potrdilo za uporabo med overovljanjem." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." +msgstr "Izberite svoje potrdilo za uporabo med overovljanjem." -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "Poveži brez dostave &odjemalčevega potrdila" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" -"Izberite, če vaš strežnik ne zahteva, da mu dostavite odjemalčevo potrdilo" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "Uporabi naslednje &potrdilo:" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "Izberite, če morate dostaviti odjemalčevo potrdilo ob povezavi" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "Odjemalčevo potrdilo za overovljanje" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "&Identiteta po meri:" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" @@ -414,14 +410,6 @@ msgstr "" "Vaša identiteta (up. ime@domena), ki bo nadomestila tisto s potrdila; ali " "prazno, če želite uporabiti tisto s potrdila" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "(Primer: uporabnik@vzorec.si)" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "Odkljukajte, če želite shraniti izbor potrdila" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -431,32 +419,37 @@ msgstr "Napačen znak v imenu gostitelja: %c" msgid "Validation conflict" msgstr "Nesoglasje pri preverjanju" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "Dodaj potrdilo" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "Datoteke s potrdili (*.cer;*.crt;*.der;*.p7b;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "Datoteke s potrdili X.509 (*.cer;*.crt;*.der;*.pem)" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "Datoteke s potrdili PKCS #7 (*.p7b)" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "Vse datoteke (*.*)" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "Napačna ali nepodprta datoteka s potrdilom %s" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "Napaka" @@ -466,9 +459,7 @@ msgstr "Zunanja identiteta" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28 msgid "Select the user ID supplicant introduces itself as to authenticator:" -msgstr "" -"Izberite uporabniško identiteto, s katerim se prosilec predstavi " -"overovitelju:" +msgstr "Izberite ID uporabnika, s katerim se prosilec predstavi overovitelju:" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:35 msgid "&True identity" @@ -498,39 +489,39 @@ msgstr "Navedite zunanjo identiteto po meri" msgid "Custom outer identity to use" msgstr "Zunanja identiteta po meri za uporabo" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" "Napaka pri zapisovanju poverilnic v upravitelja poverilnic: %hs (napaka %u)" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "Zapisovanje poverilnic ni uspelo." -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "Notranje overovljanje" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "Izberite postopek notranjega overovljanja s seznama" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "PAP" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "MSCHAPv2" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "Zunanje overovljanje" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "Izberite postopek notranjega overovljanja s seznama" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "PAP" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "MSCHAPv2" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" @@ -538,36 +529,40 @@ msgstr "" "Ali ste prepričani, da želite trajno izbrisati ponudnika %ls iz " "konfiguracije?" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "Opozorilo" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "Nastavitve ponudnika" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "Izbris poverilnic ni uspel (napaka %u)." -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" -msgstr "" - -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" msgstr "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "Za&pomni si" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" +msgstr "Odkljukajte, če želite shraniti poverilnice" + #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" msgstr "" @@ -576,27 +571,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "Konfiguracija povezave EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "Postopki EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "Moduli, ki omogočajo posamezne postopke EAP" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "TTLS" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "Tunneled Transport Layer Security" diff --git a/EAPMethods/locale/sr_RS.po b/EAPMethods/locale/sr_RS.po index 4374167..15fb732 100644 --- a/EAPMethods/locale/sr_RS.po +++ b/EAPMethods/locale/sr_RS.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/sv_SE.po b/EAPMethods/locale/sv_SE.po index 417399e..2dd191a 100644 --- a/EAPMethods/locale/sv_SE.po +++ b/EAPMethods/locale/sv_SE.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Swedish (https://www.transifex.com/eduroam_devel/teams/11799/sv/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/tr_TR.po b/EAPMethods/locale/tr_TR.po index 02db93e..5c4c00d 100644 --- a/EAPMethods/locale/tr_TR.po +++ b/EAPMethods/locale/tr_TR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Turkish (https://www.transifex.com/eduroam_devel/teams/11799/tr/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1254" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EAPMethods/locale/vi_VN.po b/EAPMethods/locale/vi_VN.po index 988a1e8..52e3736 100644 --- a/EAPMethods/locale/vi_VN.po +++ b/EAPMethods/locale/vi_VN.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2016-09-06 14:06+0200\n" +"POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Vietnamese (https://www.transifex.com/eduroam_devel/teams/11799/vi/)\n" @@ -12,14 +12,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: lib/EAPBase_UI\n" -"X-Poedit-SearchPath-1: lib/PAP_UI\n" -"X-Poedit-SearchPath-2: lib/TLS_UI\n" -"X-Poedit-SearchPath-3: lib/TTLS_UI\n" -"X-Poedit-SearchPath-4: EAPMethods\n" +"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n" +"X-Poedit-SearchPath-2: lib/PAP_UI\n" +"X-Poedit-SearchPath-3: lib/TLS_UI\n" +"X-Poedit-SearchPath-4: lib/TTLS_UI\n" +"X-Poedit-SearchPath-5: EAPMethods\n" "X-Poedit-SourceCharset: UTF-8\n" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 @@ -46,248 +47,257 @@ msgstr "" msgid "Opens dialog with provider settings" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230 lib/EAPBase_UI/res/wxEAP_UI.cpp:355 -msgid "Client Credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 +#, c-format +msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:241 -msgid "Manage credentials used to connect." +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 +msgid "Select the source where your credentials used to connect are stored." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:254 -msgid "Use &own credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 +msgid "Use credentials from Credential &Manager:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:255 -msgid "Select this option if you have your unique credentials to connect" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 +msgid "" +"Select this option if you would like to use credentials stored in Windows " +"Credential Manager" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 +msgid "Your present credentials stored in Windows Credential Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 -msgid "Your credentials loaded from Windows Credential Manager" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:270 msgid "&Clear Credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:271 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:275 lib/EAPBase_UI/res/wxEAP_UI.cpp:308 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 lib/EAPBase_UI/res/wxEAP_UI.cpp:309 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:292 -msgid "Use &pre-shared credentials:" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 +msgid "Use credentials from &profile configuration:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:293 -msgid "Select this options if all clients connect using the same credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 +msgid "" +"Select this option if you would like to store credentials as a part of " +"profile configuration" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:298 -msgid "Common (pre-shared) credentials" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 +msgid "Profile configuration credentials" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:366 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 +msgid "User ID and Password" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:376 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:381 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:385 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:390 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:397 lib/TLS_UI/res/wxTLS_UI.cpp:183 -msgid "&Remember" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398 -msgid "Check if you would like to save username and password" -msgstr "" - -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:420 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:431 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:438 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:443 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:457 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:467 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" msgstr "¶" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:474 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:478 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" msgstr "*" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:485 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" msgstr ")" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:496 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:524 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:535 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" msgstr "urn:RFC4282:realm" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:546 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:uuid" msgstr "urn:uuid" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:558 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:563 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:588 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:599 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:606 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:609 +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:98 +#: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:123 lib/EAPBase_UI/include/EAP_UI.h:352 -#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119 +#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 +#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:166 +#: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:167 +#: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:186 +#: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:197 +#: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:208 +#: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:228 +#: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:229 +#: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:250 +#: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:251 +#: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:252 +#: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:253 +#: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." msgstr "" -#: lib/EAPBase_UI/src/EAP_UI.cpp:254 +#: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +#: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 +msgid "MSCHAPv2 User ID and Password" +msgstr "" + +#: lib/PAP_UI/src/PAP_UI.cpp:33 +msgid "PAP User ID and Password" +msgstr "" + #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" msgstr "" @@ -303,7 +313,9 @@ msgid "Acceptable Certificate Authorities:" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 -msgid "List of certificate authorities server's certificate must be issued by" +msgid "" +"Server's certificate must be issued by one of certificate authorities listed" +" here" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 @@ -345,53 +357,28 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:120 -msgid "TLS Client Certificate" +#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 +msgid "User Certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:131 -msgid "Please select your client certificate to use for authentication." +#: lib/TLS_UI/res/wxTLS_UI.cpp:129 +msgid "Please select your &certificate to use for authentication." msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:138 -msgid "Co&nnect without providing a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:139 -msgid "" -"Select if your server does not require you to provide a client certificate" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:146 -msgid "Use the following &certificate:" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:147 -msgid "Select if you need to provide a client certificate when connecting" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:154 +#: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:167 +#: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:172 +#: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:176 -msgid "(Example: user@contoso.com)" -msgstr "" - -#: lib/TLS_UI/res/wxTLS_UI.cpp:184 -msgid "Check if you would like to save certificate selection" -msgstr "" - #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" @@ -401,32 +388,37 @@ msgstr "" msgid "Validation conflict" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:511 +#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 +#: lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" +msgstr "" + +#: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:512 +#: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:513 +#: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:514 +#: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:515 +#: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:531 +#: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" msgstr "" @@ -466,71 +458,75 @@ msgstr "" msgid "Custom outer identity to use" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:275 lib/TTLS_UI/src/Module.cpp:285 -#: lib/EAPBase_UI/include/EAP_UI.h:689 +#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 +#: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/TTLS_UI/src/Module.cpp:277 lib/TTLS_UI/src/Module.cpp:287 -#: lib/EAPBase_UI/include/EAP_UI.h:692 +#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 +#: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:235 +#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:114 -msgid "Select inner authentication method from the list" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:116 -msgid "PAP" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 -msgid "MSCHAPv2" -msgstr "" - -#: lib/TTLS_UI/src/TTLS_UI.cpp:123 lib/TTLS_UI/src/TTLS_UI.cpp:262 +#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/TTLS_UI/src/TTLS_UI.cpp:187 +msgid "Select inner authentication method from the list" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:189 +msgid "PAP" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:191 +msgid "MSCHAPv2" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:289 +#: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:549 +#: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:705 +#: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:739 +#: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:743 +#: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 +msgid "" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:754 lib/EAPBase_UI/include/EAP_UI.h:764 -msgid "" +#: lib/EAPBase_UI/include/EAP_UI.h:820 +msgid "&Remember" +msgstr "" + +#: lib/EAPBase_UI/include/EAP_UI.h:821 +msgid "Check if you would like to save credentials" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:964 @@ -541,27 +537,30 @@ msgstr "" msgid "EAP Connection Configuration" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1258" - -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" msgstr "" -#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 +#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" msgstr "" diff --git a/EventMonitor/locale/bg_BG.po b/EventMonitor/locale/bg_BG.po index 8dabfc4..d785e5e 100644 --- a/EventMonitor/locale/bg_BG.po +++ b/EventMonitor/locale/bg_BG.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1251" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/ca_ES.po b/EventMonitor/locale/ca_ES.po index 68add32..891b9a2 100644 --- a/EventMonitor/locale/ca_ES.po +++ b/EventMonitor/locale/ca_ES.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ca_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/cs_CZ.po b/EventMonitor/locale/cs_CZ.po index d05f853..ace1951 100644 --- a/EventMonitor/locale/cs_CZ.po +++ b/EventMonitor/locale/cs_CZ.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/eduroam_devel/teams/11799/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/cy_UK.po b/EventMonitor/locale/cy_UK.po index 07cba35..f852d20 100644 --- a/EventMonitor/locale/cy_UK.po +++ b/EventMonitor/locale/cy_UK.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Welsh (https://www.transifex.com/eduroam_devel/teams/11799/cy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cy\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/de_DE.po b/EventMonitor/locale/de_DE.po index 687be45..2db5797 100644 --- a/EventMonitor/locale/de_DE.po +++ b/EventMonitor/locale/de_DE.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: eduroam_devel , 2016\n" "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n" @@ -12,16 +12,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" -msgstr "Ereignismonitor" +msgstr "Ereignisanzeige" #: ETWLog.cpp:83 #, c-format @@ -54,20 +54,20 @@ msgid "" "(Run As Administrator) or be a member of Performance Log Users group to " "start event tracing session." msgstr "" -"Zugriff verweigert: Die Sitzung konnte nicht eröffnet werden. Sie benötigen " -"Administratorprivilegien (Als Administrator ausführen) oder müssen in der " -"Benutzergruppe Leistungsprotokollbenutzer sein um eine Ereignislogsitzung zu" -" eröffnen." +"Zugriff verweigert: Für die Sitzung konnte kein Eintrag im Ereignislog " +"angelegt werden. Sie benötigen Administratorenrechte (Als Administrator " +"ausführen) oder müssen in der Benutzergruppe Leistungsprotokollbenutzer sein" +" um eine Ereignislogsitzung zu eröffnen." #: ETWLog.cpp:231 #, c-format msgid "The %s event session already exists." -msgstr "Die Ereignislogsitzung %s existiert bereits." +msgstr "Es besteht bereits ein Eintrag für für die Sitzung %s" #: ETWLog.cpp:235 #, c-format msgid "Error creating event session (error %u)." -msgstr "Fehler beim eröffnen der Ereignislogsitzung (Fehler %u)." +msgstr "Fehler beim Erstellen der Ereignislogsitzung (Fehler %u)." #: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281 #, c-format @@ -150,7 +150,7 @@ msgstr "Ausführlich" #: Frame.cpp:123 Frame.cpp:176 msgid "Displays all levels of records" -msgstr "Zeigt Ereignisse aller Stufen an" +msgstr "Zeigt alle Einträge im Ereignisslog an" #: Frame.cpp:127 Frame.cpp:178 msgid "Informational" @@ -158,8 +158,7 @@ msgstr "Information" #: Frame.cpp:127 Frame.cpp:178 msgid "Displays all records up to informational level" -msgstr "" -"Zeigt alle Ereignisse an, die auf Stufe Information oder wichtiger sind." +msgstr "Zeigt alle Einträge der Stufe Information oder wichtiger an." #: Frame.cpp:131 Frame.cpp:180 msgid "Warning" @@ -167,7 +166,7 @@ msgstr "Warnung" #: Frame.cpp:131 Frame.cpp:180 msgid "Displays all records up to warning level" -msgstr "Zeigt alle Ereignisse an, die auf Stufe Warnung oder wichtiger sind." +msgstr "Zeigt alle Einträge der Stufe Warnung oder wichtiger an." #: Frame.cpp:135 Frame.cpp:182 msgid "Error" @@ -175,7 +174,7 @@ msgstr "Fehler" #: Frame.cpp:135 Frame.cpp:182 msgid "Displays error level records only" -msgstr "Zeigt nur Ereignesse der Stufe Fehler an" +msgstr "Zeigt nur die Fehlermeldungen an" #: Frame.cpp:142 Frame.cpp:146 #, c-format @@ -215,21 +214,14 @@ msgstr "Automatischer Bildlauf" msgid "Trace Log" msgstr "Ereignislog" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "EVENTM~1|GÉANTLink Ereignismonitor" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "Echtzeitanzeige der internen Ereignisse" + +#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4 +msgid "EVENTM~1|GÉANTLink Event Monitor" +msgstr "EVENTM~1|GÉANTLink Ereignismonitor" diff --git a/EventMonitor/locale/el_GR.po b/EventMonitor/locale/el_GR.po index 8cb84f1..86fc597 100644 --- a/EventMonitor/locale/el_GR.po +++ b/EventMonitor/locale/el_GR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Zenon Mousmoulas , 2016\n" "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n" @@ -12,14 +12,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "Παρακολούθηση Συνεδριών" @@ -213,21 +213,14 @@ msgstr "Αυτόματη Κύλιση" msgid "Trace Log" msgstr "Trace Log" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1253" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "EVENTM~1|GÉANTLink Event Monitor" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "Απεικόνιση των εσωτερικών γεγονότων σε πραγματικό χρόνο " + +#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4 +msgid "EVENTM~1|GÉANTLink Event Monitor" +msgstr "EVENTM~1|GÉANTLink Event Monitor" diff --git a/EventMonitor/locale/es_ES.po b/EventMonitor/locale/es_ES.po index aaf9efc..6847682 100644 --- a/EventMonitor/locale/es_ES.po +++ b/EventMonitor/locale/es_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: José Manuel Macías , 2016\n" "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n" @@ -12,14 +12,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "Monitor de eventos" @@ -213,21 +213,14 @@ msgstr "Autodesplazamiento" msgid "Trace Log" msgstr "Trazar log" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "EVENTM~1|Monitor de eventos de GÉANTLink" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "Mostrar en tiempo real los eventos internos" + +#: 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|Monitor de eventos de GÉANTLink" diff --git a/EventMonitor/locale/eu_ES.po b/EventMonitor/locale/eu_ES.po index f9b517e..d2b0363 100644 --- a/EventMonitor/locale/eu_ES.po +++ b/EventMonitor/locale/eu_ES.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Basque (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/eu_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eu_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/fi_FI.po b/EventMonitor/locale/fi_FI.po index bda8c7e..0a8b918 100644 --- a/EventMonitor/locale/fi_FI.po +++ b/EventMonitor/locale/fi_FI.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/eduroam_devel/teams/11799/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/fr_CA.po b/EventMonitor/locale/fr_CA.po index 0938f49..293e1a2 100644 --- a/EventMonitor/locale/fr_CA.po +++ b/EventMonitor/locale/fr_CA.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: French (Canada) (https://www.transifex.com/eduroam_devel/teams/11799/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/fr_FR.po b/EventMonitor/locale/fr_FR.po index e6add45..1f70dcc 100644 --- a/EventMonitor/locale/fr_FR.po +++ b/EventMonitor/locale/fr_FR.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: French (France) (https://www.transifex.com/eduroam_devel/teams/11799/fr_FR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/gl_ES.po b/EventMonitor/locale/gl_ES.po index bf0b902..fe45aec 100644 --- a/EventMonitor/locale/gl_ES.po +++ b/EventMonitor/locale/gl_ES.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Galician (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/gl_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: gl_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/hr_HR.po b/EventMonitor/locale/hr_HR.po index a31361f..f694f5f 100644 --- a/EventMonitor/locale/hr_HR.po +++ b/EventMonitor/locale/hr_HR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Dubravko Penezic , 2016\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/eduroam_devel/teams/11799/hr_HR/)\n" @@ -12,14 +12,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: hr_HR\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "Preglednik Događaja" @@ -212,21 +212,14 @@ msgstr "Automatsko pomicanje" msgid "Trace Log" msgstr "Pregledaj Log" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "EVENTM~1|GÉANTLink Preglednik događaja" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "Prikaz događaja u realnom vremenu " + +#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4 +msgid "EVENTM~1|GÉANTLink Event Monitor" +msgstr "EVENTM~1|GÉANTLink Preglednik događaja" diff --git a/EventMonitor/locale/hu_HU.po b/EventMonitor/locale/hu_HU.po index 1e0814c..878b906 100644 --- a/EventMonitor/locale/hu_HU.po +++ b/EventMonitor/locale/hu_HU.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Hungarian (https://www.transifex.com/eduroam_devel/teams/11799/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/is_IS.po b/EventMonitor/locale/is_IS.po index 5355b72..a3518c3 100644 --- a/EventMonitor/locale/is_IS.po +++ b/EventMonitor/locale/is_IS.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Icelandic (https://www.transifex.com/eduroam_devel/teams/11799/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/it_IT.po b/EventMonitor/locale/it_IT.po index 4d1d995..9907c8e 100644 --- a/EventMonitor/locale/it_IT.po +++ b/EventMonitor/locale/it_IT.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\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 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/lt_LT.po b/EventMonitor/locale/lt_LT.po index a779d40..3ad28d4 100644 --- a/EventMonitor/locale/lt_LT.po +++ b/EventMonitor/locale/lt_LT.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Rimas Kudelis , 2016\n" "Language-Team: Lithuanian (https://www.transifex.com/eduroam_devel/teams/11799/lt/)\n" @@ -12,14 +12,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "Įvykių stebėjimo programa" @@ -211,21 +211,14 @@ msgstr "Automatinė slinktis" msgid "Trace Log" msgstr "Sekimo žurnalas" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1257" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "EVENTM~1|„GÉANTLink“ įvykių stebėjimo programa" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "Vidinių įvykių stebėjimas tikruoju laiku" + +#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4 +msgid "EVENTM~1|GÉANTLink Event Monitor" +msgstr "EVENTM~1|„GÉANTLink“ įvykių stebėjimo programa" diff --git a/EventMonitor/locale/nb_NO.po b/EventMonitor/locale/nb_NO.po index 71b566e..b15a283 100644 --- a/EventMonitor/locale/nb_NO.po +++ b/EventMonitor/locale/nb_NO.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Tom Ivar Myren , 2016\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n" @@ -12,14 +12,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "Hendelses monitor" @@ -212,21 +212,14 @@ msgstr "Auto Scroll" msgid "Trace Log" msgstr "Sporingslogg" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "EVENTM~1|GÉANTLink Hendelses monitor" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "Sanntidsvisning av interne hendelser" + +#: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4 +msgid "EVENTM~1|GÉANTLink Event Monitor" +msgstr "EVENTM~1|GÉANTLink Hendelses monitor" diff --git a/EventMonitor/locale/nl_NL.po b/EventMonitor/locale/nl_NL.po index 14cdc49..10518a7 100644 --- a/EventMonitor/locale/nl_NL.po +++ b/EventMonitor/locale/nl_NL.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Dutch (https://www.transifex.com/eduroam_devel/teams/11799/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/pl_PL.po b/EventMonitor/locale/pl_PL.po index 0a19d45..bf4b1c7 100644 --- a/EventMonitor/locale/pl_PL.po +++ b/EventMonitor/locale/pl_PL.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Tomasz Wolniewicz , 2016\n" "Language-Team: Polish (Poland) (https://www.transifex.com/eduroam_devel/teams/11799/pl_PL/)\n" @@ -12,14 +12,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pl_PL\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "Monitor Zdarzeń" @@ -213,21 +213,14 @@ msgstr "Automatyczne przewijanie" msgid "Trace Log" msgstr "Dziennik śledzenia" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "EVENTM~1|Monitor zdarzeń GÉANTLink" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "Wyświetlanie zdarzeń wewnętrznych w czasie rzeczywistym" + +#: 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|Monitor zdarzeń GÉANTLink" diff --git a/EventMonitor/locale/pt_PT.po b/EventMonitor/locale/pt_PT.po index 83a7f3a..3a0e783 100644 --- a/EventMonitor/locale/pt_PT.po +++ b/EventMonitor/locale/pt_PT.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Pedro Simões , 2016\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n" @@ -12,14 +12,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +209,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/ru_RU.po b/EventMonitor/locale/ru_RU.po index bd994c3..488ac33 100644 --- a/EventMonitor/locale/ru_RU.po +++ b/EventMonitor/locale/ru_RU.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Russian (Russia) (https://www.transifex.com/eduroam_devel/teams/11799/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1251" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/sk_SK.po b/EventMonitor/locale/sk_SK.po index 3269310..af61c4b 100644 --- a/EventMonitor/locale/sk_SK.po +++ b/EventMonitor/locale/sk_SK.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Slovak (Slovakia) (https://www.transifex.com/eduroam_devel/teams/11799/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/sl_SI.po b/EventMonitor/locale/sl_SI.po index 2759ca2..c8701b9 100644 --- a/EventMonitor/locale/sl_SI.po +++ b/EventMonitor/locale/sl_SI.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n" @@ -12,14 +12,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: sl_SI\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "Nadzornik dogodkov" @@ -212,21 +212,14 @@ msgstr "Samodrsenje" msgid "Trace Log" msgstr "Dnevnik sledenja" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "EVENTM~1|Nadzornik dogodkov GÉANTLink" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "Prikazovalnik notranjih dogodkov v realnem času" + +#: 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|Nadzornik dogodkov GÉANTLink" diff --git a/EventMonitor/locale/sr_RS.po b/EventMonitor/locale/sr_RS.po index 2da871f..fd4512d 100644 --- a/EventMonitor/locale/sr_RS.po +++ b/EventMonitor/locale/sr_RS.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/sv_SE.po b/EventMonitor/locale/sv_SE.po index 1d22075..e4296d3 100644 --- a/EventMonitor/locale/sv_SE.po +++ b/EventMonitor/locale/sv_SE.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Swedish (https://www.transifex.com/eduroam_devel/teams/11799/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/tr_TR.po b/EventMonitor/locale/tr_TR.po index fac0f43..5f0832b 100644 --- a/EventMonitor/locale/tr_TR.po +++ b/EventMonitor/locale/tr_TR.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Turkish (https://www.transifex.com/eduroam_devel/teams/11799/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1254" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/EventMonitor/locale/vi_VN.po b/EventMonitor/locale/vi_VN.po index d1a90b9..8293a9f 100644 --- a/EventMonitor/locale/vi_VN.po +++ b/EventMonitor/locale/vi_VN.po @@ -3,23 +3,22 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-09-12 11:18+0200\n" +"POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Vietnamese (https://www.transifex.com/eduroam_devel/teams/11799/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: App.cpp:61 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -209,21 +208,14 @@ msgstr "" msgid "Trace Log" msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -msgid "1252" -msgstr "1258" - -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 -msgid "EVENTM~1|GÉANTLink Event Monitor" -msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +#: 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 "" + +#: 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 "" diff --git a/MSI/Base/locale/bg_BG.po b/MSI/Base/locale/bg_BG.po index bfab3e0..b5df740 100644 --- a/MSI/Base/locale/bg_BG.po +++ b/MSI/Base/locale/bg_BG.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1251" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/ca_ES.po b/MSI/Base/locale/ca_ES.po index 4a198a0..164f502 100644 --- a/MSI/Base/locale/ca_ES.po +++ b/MSI/Base/locale/ca_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: ca_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/cs_CZ.po b/MSI/Base/locale/cs_CZ.po index 83fea84..50ee0f7 100644 --- a/MSI/Base/locale/cs_CZ.po +++ b/MSI/Base/locale/cs_CZ.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/eduroam_devel/teams/11799/cs_CZ/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/cy_UK.po b/MSI/Base/locale/cy_UK.po index 2ea1231..25afe33 100644 --- a/MSI/Base/locale/cy_UK.po +++ b/MSI/Base/locale/cy_UK.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Welsh (https://www.transifex.com/eduroam_devel/teams/11799/cy/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: cy\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/de_DE.po b/MSI/Base/locale/de_DE.po index 32c8839..2aa2ff3 100644 --- a/MSI/Base/locale/de_DE.po +++ b/MSI/Base/locale/de_DE.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: eduroam_devel , 2016\n" "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n" @@ -12,27 +12,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" "[ProductName] benötigt Windows Vista oder eine neuere Version von Windows." -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/el_GR.po b/MSI/Base/locale/el_GR.po index 96771a5..83e5486 100644 --- a/MSI/Base/locale/el_GR.po +++ b/MSI/Base/locale/el_GR.po @@ -3,36 +3,32 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: Vicky Kons , 2016\n" "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" "[Όνομα Προϊόντος] απαιτεί Windows Vista ή μεταγενέστερη έκδοση Windows." -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/es_ES.po b/MSI/Base/locale/es_ES.po index e41614b..ffaaba1 100644 --- a/MSI/Base/locale/es_ES.po +++ b/MSI/Base/locale/es_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: José Manuel Macías , 2016\n" "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n" @@ -12,27 +12,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" "[ProductName] requiere Windows Vista o una versió posterior de Windows." -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/eu_ES.po b/MSI/Base/locale/eu_ES.po index 62bd553..15f2af2 100644 --- a/MSI/Base/locale/eu_ES.po +++ b/MSI/Base/locale/eu_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Basque (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/eu_ES/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: eu_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/fi_FI.po b/MSI/Base/locale/fi_FI.po index 59ec7c6..b908291 100644 --- a/MSI/Base/locale/fi_FI.po +++ b/MSI/Base/locale/fi_FI.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/eduroam_devel/teams/11799/fi_FI/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/fr_CA.po b/MSI/Base/locale/fr_CA.po index 17b6d66..e291f9f 100644 --- a/MSI/Base/locale/fr_CA.po +++ b/MSI/Base/locale/fr_CA.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: French (Canada) (https://www.transifex.com/eduroam_devel/teams/11799/fr_CA/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/fr_FR.po b/MSI/Base/locale/fr_FR.po index d61bb3a..8e2b9a5 100644 --- a/MSI/Base/locale/fr_FR.po +++ b/MSI/Base/locale/fr_FR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: French (France) (https://www.transifex.com/eduroam_devel/teams/11799/fr_FR/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/gl_ES.po b/MSI/Base/locale/gl_ES.po index 391409d..4fd0d7a 100644 --- a/MSI/Base/locale/gl_ES.po +++ b/MSI/Base/locale/gl_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Galician (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/gl_ES/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: gl_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/hr_HR.po b/MSI/Base/locale/hr_HR.po index f6461c1..2d7a4a0 100644 --- a/MSI/Base/locale/hr_HR.po +++ b/MSI/Base/locale/hr_HR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Dubravko Penezic , 2016\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/eduroam_devel/teams/11799/hr_HR/)\n" @@ -12,28 +12,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: hr_HR\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" "[ProductName] treba Windows Vista ili veču verziju Windows opreativnog " "sustava." -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/hu_HU.po b/MSI/Base/locale/hu_HU.po index dae6122..9987d61 100644 --- a/MSI/Base/locale/hu_HU.po +++ b/MSI/Base/locale/hu_HU.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Hungarian (https://www.transifex.com/eduroam_devel/teams/11799/hu/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/is_IS.po b/MSI/Base/locale/is_IS.po index 99a4b6c..37d5d72 100644 --- a/MSI/Base/locale/is_IS.po +++ b/MSI/Base/locale/is_IS.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Icelandic (https://www.transifex.com/eduroam_devel/teams/11799/is/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/it_IT.po b/MSI/Base/locale/it_IT.po index 6088774..9f4b11e 100644 --- a/MSI/Base/locale/it_IT.po +++ b/MSI/Base/locale/it_IT.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Italian (Italy) (https://www.transifex.com/eduroam_devel/teams/11799/it_IT/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: it_IT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/lt_LT.po b/MSI/Base/locale/lt_LT.po index 177820a..4b21736 100644 --- a/MSI/Base/locale/lt_LT.po +++ b/MSI/Base/locale/lt_LT.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Rimas Kudelis , 2016\n" "Language-Team: Lithuanian (https://www.transifex.com/eduroam_devel/teams/11799/lt/)\n" @@ -12,28 +12,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" "„[ProductName]“ veikimui būtina „Windows Vista“ ar vėlesnė „Windows“ " "versija." -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1257" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/nb_NO.po b/MSI/Base/locale/nb_NO.po index db4c8fa..f09a857 100644 --- a/MSI/Base/locale/nb_NO.po +++ b/MSI/Base/locale/nb_NO.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Tom Ivar Myren , 2016\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "[ProductName] krever Windows Vista eller nyere versjon av Windows." -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/nl_NL.po b/MSI/Base/locale/nl_NL.po index 4c438d8..ef463d1 100644 --- a/MSI/Base/locale/nl_NL.po +++ b/MSI/Base/locale/nl_NL.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Dutch (https://www.transifex.com/eduroam_devel/teams/11799/nl/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/pl_PL.po b/MSI/Base/locale/pl_PL.po index 102363f..054ed87 100644 --- a/MSI/Base/locale/pl_PL.po +++ b/MSI/Base/locale/pl_PL.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Tomasz Wolniewicz , 2016\n" "Language-Team: Polish (Poland) (https://www.transifex.com/eduroam_devel/teams/11799/pl_PL/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pl_PL\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "[ProductName] wymaga Windows Vista albo nowszej wersji Windows." -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/pt_PT.po b/MSI/Base/locale/pt_PT.po index 4117b97..8c9559d 100644 --- a/MSI/Base/locale/pt_PT.po +++ b/MSI/Base/locale/pt_PT.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Pedro Simões , 2016\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "[ProductName] requer o Windows Vista ou versão posterior do Windows" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/ru_RU.po b/MSI/Base/locale/ru_RU.po index 36b9cf2..9dfa2b3 100644 --- a/MSI/Base/locale/ru_RU.po +++ b/MSI/Base/locale/ru_RU.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Russian (Russia) (https://www.transifex.com/eduroam_devel/teams/11799/ru_RU/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1251" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/sk_SK.po b/MSI/Base/locale/sk_SK.po index 2dae087..3befe4f 100644 --- a/MSI/Base/locale/sk_SK.po +++ b/MSI/Base/locale/sk_SK.po @@ -3,35 +3,31 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: martins , 2016\n" "Language-Team: Slovak (Slovakia) (https://www.transifex.com/eduroam_devel/teams/11799/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." -msgstr "" +msgstr "[ProductName] vyžaduje Windows Vista alebo novšiu verziu Windows." -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" -msgstr "" +msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/sl_SI.po b/MSI/Base/locale/sl_SI.po index 5f4357e..9f97686 100644 --- a/MSI/Base/locale/sl_SI.po +++ b/MSI/Base/locale/sl_SI.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: sl_SI\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "[ProductName] zahteva Windows Vista ali novejšo verzijo Windowsov." -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "http://www.geant.org/" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/sr_RS.po b/MSI/Base/locale/sr_RS.po index 629c9e7..86b1f96 100644 --- a/MSI/Base/locale/sr_RS.po +++ b/MSI/Base/locale/sr_RS.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1250" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/sv_SE.po b/MSI/Base/locale/sv_SE.po index 074dbd8..9bf3939 100644 --- a/MSI/Base/locale/sv_SE.po +++ b/MSI/Base/locale/sv_SE.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Swedish (https://www.transifex.com/eduroam_devel/teams/11799/sv/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1252" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/tr_TR.po b/MSI/Base/locale/tr_TR.po index fb4f00c..96dcf4c 100644 --- a/MSI/Base/locale/tr_TR.po +++ b/MSI/Base/locale/tr_TR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Turkish (https://www.transifex.com/eduroam_devel/teams/11799/tr/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1254" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/vi_VN.po b/MSI/Base/locale/vi_VN.po index 2a2434b..8590a25 100644 --- a/MSI/Base/locale/vi_VN.po +++ b/MSI/Base/locale/vi_VN.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: GÉANTLink MSI\n" -"POT-Creation-Date: 2016-08-31 14:33+0200\n" +"POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Vietnamese (https://www.transifex.com/eduroam_devel/teams/11799/vi/)\n" @@ -12,26 +12,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ../Main\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: En.Win32.Release.LaunchCondition-2.idtx:4 -#: En.x64.Release.LaunchCondition-2.idtx:4 +#: en_US.Win32.Release.LaunchCondition-2.idtx:4 +#: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" -#: En.Win32.Release.Property-2.idtx:3 En.x64.Release.Property-2.idtx:3 -msgid "1252" -msgstr "1258" - -#: En.Win32.Release.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:5 -#: En.x64.Release.Property-2.idtx:4 En.x64.Release.Property-2.idtx:5 +#: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 +#: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" msgstr "" -#: En.Win32.Release.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" msgstr "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/MSIBuild b/MSI/MSIBuild index df5ffbd..d2e4553 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit df5ffbdd2b1afd5ec33604233a98e8838c85ca15 +Subproject commit d2e4553dd0e12d0a891efffb44768b55934a8cde diff --git a/WLANManager/locale/bg_BG.po b/WLANManager/locale/bg_BG.po index 512e754..12d0e94 100644 --- a/WLANManager/locale/bg_BG.po +++ b/WLANManager/locale/bg_BG.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1251" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/ca_ES.po b/WLANManager/locale/ca_ES.po index 8d6c640..cf2ae4b 100644 --- a/WLANManager/locale/ca_ES.po +++ b/WLANManager/locale/ca_ES.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ca_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/cs_CZ.po b/WLANManager/locale/cs_CZ.po index 75c09ac..32ea572 100644 --- a/WLANManager/locale/cs_CZ.po +++ b/WLANManager/locale/cs_CZ.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/eduroam_devel/teams/11799/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/cy_UK.po b/WLANManager/locale/cy_UK.po index c051904..2c2b7cc 100644 --- a/WLANManager/locale/cy_UK.po +++ b/WLANManager/locale/cy_UK.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Welsh (https://www.transifex.com/eduroam_devel/teams/11799/cy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cy\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/de_DE.po b/WLANManager/locale/de_DE.po index d7de6ce..f5ee13c 100644 --- a/WLANManager/locale/de_DE.po +++ b/WLANManager/locale/de_DE.po @@ -1,10 +1,9 @@ -# Translators: -# Simon Rozman , 2016 -# eduroam_devel , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: eduroam_devel , 2016\n" "Language-Team: German (https://www.transifex.com/eduroam_devel/teams/11799/de/)\n" @@ -13,26 +12,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "WLAN Verwaltung" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" "Hilfswerkzeug das direkten Zugang zu den Eigenschaften der WLAN-Verbindung " "herstellt" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "WLAN Verwaltung" diff --git a/WLANManager/locale/el_GR.po b/WLANManager/locale/el_GR.po index bb13a5d..9b77099 100644 --- a/WLANManager/locale/el_GR.po +++ b/WLANManager/locale/el_GR.po @@ -1,10 +1,9 @@ -# Translators: -# Simon Rozman , 2016 -# Vicky Kons , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Vicky Kons , 2016\n" "Language-Team: Greek (https://www.transifex.com/eduroam_devel/teams/11799/el/)\n" @@ -13,26 +12,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1253" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "WLAN Διαχειριστής" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" "Βοηθιτικό πρόγραμμα για να στηρίξει τις απευθείας συντομέυσεις στις " "Ιδιότητες του Ασύρματου Δικτύου" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "WLAN Διαχειριστής" diff --git a/WLANManager/locale/es_ES.po b/WLANManager/locale/es_ES.po index bf509a7..f95cdc6 100644 --- a/WLANManager/locale/es_ES.po +++ b/WLANManager/locale/es_ES.po @@ -1,10 +1,9 @@ -# Translators: -# Simon Rozman , 2016 -# José Manuel Macías , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: José Manuel Macías , 2016\n" "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n" @@ -13,26 +12,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "Administrador de Redes Inalámbricas" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" "Utilidad de ayuda para soportar accesos directos a las Propiedades de Red " "Inalámbrica" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "Administrador de Redes Inalámbricas" diff --git a/WLANManager/locale/eu_ES.po b/WLANManager/locale/eu_ES.po index 013cb07..82a070e 100644 --- a/WLANManager/locale/eu_ES.po +++ b/WLANManager/locale/eu_ES.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Basque (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/eu_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eu_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/fi_FI.po b/WLANManager/locale/fi_FI.po index 95540d0..570abf1 100644 --- a/WLANManager/locale/fi_FI.po +++ b/WLANManager/locale/fi_FI.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/eduroam_devel/teams/11799/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/fr_CA.po b/WLANManager/locale/fr_CA.po index 966248e..9d04bf1 100644 --- a/WLANManager/locale/fr_CA.po +++ b/WLANManager/locale/fr_CA.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: French (Canada) (https://www.transifex.com/eduroam_devel/teams/11799/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/fr_FR.po b/WLANManager/locale/fr_FR.po index 6b7a203..e007bb0 100644 --- a/WLANManager/locale/fr_FR.po +++ b/WLANManager/locale/fr_FR.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: French (France) (https://www.transifex.com/eduroam_devel/teams/11799/fr_FR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/gl_ES.po b/WLANManager/locale/gl_ES.po index e35e9df..53696cf 100644 --- a/WLANManager/locale/gl_ES.po +++ b/WLANManager/locale/gl_ES.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Galician (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/gl_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: gl_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/hr_HR.po b/WLANManager/locale/hr_HR.po index 9c4cdb6..81b4f4e 100644 --- a/WLANManager/locale/hr_HR.po +++ b/WLANManager/locale/hr_HR.po @@ -1,10 +1,9 @@ -# Translators: -# Simon Rozman , 2016 -# Dubravko Penezic , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Dubravko Penezic , 2016\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/eduroam_devel/teams/11799/hr_HR/)\n" @@ -13,24 +12,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: hr_HR\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "WLAN Manager" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "Pomoćni alat za uspostavu kratice do bežičnih mrežnih postavki " - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "WLAN Manager" diff --git a/WLANManager/locale/hu_HU.po b/WLANManager/locale/hu_HU.po index d5cb541..78379a6 100644 --- a/WLANManager/locale/hu_HU.po +++ b/WLANManager/locale/hu_HU.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Hungarian (https://www.transifex.com/eduroam_devel/teams/11799/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/is_IS.po b/WLANManager/locale/is_IS.po index 884afcf..e0fd089 100644 --- a/WLANManager/locale/is_IS.po +++ b/WLANManager/locale/is_IS.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Icelandic (https://www.transifex.com/eduroam_devel/teams/11799/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/it_IT.po b/WLANManager/locale/it_IT.po index 6367e9e..08104a2 100644 --- a/WLANManager/locale/it_IT.po +++ b/WLANManager/locale/it_IT.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\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 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/lt_LT.po b/WLANManager/locale/lt_LT.po index ec8e0ca..65d1a93 100644 --- a/WLANManager/locale/lt_LT.po +++ b/WLANManager/locale/lt_LT.po @@ -1,10 +1,9 @@ -# Translators: -# Simon Rozman , 2016 -# Rimas Kudelis , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Rimas Kudelis , 2016\n" "Language-Team: Lithuanian (https://www.transifex.com/eduroam_devel/teams/11799/lt/)\n" @@ -13,26 +12,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1257" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "WLAN tvarkytuvė" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" "Pagalbinė programa, suteikianti galimybę naudotis tiesioginėmis nuorodomis į" " belaidžio tinklo ypatybes" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "WLAN tvarkytuvė" diff --git a/WLANManager/locale/nb_NO.po b/WLANManager/locale/nb_NO.po index 4d55941..a213d59 100644 --- a/WLANManager/locale/nb_NO.po +++ b/WLANManager/locale/nb_NO.po @@ -1,10 +1,9 @@ -# Translators: -# Simon Rozman , 2016 -# Tom Ivar Myren , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Tom Ivar Myren , 2016\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/eduroam_devel/teams/11799/nb/)\n" @@ -13,25 +12,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "WLAN Manager" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" "Helpeverktøy for å støtte direkte snarveier til trådløse nettverksegenskaper" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "WLAN Manager" diff --git a/WLANManager/locale/nl_NL.po b/WLANManager/locale/nl_NL.po index c4fe300..845d9bb 100644 --- a/WLANManager/locale/nl_NL.po +++ b/WLANManager/locale/nl_NL.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Dutch (https://www.transifex.com/eduroam_devel/teams/11799/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/pl_PL.po b/WLANManager/locale/pl_PL.po index 0945286..b423ebc 100644 --- a/WLANManager/locale/pl_PL.po +++ b/WLANManager/locale/pl_PL.po @@ -1,10 +1,9 @@ -# Translators: -# Simon Rozman , 2016 -# Tomasz Wolniewicz , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Tomasz Wolniewicz , 2016\n" "Language-Team: Polish (Poland) (https://www.transifex.com/eduroam_devel/teams/11799/pl_PL/)\n" @@ -13,26 +12,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pl_PL\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "Menaźer WLAN" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" "Aplikacja wspomagająca bezpośrednie wywołania właściwości sieci " "bezprzewodowej" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "Menaźer WLAN" diff --git a/WLANManager/locale/pt_PT.po b/WLANManager/locale/pt_PT.po index a25e4f7..878dc5d 100644 --- a/WLANManager/locale/pt_PT.po +++ b/WLANManager/locale/pt_PT.po @@ -1,10 +1,9 @@ -# Translators: -# Simon Rozman , 2016 -# Pedro Simões , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Pedro Simões , 2016\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/eduroam_devel/teams/11799/pt_PT/)\n" @@ -13,24 +12,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "WLAN Manager" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "WLAN Manager" diff --git a/WLANManager/locale/ru_RU.po b/WLANManager/locale/ru_RU.po index 85d888c..c1dc995 100644 --- a/WLANManager/locale/ru_RU.po +++ b/WLANManager/locale/ru_RU.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Russian (Russia) (https://www.transifex.com/eduroam_devel/teams/11799/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1251" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/sk_SK.po b/WLANManager/locale/sk_SK.po index 6776f96..e507346 100644 --- a/WLANManager/locale/sk_SK.po +++ b/WLANManager/locale/sk_SK.po @@ -1,35 +1,36 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: martins , 2016\n" "Language-Team: Slovak (Slovakia) (https://www.transifex.com/eduroam_devel/teams/11799/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "WLAN Manager" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" +"Pomocný nástroj určený na podporu priamych skratiek k nastaveniam " +"bezdrôtovej siete." diff --git a/WLANManager/locale/sl_SI.po b/WLANManager/locale/sl_SI.po index ae25856..a8d0bbe 100644 --- a/WLANManager/locale/sl_SI.po +++ b/WLANManager/locale/sl_SI.po @@ -1,9 +1,9 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman , 2016\n" "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n" @@ -12,26 +12,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: sl_SI\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "Upravitelj WLAN" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" "Orodje za pomoč, ki omogoča neposredne bližnjice do nastavitev brezžičnega " "omrežja" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "Upravitelj WLAN" diff --git a/WLANManager/locale/sr_RS.po b/WLANManager/locale/sr_RS.po index 4aaeea7..58523e7 100644 --- a/WLANManager/locale/sr_RS.po +++ b/WLANManager/locale/sr_RS.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1250" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/sv_SE.po b/WLANManager/locale/sv_SE.po index ba94762..51d0a01 100644 --- a/WLANManager/locale/sv_SE.po +++ b/WLANManager/locale/sv_SE.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Swedish (https://www.transifex.com/eduroam_devel/teams/11799/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1252" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/tr_TR.po b/WLANManager/locale/tr_TR.po index 697612d..79e43ac 100644 --- a/WLANManager/locale/tr_TR.po +++ b/WLANManager/locale/tr_TR.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Turkish (https://www.transifex.com/eduroam_devel/teams/11799/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1254" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" diff --git a/WLANManager/locale/vi_VN.po b/WLANManager/locale/vi_VN.po index 8d2f08f..b6d0932 100644 --- a/WLANManager/locale/vi_VN.po +++ b/WLANManager/locale/vi_VN.po @@ -1,35 +1,33 @@ -# Translators: -# Simon Rozman , 2016 +# +#, fuzzy msgid "" msgstr "" "Project-Id-Version: WLANManager\n" -"POT-Creation-Date: 2016-08-28 12:03+0200\n" +"POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" "Language-Team: Vietnamese (https://www.transifex.com/eduroam_devel/teams/11799/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" "X-Poedit-Basepath: ..\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 -#: MSIBuild/En.x64.Release.Feature-2.idtx:3 -msgid "1252" -msgstr "1258" +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 +msgid "WLAN Manager" +msgstr "" -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 +#: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" - -#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 -#: MSIBuild/En.x64.Release.Feature-2.idtx:4 -msgid "WLAN Manager" -msgstr "" From 70f9a954216bb0b37e949d03790b56ea36987364 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 30 Sep 2016 14:32:59 +0200 Subject: [PATCH 10/54] Version set to 1.0-beta7 --- include/Version.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/Version.h b/include/Version.h index 96e0707..9881f57 100644 --- a/include/Version.h +++ b/include/Version.h @@ -29,7 +29,7 @@ // Product version as a single DWORD // Note: Used for version comparison within C/C++ code. // -#define PRODUCT_VERSION 0x00ff1800 +#define PRODUCT_VERSION 0x00ff1900 // // Product version by components @@ -39,26 +39,26 @@ // #define PRODUCT_VERSION_MAJ 0 #define PRODUCT_VERSION_MIN 255 -#define PRODUCT_VERSION_REV 24 +#define PRODUCT_VERSION_REV 25 #define PRODUCT_VERSION_BUILD 0 // // Human readable product version and build year for UI // -#define PRODUCT_VERSION_STR "1.0-beta6" +#define PRODUCT_VERSION_STR "1.0-beta7" #define PRODUCT_BUILD_YEAR_STR "2016" // // Numerical version presentation for ProductVersion propery in // MSI packages (syntax: N.N[.N[.N]]) // -#define PRODUCT_VERSION_INST "0.255.24" +#define PRODUCT_VERSION_INST "0.255.25" // // The product code for ProductCode property in MSI packages // Replace with new on every version change, regardless how minor it is. // -#define PRODUCT_VERSION_GUID "{68407777-8DFF-49BF-9687-0A8DA406AA34}" +#define PRODUCT_VERSION_GUID "{603E4647-DA68-4F56-9503-9050756C3159}" // // Product vendor From dcbe5410cdc1731498b5dd68fd4e08198956d0ce Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 09:04:21 +0200 Subject: [PATCH 11/54] Sub-module update --- lib/WinStd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/WinStd b/lib/WinStd index d029358..129b9c9 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit d02935808605803b51b6b533b9943bf1e3d370a4 +Subproject commit 129b9c9a10c2145235e8f447706875dcafa4a4a3 From 82f5cd7507b4c6ca2d2aa0940b4aff1dec04a09d Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 09:35:14 +0200 Subject: [PATCH 12/54] ID 1. Variables shadowing from security audit report fixed --- lib/TTLS/include/Method.h | 3 --- lib/TTLS/src/Method.cpp | 10 +++------- lib/TTLS_UI/include/TTLS_UI.h | 1 - lib/TTLS_UI/src/TTLS_UI.cpp | 15 +++++++-------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/lib/TTLS/include/Method.h b/lib/TTLS/include/Method.h index 66fb974..db362ee 100644 --- a/lib/TTLS/include/Method.h +++ b/lib/TTLS/include/Method.h @@ -141,9 +141,6 @@ namespace eap virtual void process_application_data(_In_bytecount_(size_msg) const void *msg, _In_ size_t size_msg); protected: - config_method_ttls &m_cfg; ///< EAP-TTLS method configuration - credentials_ttls &m_cred; ///< EAP-TTLS credentials - #pragma warning(suppress: 4480) enum version_t :unsigned char { version_0 = 0, ///< EAP-TTLS v0 diff --git a/lib/TTLS/src/Method.cpp b/lib/TTLS/src/Method.cpp index 437b9fa..1bb4806 100644 --- a/lib/TTLS/src/Method.cpp +++ b/lib/TTLS/src/Method.cpp @@ -29,8 +29,6 @@ using namespace winstd; ////////////////////////////////////////////////////////////////////// eap::method_ttls::method_ttls(_In_ module &module, _In_ config_method_ttls &cfg, _In_ credentials_ttls &cred) : - m_cfg(cfg), - m_cred(cred), m_version(version_0), method_tls(module, cfg, cred) { @@ -38,8 +36,6 @@ eap::method_ttls::method_ttls(_In_ module &module, _In_ config_method_ttls &cfg, eap::method_ttls::method_ttls(_Inout_ method_ttls &&other) : - m_cfg ( other.m_cfg ), - m_cred ( other.m_cred ), m_version (std::move(other.m_version)), m_inner (std::move(other.m_inner )), method_tls(std::move(other )) @@ -68,9 +64,9 @@ void eap::method_ttls::begin_session( method_tls::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize); // Initialize inner method. - switch (m_cfg.m_inner->get_method_id()) { - case eap_type_legacy_pap : m_inner.reset(new method_pap (m_module, (config_method_pap &)*m_cfg.m_inner, (credentials_pass &)*m_cred.m_inner.get())); break; - case eap_type_legacy_mschapv2: m_inner.reset(new method_mschapv2(m_module, (config_method_mschapv2&)*m_cfg.m_inner, (credentials_pass&)*m_cred.m_inner.get())); break; + switch (dynamic_cast(m_cfg).m_inner->get_method_id()) { + case eap_type_legacy_pap : m_inner.reset(new method_pap (m_module, (config_method_pap &)*dynamic_cast(m_cfg).m_inner, (credentials_pass&)*dynamic_cast(m_cred).m_inner.get())); break; + case eap_type_legacy_mschapv2: m_inner.reset(new method_mschapv2(m_module, (config_method_mschapv2&)*dynamic_cast(m_cfg).m_inner, (credentials_pass&)*dynamic_cast(m_cred).m_inner.get())); break; default: throw invalid_argument(__FUNCTION__ " Unsupported inner authentication method."); } m_inner->begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, MAXDWORD); diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h index 0007799..3f19337 100644 --- a/lib/TTLS_UI/include/TTLS_UI.h +++ b/lib/TTLS_UI/include/TTLS_UI.h @@ -135,7 +135,6 @@ protected: /// \endcond protected: - eap::config_method_ttls &m_cfg; ///< TTLS configuration wxStaticText *m_outer_title; ///< Outer authentication title wxTTLSConfigPanel *m_outer_identity; ///< Outer identity configuration panel wxTLSConfigPanel *m_tls; ///< TLS configuration panel diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index c2bcfd1..42d9230 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -169,7 +169,6 @@ void wxTTLSConfigPanel::OnUpdateUI(wxUpdateUIEvent& event) ////////////////////////////////////////////////////////////////////// wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent) : - m_cfg((eap::config_method_ttls&)cfg), m_cfg_pap(cfg.m_module, cfg.m_level + 1), m_cfg_mschapv2(cfg.m_module, cfg.m_level + 1), wxEAPConfigWindow(prov, cfg, parent) @@ -200,10 +199,10 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m m_outer_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVECAPTION ) ); sb_content->Add(m_outer_title, 0, wxALL|wxALIGN_RIGHT, 5); - m_outer_identity = new wxTTLSConfigPanel(m_prov, m_cfg, this); + m_outer_identity = new wxTTLSConfigPanel(m_prov, dynamic_cast(m_cfg), this); sb_content->Add(m_outer_identity, 0, wxALL|wxEXPAND, 5); - m_tls = new wxTLSConfigPanel(m_prov, m_cfg, this); + m_tls = new wxTLSConfigPanel(m_prov, dynamic_cast(m_cfg), this); sb_content->Add(m_tls, 0, wxALL|wxEXPAND, 5); wxSize size = sb_content->CalcMin(); @@ -232,14 +231,14 @@ wxTTLSConfigWindow::~wxTTLSConfigWindow() bool wxTTLSConfigWindow::TransferDataToWindow() { - switch (m_cfg.m_inner->get_method_id()) { + switch (((eap::config_method_ttls&)m_cfg).m_inner->get_method_id()) { case winstd::eap_type_legacy_pap: - m_cfg_pap = *(eap::config_method_pap*)m_cfg.m_inner.get(); + m_cfg_pap = *(eap::config_method_pap*)((eap::config_method_ttls&)m_cfg).m_inner.get(); m_inner_type->SetSelection(0); // 0=PAP break; case winstd::eap_type_legacy_mschapv2: - m_cfg_mschapv2 = *(eap::config_method_mschapv2*)m_cfg.m_inner.get(); + m_cfg_mschapv2 = *(eap::config_method_mschapv2*)((eap::config_method_ttls&)m_cfg).m_inner.get(); m_inner_type->SetSelection(1); // 1=MSCHAPv2 break; @@ -261,11 +260,11 @@ bool wxTTLSConfigWindow::TransferDataFromWindow() // This is not a provider-locked configuration. Save the data. switch (m_inner_type->GetSelection()) { case 0: // 0=PAP - m_cfg.m_inner.reset(new eap::config_method_pap(m_cfg_pap)); + ((eap::config_method_ttls&)m_cfg).m_inner.reset(new eap::config_method_pap(m_cfg_pap)); break; case 1: // 1=MSCHAPv2 - m_cfg.m_inner.reset(new eap::config_method_mschapv2(m_cfg_mschapv2)); + ((eap::config_method_ttls&)m_cfg).m_inner.reset(new eap::config_method_mschapv2(m_cfg_mschapv2)); break; default: From c768b44c56e4a578d8d13f4e407ffc1982e8a3df Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 09:35:45 +0200 Subject: [PATCH 13/54] ID 2. Missing functionality from security audit report partially fixed --- lib/TLS/src/Method.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index 25ebfbc..b617c1a 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -243,7 +243,7 @@ void eap::method_tls::begin_session( SCH_CRED_MANUAL_CRED_VALIDATION | // dwFlags: Prevent Schannel verify server certificate (we want to use custom root CA store and multiple name checking) #endif SCH_CRED_CACHE_ONLY_URL_RETRIEVAL_ON_CREATE | // dwFlags: Do not attempt online revocation check - we do not expect to have network connection yet - SCH_CRED_IGNORE_NO_REVOCATION_CHECK | // dwFlags: Ignore no-revocation-check errors (TODO: Test if this flag is required.) + SCH_CRED_IGNORE_NO_REVOCATION_CHECK | // dwFlags: Ignore no-revocation-check errors - as we cannot check for revocation, it makes little sense to insist certificate has to have revocation set-up SCH_CRED_IGNORE_REVOCATION_OFFLINE | // dwFlags: Ignore offline-revocation errors - we do not expect to have network connection yet SCH_CRED_NO_DEFAULT_CREDS | // dwFlags: If client certificate we provided is not acceptable, do not try to select one on your own (m_cfg.m_server_names.empty() ? SCH_CRED_NO_SERVERNAME_CHECK : 0) | // dwFlags: When no expected server name is given, do not do the server name check. @@ -565,7 +565,7 @@ void eap::method_tls::get_result( m_cfg.m_session_id.clear(); m_cfg.m_master_secret.clear(); #else - // TODO: Research how a Schannel session context can be cleared not to resume. + // TODO: Research how a Schannel session context can be cleared not to resume. However, until we find a way how to make Schannel resume session in the first place, we can safely ignore this. #endif break; From c0b51f767c85b9cb0558d6f6b05d28817b85bda7 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 11:40:30 +0200 Subject: [PATCH 14/54] ID 3. C style pointer casting from security audit fixed --- EventMonitor/ETWLog.cpp | 40 ++++++++--------- lib/EAPBase/include/EAP.h | 4 +- lib/EAPBase/include/Module.h | 6 +-- lib/EAPBase/src/Config.cpp | 12 ++--- lib/EAPBase/src/Credentials.cpp | 50 ++++++++++----------- lib/EAPBase/src/Method.cpp | 14 +++--- lib/EAPBase/src/Module.cpp | 6 +-- lib/EAPBase_UI/include/EAP_UI.h | 6 +-- lib/EAPBase_UI/src/EAP_UI.cpp | 28 ++++++------ lib/MSCHAPv2/src/MSCHAPv2.cpp | 8 ++-- lib/MSCHAPv2/src/Method.cpp | 32 ++++++------- lib/TLS/src/Credentials.cpp | 36 +++++++-------- lib/TLS/src/Method.cpp | 80 ++++++++++++++++----------------- lib/TLS/src/TLS.cpp | 10 ++--- lib/TLS_UI/src/TLS_UI.cpp | 2 +- lib/TTLS/src/Config.cpp | 4 +- lib/TTLS/src/Credentials.cpp | 4 +- lib/TTLS/src/Method.cpp | 10 ++--- lib/WinStd | 2 +- lib/wxExtend | 2 +- 20 files changed, 178 insertions(+), 178 deletions(-) diff --git a/EventMonitor/ETWLog.cpp b/EventMonitor/ETWLog.cpp index 5415b6e..230dc26 100644 --- a/EventMonitor/ETWLog.cpp +++ b/EventMonitor/ETWLog.cpp @@ -77,7 +77,7 @@ wxEventTraceProcessorThread::wxEventTraceProcessorThread(wxEvtHandler *parent, c for (size_t i = 0, i_end = sessions.GetCount(); i < i_end; i++) { // Open trace. - tlf.LoggerName = (LPTSTR)(LPCTSTR)(sessions[i]); + tlf.LoggerName = const_cast((LPCTSTR)(sessions[i])); event_trace trace; if (!trace.create(&tlf)) { wxLogError(_("Error opening event trace (error %u)."), GetLastError()); @@ -207,7 +207,7 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos ulSizeName = (ULONG)((name .length() + 1)*sizeof(TCHAR)), //ulSizeLogFile = (ULONG)((log_file.length() + 1)*sizeof(TCHAR)), ulSize = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName /*+ ulSizeLogFile*/; - unique_ptr properties((EVENT_TRACE_PROPERTIES*)new char[ulSize]); + unique_ptr properties(reinterpret_cast(new char[ulSize])); wxASSERT_MSG(properties, wxT("error allocating session properties memory")); // Initialize properties. @@ -220,7 +220,7 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos properties->MaximumFileSize = 1; // 1 MB properties->LoggerNameOffset = sizeof(EVENT_TRACE_PROPERTIES); //properties->LogFileNameOffset = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName; - //memcpy((LPTSTR)((char*)properties.get() + properties->LogFileNameOffset), log_file.c_str(), ulSizeLogFile); + //memcpy(reinterpret_cast(properties.get()) + properties->LogFileNameOffset, log_file.c_str(), ulSizeLogFile); if ((ulResult = m_session.create(name.c_str(), properties.get())) == ERROR_SUCCESS) { break; @@ -605,7 +605,7 @@ wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const if (info->DecodingSource != DecodingSourceWPP) { if (rec.EventHeader.Flags & EVENT_HEADER_FLAG_STRING_ONLY) { // This is a string-only event. Print it. - return (LPCWSTR)rec.UserData; + return reinterpret_cast(rec.UserData); } else { // This is not a string-only event. Prepare parameters. @@ -621,12 +621,12 @@ wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const if (info->EventMessageOffset) { // Format the message. - return wstring_msg(0, (LPCTSTR)((LPCBYTE)info.get() + info->EventMessageOffset), props_msg.data()).c_str(); + return wstring_msg(0, reinterpret_cast(reinterpret_cast(info.get()) + info->EventMessageOffset), props_msg.data()).c_str(); } } } else if (info->EventMessageOffset) { // This is a WPP event. - return (LPCWSTR)((LPCBYTE)info.get() + info->EventMessageOffset); + return reinterpret_cast(reinterpret_cast(info.get()) + info->EventMessageOffset); } } } @@ -816,21 +816,21 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_( case TDH_INTYPE_ANSICHAR: { // Convert strings from ANSI code page, all others (JSON, XML etc.) from UTF-8 wstring str; - MultiByteToWideChar(OutType == TDH_OUTTYPE_STRING ? CP_ACP : CP_UTF8, 0, (LPCSTR)pData, (int)nDataSize, str); + MultiByteToWideChar(OutType == TDH_OUTTYPE_STRING ? CP_ACP : CP_UTF8, 0, reinterpret_cast(pData), (int)nDataSize, str); return tstring_printf(_T("%ls"), str.c_str()); } case TDH_INTYPE_COUNTEDSTRING: - return DataToString(TDH_INTYPE_NONNULLTERMINATEDSTRING, OutType, (LPCBYTE)((PUSHORT)pData + 1), *(PUSHORT)pData, pMapInfo, nPtrSize); + return DataToString(TDH_INTYPE_NONNULLTERMINATEDSTRING, OutType, reinterpret_cast((PUSHORT)pData + 1), *(PUSHORT)pData, pMapInfo, nPtrSize); case TDH_INTYPE_COUNTEDANSISTRING: - return DataToString(TDH_INTYPE_NONNULLTERMINATEDANSISTRING, OutType, (LPCBYTE)((PUSHORT)pData + 1), *(PUSHORT)pData, pMapInfo, nPtrSize); + return DataToString(TDH_INTYPE_NONNULLTERMINATEDANSISTRING, OutType, reinterpret_cast((PUSHORT)pData + 1), *(PUSHORT)pData, pMapInfo, nPtrSize); case TDH_INTYPE_REVERSEDCOUNTEDSTRING: - return DataToString(TDH_INTYPE_NONNULLTERMINATEDSTRING, OutType, (LPCBYTE)((PUSHORT)pData + 1), MAKEWORD(HIBYTE(*(PUSHORT)pData), LOBYTE(*(PUSHORT)pData)), pMapInfo, nPtrSize); + return DataToString(TDH_INTYPE_NONNULLTERMINATEDSTRING, OutType, reinterpret_cast((PUSHORT)pData + 1), MAKEWORD(HIBYTE(*(PUSHORT)pData), LOBYTE(*(PUSHORT)pData)), pMapInfo, nPtrSize); case TDH_INTYPE_REVERSEDCOUNTEDANSISTRING: - return DataToString(TDH_INTYPE_NONNULLTERMINATEDANSISTRING, OutType, (LPCBYTE)((PUSHORT)pData + 1), MAKEWORD(HIBYTE(*(PUSHORT)pData), LOBYTE(*(PUSHORT)pData)), pMapInfo, nPtrSize); + return DataToString(TDH_INTYPE_NONNULLTERMINATEDANSISTRING, OutType, reinterpret_cast((PUSHORT)pData + 1), MAKEWORD(HIBYTE(*(PUSHORT)pData), LOBYTE(*(PUSHORT)pData)), pMapInfo, nPtrSize); case TDH_INTYPE_INT8: assert(nDataSize >= sizeof(CHAR)); @@ -966,7 +966,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_( SYSTEMTIME st, st_local; FileTimeToSystemTime((PFILETIME)pData, &st); SystemTimeToTzSpecificLocalTime(NULL, &st, &st_local); - return DataToString(TDH_INTYPE_SYSTEMTIME, OutType, (LPCBYTE)&st_local, sizeof(st_local), pMapInfo, nPtrSize); + return DataToString(TDH_INTYPE_SYSTEMTIME, OutType, reinterpret_cast(&st_local), sizeof(st_local), pMapInfo, nPtrSize); } case TDH_INTYPE_SYSTEMTIME: @@ -1019,7 +1019,7 @@ static ULONG GetArraySize(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, ULONG i ULONG ulResult; // Get array count property. - PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)((LPBYTE)pInfo + pInfo->EventPropertyInfoArray[pInfo->EventPropertyInfoArray[i].countPropertyIndex].NameOffset), ULONG_MAX }; + PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)(reinterpret_cast(pInfo) + pInfo->EventPropertyInfoArray[pInfo->EventPropertyInfoArray[i].countPropertyIndex].NameOffset), ULONG_MAX }; vector count; if ((ulResult = TdhGetProperty(pEvent, 0, NULL, 1, &data_desc, count)) != ERROR_SUCCESS) return ulResult; @@ -1059,8 +1059,8 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U if (out_nonfirst) out += _T(", "); else out_nonfirst = true; out += _T('('); for (USHORT j = pInfo->EventPropertyInfoArray[ulPropIndex].structType.StructStartIndex, usLastMember = pInfo->EventPropertyInfoArray[ulPropIndex].structType.StructStartIndex + pInfo->EventPropertyInfoArray[ulPropIndex].structType.NumOfStructMembers; j < usLastMember; j++) { - out += tstring_printf(_T("%ls: "), (LPBYTE)pInfo + pInfo->EventPropertyInfoArray[j].NameOffset); - out += PropertyToString(pEvent, pInfo, j, (LPWSTR)((LPBYTE)(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k, nPtrSize); + out += tstring_printf(_T("%ls: "), reinterpret_cast(pInfo) + pInfo->EventPropertyInfoArray[j].NameOffset); + out += PropertyToString(pEvent, pInfo, j, reinterpret_cast(reinterpret_cast(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k, nPtrSize); } out += _T(')'); } else { @@ -1078,12 +1078,12 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U // The first descriptor in the array identifies the name of the structure and the second // descriptor defines the member of the structure whose data you want to retrieve. PROPERTY_DATA_DESCRIPTOR data_desc[2] = { - { (ULONGLONG)pStructureName , ulStructIndex }, - { (ULONGLONG)((LPBYTE)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k } + { (ULONGLONG)pStructureName , ulStructIndex }, + { (ULONGLONG)(reinterpret_cast(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k } }; ulResult = TdhGetProperty(pEvent, 0, NULL, _countof(data_desc), data_desc, data); } else { - PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)((LPBYTE)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k }; + PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)(reinterpret_cast(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k }; ulResult = TdhGetProperty(pEvent, 0, NULL, 1, &data_desc, data); } if (ulResult == ERROR_EVT_INVALID_EVENT_DATA) { @@ -1094,7 +1094,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U // Get the name/value mapping if the property specifies a value map. unique_ptr map_info; - ulResult = TdhGetEventMapInformation(pEvent, (LPWSTR)((LPBYTE)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].nonStructType.MapNameOffset), map_info); + ulResult = TdhGetEventMapInformation(pEvent, reinterpret_cast(reinterpret_cast(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].nonStructType.MapNameOffset), map_info); if (ulResult == ERROR_NOT_FOUND) { // name/value mapping not found. Not an error actually. assert(!map_info); @@ -1105,7 +1105,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U // in the EVENT_MAP_ENTRY structure. Replace the trailing space with a null- // terminating character, so that the bit mapped strings are correctly formatted. for (ULONG i = 0; i < map_info->EntryCount; i++) { - LPWSTR str = (LPWSTR)((PBYTE)map_info.get() + map_info->MapEntryArray[i].OutputOffset); + LPWSTR str = reinterpret_cast((PBYTE)map_info.get() + map_info->MapEntryArray[i].OutputOffset); SIZE_T len = wcslen(str); if (len) str[len - 1] = 0; } diff --git a/lib/EAPBase/include/EAP.h b/lib/EAPBase/include/EAP.h index a732da8..23dd1a5 100644 --- a/lib/EAPBase/include/EAP.h +++ b/lib/EAPBase/include/EAP.h @@ -772,7 +772,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const unsigned int { eap::cursor_out::ptr_type ptr_end = cursor.ptr + sizeof(unsigned int); assert(ptr_end <= cursor.ptr_end); - *(unsigned int*)cursor.ptr = val; + *reinterpret_cast(cursor.ptr) = val; cursor.ptr = ptr_end; } @@ -788,7 +788,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ unsigned int &val) { eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(unsigned int); assert(ptr_end <= cursor.ptr_end); - val = *(unsigned int*)cursor.ptr; + val = *reinterpret_cast(cursor.ptr); cursor.ptr = ptr_end; } diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index d7d6c51..28ca9b4 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -330,12 +330,12 @@ namespace eap // Import the 256-bit AES session key. winstd::crypt_key key_aes; - if (!CryptImportKey(hProv, (LPCBYTE)data, 268, key_rsa, 0, &key_aes)) + if (!CryptImportKey(hProv, reinterpret_cast(data), 268, key_rsa, 0, &key_aes)) throw win_runtime_error(__FUNCTION__ " CryptImportKey failed."); // Decrypt the data using AES session key. std::vector > buf; - buf.assign((const unsigned char*)data + 268, (const unsigned char*)data + size); + buf.assign(reinterpret_cast(data) + 268, reinterpret_cast(data) + size); if (!CryptDecrypt(key_aes, hHash, TRUE, 0, buf)) throw win_runtime_error(__FUNCTION__ " CryptDecrypt failed."); @@ -412,7 +412,7 @@ namespace eap std::vector hash_bin; if (!CryptGetHashParam(hash, HP_HASHVAL, hash_bin, 0)) throw win_runtime_error(__FUNCTION__ " Calculating MD5 hash failed."); - if (memcmp((unsigned char*)data + enc_size, hash_bin.data(), dwHashSize) != 0) + if (memcmp(reinterpret_cast(data) + enc_size, hash_bin.data(), dwHashSize) != 0) throw invalid_argument(__FUNCTION__ " Invalid encrypted data."); return dec; diff --git a/lib/EAPBase/src/Config.cpp b/lib/EAPBase/src/Config.cpp index 017156c..f2e2928 100644 --- a/lib/EAPBase/src/Config.cpp +++ b/lib/EAPBase/src/Config.cpp @@ -242,9 +242,9 @@ eap::config_method_with_cred::config_method_with_cred(_In_ module &mod, _In_ uns eap::config_method_with_cred::config_method_with_cred(_In_ const config_method_with_cred &other) : - m_use_cred (other.m_use_cred ), - m_cred (other.m_cred ? (credentials*)other.m_cred->clone() : nullptr), - config_method(other ) + m_use_cred (other.m_use_cred ), + m_cred (other.m_cred ? dynamic_cast(other.m_cred->clone()) : nullptr), + config_method(other ) { } @@ -262,7 +262,7 @@ eap::config_method_with_cred& eap::config_method_with_cred::operator=(_In_ const if (this != &other) { (config_method&)*this = other; m_use_cred = other.m_use_cred; - m_cred.reset(other.m_cred ? (credentials*)other.m_cred->clone() : nullptr); + m_cred.reset(other.m_cred ? dynamic_cast(other.m_cred->clone()) : nullptr); } return *this; @@ -376,7 +376,7 @@ eap::config_provider::config_provider(_In_ const config_provider &other) : { m_methods.reserve(other.m_methods.size()); for (vector >::const_iterator method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method) - m_methods.push_back(std::move(unique_ptr(*method ? (config_method*)method->get()->clone() : nullptr))); + m_methods.push_back(std::move(unique_ptr(*method ? dynamic_cast(method->get()->clone()) : nullptr))); } @@ -415,7 +415,7 @@ eap::config_provider& eap::config_provider::operator=(_In_ const config_provider m_methods.clear(); m_methods.reserve(other.m_methods.size()); for (vector >::const_iterator method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method) - m_methods.push_back(std::move(unique_ptr(*method ? (config_method*)method->get()->clone() : nullptr))); + m_methods.push_back(std::move(unique_ptr(*method ? dynamic_cast(method->get()->clone()) : nullptr))); } return *this; diff --git a/lib/EAPBase/src/Credentials.cpp b/lib/EAPBase/src/Credentials.cpp index 3c02e29..7195ff4 100644 --- a/lib/EAPBase/src/Credentials.cpp +++ b/lib/EAPBase/src/Credentials.cpp @@ -363,8 +363,8 @@ void eap::credentials_pass::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned in WideCharToMultiByte(CP_UTF8, 0, m_password.c_str(), (int)m_password.length(), cred_utf8, NULL, NULL); // Encrypt the password using user's key. - DATA_BLOB cred_blob = { (DWORD)cred_utf8.size() , (LPBYTE)cred_utf8.data() }; - DATA_BLOB entropy_blob = { sizeof(s_entropy), (LPBYTE)s_entropy }; + DATA_BLOB cred_blob = { (DWORD)cred_utf8.size() , const_cast(reinterpret_cast(cred_utf8.data())) }; + DATA_BLOB entropy_blob = { sizeof(s_entropy), const_cast( s_entropy ) }; data_blob cred_enc; if (!CryptProtectData(&cred_blob, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN, &cred_enc)) throw win_runtime_error(__FUNCTION__ " CryptProtectData failed."); @@ -375,18 +375,18 @@ void eap::credentials_pass::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned in assert(cred_enc.cbData < CRED_MAX_CREDENTIAL_BLOB_SIZE); assert(m_identity.length() < CRED_MAX_USERNAME_LENGTH ); CREDENTIAL cred = { - 0, // Flags - CRED_TYPE_GENERIC, // Type - (LPTSTR)target.c_str(), // TargetName - _T(""), // Comment - { 0, 0 }, // LastWritten - cred_enc.cbData, // CredentialBlobSize - cred_enc.pbData, // CredentialBlob - CRED_PERSIST_ENTERPRISE, // Persist - 0, // AttributeCount - NULL, // Attributes - NULL, // TargetAlias - (LPTSTR)m_identity.c_str() // UserName + 0, // Flags + CRED_TYPE_GENERIC, // Type + const_cast(target.c_str()), // TargetName + _T(""), // Comment + { 0, 0 }, // LastWritten + cred_enc.cbData, // CredentialBlobSize + cred_enc.pbData, // CredentialBlob + CRED_PERSIST_ENTERPRISE, // Persist + 0, // AttributeCount + NULL, // Attributes + NULL, // TargetAlias + const_cast(m_identity.c_str()) // UserName }; if (!CredWrite(&cred, 0)) throw win_runtime_error(__FUNCTION__ " CredWrite failed."); @@ -403,14 +403,14 @@ void eap::credentials_pass::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned throw win_runtime_error(__FUNCTION__ " CredRead failed."); // Decrypt the password using user's key. - DATA_BLOB cred_enc = { cred->CredentialBlobSize, cred->CredentialBlob }; - DATA_BLOB entropy_blob = { sizeof(s_entropy) , (LPBYTE)s_entropy }; + DATA_BLOB cred_enc = { cred->CredentialBlobSize, cred->CredentialBlob }; + DATA_BLOB entropy_blob = { sizeof(s_entropy) , const_cast(s_entropy) }; data_blob cred_int; if (!CryptUnprotectData(&cred_enc, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN | CRYPTPROTECT_VERIFY_PROTECTION, &cred_int)) throw win_runtime_error(__FUNCTION__ " CryptUnprotectData failed."); // Convert password from UTF-8. - MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)cred_int.pbData, (int)cred_int.cbData, m_password); + MultiByteToWideChar(CP_UTF8, 0, reinterpret_cast(cred_int.pbData), (int)cred_int.cbData, m_password); SecureZeroMemory(cred_int.pbData, cred_int.cbData); if (cred->UserName) @@ -443,14 +443,14 @@ eap::credentials::source_t eap::credentials_pass::combine( { if (cred_cached) { // Using EAP service cached credentials. - *this = *(credentials_pass*)cred_cached; + *this = *dynamic_cast(cred_cached); m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank); return source_cache; } if (cfg.m_use_cred) { // Using configured credentials. - *this = *(credentials_pass*)cfg.m_cred.get(); + *this = *dynamic_cast(cfg.m_cred.get()); m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank); return source_config; } @@ -553,11 +553,11 @@ eap::credentials_connection::credentials_connection(_In_ module &mod, _In_ const eap::credentials_connection::credentials_connection(_In_ const credentials_connection &other) : - m_cfg (other.m_cfg ), - m_namespace(other.m_namespace), - m_id (other.m_id ), - m_cred (other.m_cred ? (credentials*)other.m_cred->clone() : nullptr), - config (other ) + m_cfg (other.m_cfg ), + m_namespace(other.m_namespace ), + m_id (other.m_id ), + m_cred (other.m_cred ? dynamic_cast(other.m_cred->clone()) : nullptr), + config (other ) { } @@ -578,7 +578,7 @@ eap::credentials_connection& eap::credentials_connection::operator=(_In_ const c (config&)*this = other; m_namespace = other.m_namespace; m_id = other.m_id; - m_cred.reset(other.m_cred ? (credentials*)other.m_cred->clone() : nullptr); + m_cred.reset(other.m_cred ? dynamic_cast(other.m_cred->clone()) : nullptr); } return *this; diff --git a/lib/EAPBase/src/Method.cpp b/lib/EAPBase/src/Method.cpp index c963bac..dec8775 100644 --- a/lib/EAPBase/src/Method.cpp +++ b/lib/EAPBase/src/Method.cpp @@ -169,13 +169,13 @@ void eap::method_noneap::append_avp(_In_ unsigned int code, _In_ unsigned char f // Diameter AVP header diameter_avp_header hdr; - *(unsigned int*)hdr.code = htonl(code); + *reinterpret_cast(hdr.code) = htonl(code); hdr.flags = flags; hton24(size_outer, hdr.length); - m_packet_res.insert(m_packet_res.end(), (unsigned char*)&hdr, (unsigned char*)(&hdr + 1)); + m_packet_res.insert(m_packet_res.end(), reinterpret_cast(&hdr), reinterpret_cast(&hdr + 1)); // Data - m_packet_res.insert(m_packet_res.end(), (unsigned char*)data, (unsigned char*)data + size); + m_packet_res.insert(m_packet_res.end(), reinterpret_cast(data), reinterpret_cast(data) + size); m_packet_res.insert(m_packet_res.end(), padding, 0); } @@ -195,13 +195,13 @@ void eap::method_noneap::append_avp(_In_ unsigned int code, _In_ unsigned int ve // Diameter AVP header diameter_avp_header_ven hdr; - *(unsigned int*)hdr.code = htonl(code); + *reinterpret_cast(hdr.code) = htonl(code); hdr.flags = flags | diameter_avp_flag_vendor; hton24(size_outer, hdr.length); - *(unsigned int*)hdr.vendor = htonl(vendor_id); - m_packet_res.insert(m_packet_res.end(), (unsigned char*)&hdr, (unsigned char*)(&hdr + 1)); + *reinterpret_cast(hdr.vendor) = htonl(vendor_id); + m_packet_res.insert(m_packet_res.end(), reinterpret_cast(&hdr), reinterpret_cast(&hdr + 1)); // Data - m_packet_res.insert(m_packet_res.end(), (unsigned char*)data, (unsigned char*)data + size); + m_packet_res.insert(m_packet_res.end(), reinterpret_cast(data), reinterpret_cast(data) + size); m_packet_res.insert(m_packet_res.end(), padding, 0); } diff --git a/lib/EAPBase/src/Module.cpp b/lib/EAPBase/src/Module.cpp index f6ab578..d5ffa63 100644 --- a/lib/EAPBase/src/Module.cpp +++ b/lib/EAPBase/src/Module.cpp @@ -69,13 +69,13 @@ EAP_ERROR* eap::module::make_error(_In_ DWORD dwErrorCode, _In_opt_z_ LPCWSTR ps pError->repairGuid = pRepairGuid != NULL ? *pRepairGuid : GUID_NULL; pError->helpLinkGuid = pHelpLinkGuid != NULL ? *pHelpLinkGuid : GUID_NULL; if (nRootCauseSize) { - pError->pRootCauseString = (LPWSTR)p; + pError->pRootCauseString = const_cast(reinterpret_cast(p)); memcpy(pError->pRootCauseString, pszRootCauseString, nRootCauseSize); p += nRootCauseSize; } else pError->pRootCauseString = NULL; if (nRepairStringSize) { - pError->pRepairString = (LPWSTR)p; + pError->pRepairString = const_cast(reinterpret_cast(p)); memcpy(pError->pRepairString, pszRepairString, nRepairStringSize); p += nRepairStringSize; } else @@ -201,7 +201,7 @@ std::vector eap::module::encrypt(_In_ HCRYPTPROV hProv, _In_bytec std::vector enc(buf.begin(), buf.end()); // Pre-allocate memory to allow space, as encryption will grow the data. - buf.assign((const unsigned char*)data, (const unsigned char*)data + size); + buf.assign(reinterpret_cast(data), reinterpret_cast(data) + size); DWORD dwBlockLen; if (!CryptGetKeyParam(key_aes, KP_BLOCKLEN, dwBlockLen, 0)) dwBlockLen = 0; buf.reserve((size + dwBlockLen) / dwBlockLen * dwBlockLen); diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index 006f538..8f424ae 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -248,7 +248,7 @@ protected: int idx = m_providers->GetSelection(); if (idx != wxNOT_FOUND) { - eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider(); + eap::config_provider &cfg_provider = dynamic_cast<_wxT*>(m_providers->GetPage(idx))->GetProvider(); m_prov_remove->Enable(true); m_prov_advanced->Enable(!cfg_provider.m_read_only); } else { @@ -295,7 +295,7 @@ protected: wxEAPConfigDialogBase::OnProvRemove(event); int idx = m_providers->GetSelection(); - eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider(); + eap::config_provider &cfg_provider = dynamic_cast<_wxT*>(m_providers->GetPage(idx))->GetProvider(); if (wxMessageBox(tstring_printf(_("Are you sure you want to permanently remove %ls provider from configuration?"), wxEAPGetProviderName(cfg_provider.m_name).c_str()), _("Warning"), wxYES_NO, this) == wxYES) { // Delete provider. @@ -317,7 +317,7 @@ protected: wxEAPConfigDialogBase::OnProvAdvanced(event); int idx = m_providers->GetSelection(); - eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider(); + eap::config_provider &cfg_provider = dynamic_cast<_wxT*>(m_providers->GetPage(idx))->GetProvider(); wxEAPConfigProvider dlg(cfg_provider, this); if (dlg.ShowModal() == wxID_OK) diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp index 04c6c5f..c88a458 100644 --- a/lib/EAPBase_UI/src/EAP_UI.cpp +++ b/lib/EAPBase_UI/src/EAP_UI.cpp @@ -455,7 +455,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) : if (!wnd_class) throw win_runtime_error(__FUNCTION__ " Error registering master monitor window class."); tstring_guid guid_str(guid); - HWND hwnd_master = FindWindowEx(HWND_MESSAGE, NULL, (LPCTSTR)wnd_class, guid_str.c_str()); + HWND hwnd_master = FindWindowEx(HWND_MESSAGE, NULL, reinterpret_cast(wnd_class), guid_str.c_str()); if (hwnd_master) { // Another monitor is already running. m_is_master = false; @@ -484,18 +484,18 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) : } m_hwnd = CreateWindowEx( - 0, // dwExStyle - (LPCTSTR)wnd_class, // lpClassName - guid_str.c_str(), // lpWindowName - 0, // dwStyle - 0, // x - 0, // y - 0, // nWidth - 0, // nHeight - HWND_MESSAGE, // hWndParent - NULL, // hMenu - module, // hInstance - this); // lpParam + 0, // dwExStyle + reinterpret_cast(wnd_class), // lpClassName + guid_str.c_str(), // lpWindowName + 0, // dwStyle + 0, // x + 0, // y + 0, // nWidth + 0, // nHeight + HWND_MESSAGE, // hWndParent + NULL, // hMenu + module, // hInstance + this); // lpParam if (!m_is_master) { // Notify master we are waiting him. @@ -575,7 +575,7 @@ LRESULT eap::monitor_ui::winproc( } else if (msg == s_msg_finish) { // Master finished. assert(!m_is_master); - m_data.assign((const unsigned char*)lparam, (const unsigned char*)lparam + wparam); + m_data.assign(reinterpret_cast(lparam), reinterpret_cast(lparam) + wparam); // Finish slave too. DestroyWindow(m_hwnd); diff --git a/lib/MSCHAPv2/src/MSCHAPv2.cpp b/lib/MSCHAPv2/src/MSCHAPv2.cpp index be11a7f..619ba31 100644 --- a/lib/MSCHAPv2/src/MSCHAPv2.cpp +++ b/lib/MSCHAPv2/src/MSCHAPv2.cpp @@ -45,7 +45,7 @@ crypt_key eap::create_des_key(_In_ HCRYPTPROV cp, _In_count_(size) const unsigne }; sanitizing_blob key_blob; key_blob.reserve(sizeof(key_blob_prefix) + 8); - key_blob.assign((const unsigned char*)&s_prefix, (const unsigned char*)(&s_prefix + 1)); + key_blob.assign(reinterpret_cast(&s_prefix), reinterpret_cast(&s_prefix + 1)); // Inject parity bits. unsigned char out = 0, parity = 1; @@ -215,7 +215,7 @@ eap::nt_response::nt_response( static const DWORD mode_ecb = CRYPT_MODE_ECB; // DesEncrypt(Challenge, 1st 7-octets of ZPasswordHash, giving 1st 8-octets of Response) - key = create_des_key(cp, (const unsigned char*)&hash_pwd, 7); + key = create_des_key(cp, reinterpret_cast(&hash_pwd), 7); if (!CryptSetKeyParam(key, KP_MODE, (const BYTE*)&mode_ecb, 0)) throw win_runtime_error(__FUNCTION__ " Error setting ECB mode."); memcpy(data, &challenge, 8); @@ -224,7 +224,7 @@ eap::nt_response::nt_response( throw win_runtime_error(__FUNCTION__ " Error encrypting message 1/3."); // DesEncrypt(Challenge, 2nd 7-octets of ZPasswordHash, giving 2nd 8-octets of Response) - key = create_des_key(cp, (const unsigned char*)&hash_pwd + 7, 7); + key = create_des_key(cp, reinterpret_cast(&hash_pwd) + 7, 7); if (!CryptSetKeyParam(key, KP_MODE, (const BYTE*)&mode_ecb, 0)) throw win_runtime_error(__FUNCTION__ " Error setting ECB mode."); memcpy(data + 8, &challenge, 8); @@ -233,7 +233,7 @@ eap::nt_response::nt_response( throw win_runtime_error(__FUNCTION__ " Error encrypting message 2/3."); // DesEncrypt(Challenge, 2nd 7-octets of ZPasswordHash, giving 2nd 8-octets of Response) - key = create_des_key(cp, (const unsigned char*)&hash_pwd + 14, 2); + key = create_des_key(cp, reinterpret_cast(&hash_pwd) + 14, 2); if (!CryptSetKeyParam(key, KP_MODE, (const BYTE*)&mode_ecb, 0)) throw win_runtime_error(__FUNCTION__ " Error setting ECB mode."); memcpy(data + 16, &challenge, 8); diff --git a/lib/MSCHAPv2/src/Method.cpp b/lib/MSCHAPv2/src/Method.cpp index d3794b8..646545c 100644 --- a/lib/MSCHAPv2/src/Method.cpp +++ b/lib/MSCHAPv2/src/Method.cpp @@ -119,14 +119,14 @@ void eap::method_mschapv2::process_request_packet( sizeof(nt_response)); // Response response.push_back(m_ident); response.push_back(0); // Flags - response.insert(response.end(), (unsigned char*)&m_challenge_client, (unsigned char*)(&m_challenge_client + 1)); // Peer-Challenge + response.insert(response.end(), reinterpret_cast(&m_challenge_client), reinterpret_cast(&m_challenge_client + 1)); // Peer-Challenge response.insert(response.end(), 8, 0); // Reserved - response.insert(response.end(), (unsigned char*)&m_nt_resp, (unsigned char*)(&m_nt_resp + 1)); // NT-Response + response.insert(response.end(), reinterpret_cast(&m_nt_resp), reinterpret_cast(&m_nt_resp + 1)); // NT-Response // Diameter AVP (User-Name=1, MS-CHAP-Challenge=11/311, MS-CHAP2-Response=25/311) - append_avp( 1, diameter_avp_flag_mandatory, identity_utf8.data(), (unsigned int)identity_utf8.size() ); - append_avp(11, 311, diameter_avp_flag_mandatory, (unsigned char*)&m_challenge_server , (unsigned int)sizeof(m_challenge_server)); - append_avp(25, 311, diameter_avp_flag_mandatory, response.data() , (unsigned int)response.size() ); + append_avp( 1, diameter_avp_flag_mandatory, identity_utf8.data(), (unsigned int)identity_utf8.size() ); + append_avp(11, 311, diameter_avp_flag_mandatory, reinterpret_cast(&m_challenge_server) , (unsigned int)sizeof(m_challenge_server)); + append_avp(25, 311, diameter_avp_flag_mandatory, response.data() , (unsigned int)response.size() ); m_phase = phase_challenge_server; m_cfg.m_last_status = config_method::status_cred_invalid; // Blame credentials if we fail beyond this point. @@ -154,22 +154,22 @@ void eap::method_mschapv2::process_packet(_In_bytecount_(size_pck) const void *_ sanitizing_blob data; wstring msg_w; - for (const unsigned char *pck = (const unsigned char*)_pck, *pck_end = pck + size_pck; pck < pck_end; ) { + for (const unsigned char *pck = reinterpret_cast(_pck), *pck_end = pck + size_pck; pck < pck_end; ) { if (pck + sizeof(diameter_avp_header) > pck_end) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete message header."); - const diameter_avp_header *hdr = (const diameter_avp_header*)pck; - unsigned int code = ntohl(*(unsigned int*)hdr->code); + const diameter_avp_header *hdr = reinterpret_cast(pck); + unsigned int code = ntohl(*reinterpret_cast(hdr->code)); unsigned int vendor; const unsigned char *msg; if (hdr->flags & diameter_avp_flag_vendor) { if (pck + sizeof(diameter_avp_header_ven) > pck_end) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete message header."); - const diameter_avp_header_ven *hdr_ven = (const diameter_avp_header_ven*)pck; - vendor = ntohl(*(unsigned int*)hdr_ven->vendor); - msg = (const unsigned char*)(hdr_ven + 1); + const diameter_avp_header_ven *hdr_ven = reinterpret_cast(pck); + vendor = ntohl(*reinterpret_cast(hdr_ven->vendor)); + msg = reinterpret_cast(hdr_ven + 1); } else { vendor = 0; - msg = (const unsigned char*)(hdr + 1); + msg = reinterpret_cast(hdr + 1); } unsigned int length = ntoh24(hdr->length); const unsigned char @@ -182,13 +182,13 @@ void eap::method_mschapv2::process_packet(_In_bytecount_(size_pck) const void *_ // MS-CHAP2-Success if (msg[0] != m_ident) throw invalid_argument(string_printf(__FUNCTION__ " Wrong MSCHAPv2 ident (expected: %u, received: %u).", m_ident, msg[0]).c_str()); - const char *str = (const char*)(msg + 1); - process_success(parse_response(str, ((const char*)msg_end - str))); + const char *str = reinterpret_cast(msg + 1); + process_success(parse_response(str, (reinterpret_cast(msg_end) - str))); } else if (code == 2 && vendor == 311) { // MS-CHAP2-Error m_ident = msg[0]; - const char *str = (const char*)(msg + 1); - process_error(parse_response(str, ((const char*)msg_end - str))); + const char *str = reinterpret_cast(msg + 1); + process_error(parse_response(str, (reinterpret_cast(msg_end) - str))); } else if (hdr->flags & diameter_avp_flag_mandatory) throw win_runtime_error(ERROR_NOT_SUPPORTED, string_printf(__FUNCTION__ " Server sent mandatory Diameter AVP we do not support (code: %u, vendor: %u).", code, vendor).c_str()); diff --git a/lib/TLS/src/Credentials.cpp b/lib/TLS/src/Credentials.cpp index c323ab7..7b76cb8 100644 --- a/lib/TLS/src/Credentials.cpp +++ b/lib/TLS/src/Credentials.cpp @@ -173,8 +173,8 @@ void eap::credentials_tls::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int data_blob cred_enc; if (m_cert) { // Encrypt the certificate using user's key. - DATA_BLOB cred_blob = { m_cert->cbCertEncoded, m_cert->pbCertEncoded }; - DATA_BLOB entropy_blob = { sizeof(s_entropy) , (LPBYTE)s_entropy }; + DATA_BLOB cred_blob = { m_cert->cbCertEncoded, m_cert->pbCertEncoded }; + DATA_BLOB entropy_blob = { sizeof(s_entropy) , const_cast(s_entropy) }; if (!CryptProtectData(&cred_blob, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN, &cred_enc)) throw win_runtime_error(__FUNCTION__ " CryptProtectData failed."); } @@ -185,18 +185,18 @@ void eap::credentials_tls::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int assert(cred_enc.cbData < CRED_MAX_CREDENTIAL_BLOB_SIZE); assert(m_identity.length() < CRED_MAX_USERNAME_LENGTH ); CREDENTIAL cred = { - 0, // Flags - CRED_TYPE_GENERIC, // Type - (LPTSTR)target.c_str(), // TargetName - _T(""), // Comment - { 0, 0 }, // LastWritten - cred_enc.cbData, // CredentialBlobSize - cred_enc.pbData, // CredentialBlob - CRED_PERSIST_ENTERPRISE, // Persist - 0, // AttributeCount - NULL, // Attributes - NULL, // TargetAlias - (LPTSTR)m_identity.c_str() // UserName + 0, // Flags + CRED_TYPE_GENERIC, // Type + const_cast(target.c_str()), // TargetName + _T(""), // Comment + { 0, 0 }, // LastWritten + cred_enc.cbData, // CredentialBlobSize + cred_enc.pbData, // CredentialBlob + CRED_PERSIST_ENTERPRISE, // Persist + 0, // AttributeCount + NULL, // Attributes + NULL, // TargetAlias + const_cast(m_identity.c_str()) // UserName }; if (!CredWrite(&cred, 0)) throw win_runtime_error(__FUNCTION__ " CredWrite failed."); @@ -214,8 +214,8 @@ void eap::credentials_tls::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned if (cred->CredentialBlobSize) { // Decrypt the certificate using user's key. - DATA_BLOB cred_enc = { cred->CredentialBlobSize, cred->CredentialBlob }; - DATA_BLOB entropy_blob = { sizeof(s_entropy) , (LPBYTE)s_entropy }; + DATA_BLOB cred_enc = { cred->CredentialBlobSize, cred->CredentialBlob }; + DATA_BLOB entropy_blob = { sizeof(s_entropy) , const_cast(s_entropy) }; data_blob cred_int; if (!CryptUnprotectData(&cred_enc, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN | CRYPTPROTECT_VERIFY_PROTECTION, &cred_int)) throw win_runtime_error(__FUNCTION__ " CryptUnprotectData failed."); @@ -298,14 +298,14 @@ eap::credentials::source_t eap::credentials_tls::combine( { if (cred_cached) { // Using EAP service cached credentials. - *this = *(credentials_tls*)cred_cached; + *this = *dynamic_cast(cred_cached); m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)eap_type_tls), event_data(credentials_tls::get_name()), event_data(pszTargetName), event_data::blank); return source_cache; } if (cfg.m_use_cred) { // Using configured credentials. - *this = *(credentials_tls*)cfg.m_cred.get(); + *this = *dynamic_cast(cfg.m_cred.get()); m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)eap_type_tls), event_data(credentials_tls::get_name()), event_data(pszTargetName), event_data::blank); return source_config; } diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index b617c1a..f2397d8 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -376,8 +376,8 @@ void eap::method_tls::process_request_packet( // Derive master secret. static const unsigned char s_label[] = "master secret"; sanitizing_blob seed(s_label, s_label + _countof(s_label) - 1); - seed.insert(seed.end(), (const unsigned char*)&m_random_client, (const unsigned char*)(&m_random_client + 1)); - seed.insert(seed.end(), (const unsigned char*)&m_random_server, (const unsigned char*)(&m_random_server + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_client), reinterpret_cast(&m_random_client + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_server), reinterpret_cast(&m_random_server + 1)); memcpy(&m_master_secret, prf(m_cp, m_alg_prf, pms, seed, sizeof(tls_master_secret)).data(), sizeof(tls_master_secret)); // Create client key exchange message, and append to packet. @@ -396,8 +396,8 @@ void eap::method_tls::process_request_packet( // Derive client side keys. static const unsigned char s_label[] = "key expansion"; sanitizing_blob seed(s_label, s_label + _countof(s_label) - 1); - seed.insert(seed.end(), (const unsigned char*)&m_random_server, (const unsigned char*)(&m_random_server + 1)); - seed.insert(seed.end(), (const unsigned char*)&m_random_client, (const unsigned char*)(&m_random_client + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_server), reinterpret_cast(&m_random_server + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_client), reinterpret_cast(&m_random_client + 1)); sanitizing_blob key_block(prf(m_cp, m_alg_prf, m_master_secret, seed, 2*m_state_client_pending.m_size_mac_key + // client_write_MAC_secret & server_write_MAC_secret (SHA1) 2*m_state_client_pending.m_size_enc_key + // client_write_key & server_write_key @@ -518,9 +518,9 @@ void eap::method_tls::get_result( // Fill array with RADIUS attributes. eap_attr a; m_eap_attr.reserve(m_eap_attr.size() + 3); - a.create_ms_mppe_key(16, (LPCBYTE)&m_key_mppe_client, sizeof(tls_random)); + a.create_ms_mppe_key(16, reinterpret_cast(&m_key_mppe_client), sizeof(tls_random)); m_eap_attr.push_back(std::move(a)); - a.create_ms_mppe_key(17, (LPCBYTE)&m_key_mppe_server, sizeof(tls_random)); + a.create_ms_mppe_key(17, reinterpret_cast(&m_key_mppe_server), sizeof(tls_random)); m_eap_attr.push_back(std::move(a)); m_eap_attr.push_back(eap_attr::blank); @@ -552,7 +552,7 @@ void eap::method_tls::get_result( NULL, &buf_out_desc); if (SUCCEEDED(status)) - m_packet_res.m_data.insert(m_packet_res.m_data.end(), (const unsigned char*)buf_out[0].pvBuffer, (const unsigned char*)buf_out[0].pvBuffer + buf_out[0].cbBuffer); + m_packet_res.m_data.insert(m_packet_res.m_data.end(), reinterpret_cast(buf_out[0].pvBuffer), reinterpret_cast(buf_out[0].pvBuffer) + buf_out[0].cbBuffer); } #endif @@ -594,14 +594,14 @@ eap::sanitizing_blob eap::method_tls::make_client_hello() // SSL header assert(size_data <= 0xffffff); unsigned int ssl_header = htonl((tls_handshake_type_client_hello << 24) | (unsigned int)size_data); - msg.insert(msg.end(), (unsigned char*)&ssl_header, (unsigned char*)(&ssl_header + 1)); + msg.insert(msg.end(), reinterpret_cast(&ssl_header), reinterpret_cast(&ssl_header + 1)); // SSL version - msg.insert(msg.end(), (unsigned char*)&m_tls_version, (unsigned char*)(&m_tls_version + 1)); + msg.insert(msg.end(), reinterpret_cast(&m_tls_version), reinterpret_cast(&m_tls_version + 1)); // Generate client random and add it to the message m_random_client.randomize(m_cp); - msg.insert(msg.end(), (unsigned char*)&m_random_client, (unsigned char*)(&m_random_client + 1)); + msg.insert(msg.end(), reinterpret_cast(&m_random_client), reinterpret_cast(&m_random_client + 1)); // Session ID assert(m_session_id.size() <= 32); @@ -610,7 +610,7 @@ eap::sanitizing_blob eap::method_tls::make_client_hello() // Cypher suite list unsigned short size_cipher_suite2 = htons((unsigned short)sizeof(s_cipher_suite)); - msg.insert(msg.end(), (unsigned char*)&size_cipher_suite2, (unsigned char*)(&size_cipher_suite2 + 1)); + msg.insert(msg.end(), reinterpret_cast(&size_cipher_suite2), reinterpret_cast(&size_cipher_suite2 + 1)); msg.insert(msg.end(), s_cipher_suite, s_cipher_suite + _countof(s_cipher_suite)); // Compression @@ -638,7 +638,7 @@ eap::sanitizing_blob eap::method_tls::make_client_cert() const // SSL header assert(size_data <= 0xffffff); unsigned int ssl_header = htonl((tls_handshake_type_certificate << 24) | (unsigned int)size_data); - msg.insert(msg.end(), (unsigned char*)&ssl_header, (unsigned char*)(&ssl_header + 1)); + msg.insert(msg.end(), reinterpret_cast(&ssl_header), reinterpret_cast(&ssl_header + 1)); // List size assert(size_list <= 0xffffff); @@ -663,7 +663,7 @@ eap::sanitizing_blob eap::method_tls::make_client_cert() const eap::sanitizing_blob eap::method_tls::make_client_key_exchange(_In_ const tls_master_secret &pms) const { // Encrypt pre-master key with server public key first. - sanitizing_blob pms_enc((const unsigned char*)&pms, (const unsigned char*)(&pms + 1)); + sanitizing_blob pms_enc(reinterpret_cast(&pms), reinterpret_cast(&pms + 1)); crypt_key key; if (!key.import_public(m_cp_enc_client, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, &(m_server_cert_chain.front()->pCertInfo->SubjectPublicKeyInfo))) throw win_runtime_error(__FUNCTION__ " Error importing server's public key."); @@ -681,7 +681,7 @@ eap::sanitizing_blob eap::method_tls::make_client_key_exchange(_In_ const tls_ma // SSL header assert(size_data <= 0xffffff); unsigned int ssl_header = htonl((tls_handshake_type_client_key_exchange << 24) | (unsigned int)size_data); - msg.insert(msg.end(), (unsigned char*)&ssl_header, (unsigned char*)(&ssl_header + 1)); + msg.insert(msg.end(), reinterpret_cast(&ssl_header), reinterpret_cast(&ssl_header + 1)); // Encrypted pre master secret size assert(size_pms_enc <= 0xffff); @@ -707,7 +707,7 @@ eap::sanitizing_blob eap::method_tls::make_finished() const // SSL header unsigned int ssl_header = htonl((unsigned int)(tls_handshake_type_finished << 24) | 12); - msg.insert(msg.end(), (unsigned char*)&ssl_header, (unsigned char*)(&ssl_header + 1)); + msg.insert(msg.end(), reinterpret_cast(&ssl_header), reinterpret_cast(&ssl_header + 1)); // Create label + hash MD5 + hash SHA-1 seed. crypt_hash hash; @@ -760,7 +760,7 @@ eap::sanitizing_blob eap::method_tls::make_message(_In_ tls_message_type_t type, sanitizing_blob msg; msg.reserve(sizeof(message_header) + size_data); - msg.assign((const unsigned char*)&hdr, (const unsigned char*)(&hdr + 1)); + msg.assign(reinterpret_cast(&hdr), reinterpret_cast(&hdr + 1)); msg.insert(msg.end(), data.begin(), data.end()); return msg; } @@ -774,8 +774,8 @@ void eap::method_tls::derive_msk() #if EAP_TLS < EAP_TLS_SCHANNEL static const unsigned char s_label[] = "client EAP encryption"; sanitizing_blob seed(s_label, s_label + _countof(s_label) - 1); - seed.insert(seed.end(), (const unsigned char*)&m_random_client, (const unsigned char*)(&m_random_client + 1)); - seed.insert(seed.end(), (const unsigned char*)&m_random_server, (const unsigned char*)(&m_random_server + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_client), reinterpret_cast(&m_random_client + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_server), reinterpret_cast(&m_random_server + 1)); sanitizing_blob key_block(prf(m_cp, m_alg_prf, m_master_secret, seed, 2*sizeof(tls_random))); _key_block = key_block.data(); #else @@ -808,13 +808,13 @@ void eap::method_tls::process_packet(_In_bytecount_(size_pck) const void *_pck, { sanitizing_blob data; - for (const unsigned char *pck = (const unsigned char*)_pck, *pck_end = pck + size_pck; pck < pck_end; ) { + for (const unsigned char *pck = reinterpret_cast(_pck), *pck_end = pck + size_pck; pck < pck_end; ) { if (pck + 5 > pck_end) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete message header."); const message_header *hdr = (const message_header*)pck; const unsigned char - *msg = (const unsigned char*)(hdr + 1), - *msg_end = msg + ntohs(*(unsigned short*)hdr->length); + *msg = reinterpret_cast(hdr + 1), + *msg_end = msg + ntohs(*reinterpret_cast(hdr->length)); if (msg_end > pck_end) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete message data."); @@ -870,7 +870,7 @@ void eap::method_tls::process_change_cipher_spec(_In_bytecount_(size_msg) const if (size_msg < 1) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete change cipher spec."); - const unsigned char *msg = (const unsigned char*)_msg; + const unsigned char *msg = reinterpret_cast(_msg); if (msg[0] != 1) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, string_printf(__FUNCTION__ " Invalid change cipher spec message (expected 1, received %u).", msg[0])); @@ -885,8 +885,8 @@ void eap::method_tls::process_change_cipher_spec(_In_bytecount_(size_msg) const static const unsigned char s_label[] = "key expansion"; sanitizing_blob seed(s_label, s_label + _countof(s_label) - 1); - seed.insert(seed.end(), (const unsigned char*)&m_random_server, (const unsigned char*)(&m_random_server + 1)); - seed.insert(seed.end(), (const unsigned char*)&m_random_client, (const unsigned char*)(&m_random_client + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_server), reinterpret_cast(&m_random_server + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_client), reinterpret_cast(&m_random_client + 1)); sanitizing_blob key_block(prf(m_cp, m_alg_prf, m_master_secret, seed, 2*m_state_server_pending.m_size_mac_key + // client_write_MAC_secret & server_write_MAC_secret (SHA1) 2*m_state_server_pending.m_size_enc_key + // client_write_key & server_write_key @@ -928,7 +928,7 @@ void eap::method_tls::process_alert(_In_bytecount_(size_msg) const void *_msg, _ if (size_msg < 2) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete alert."); - const unsigned char *msg = (const unsigned char*)_msg; + const unsigned char *msg = reinterpret_cast(_msg); m_module.log_event(&EAPMETHOD_TLS_ALERT, event_data((unsigned int)eap_type_tls), event_data((unsigned char)msg[0]), event_data((unsigned char)msg[1]), event_data::blank); @@ -941,11 +941,11 @@ void eap::method_tls::process_alert(_In_bytecount_(size_msg) const void *_msg, _ void eap::method_tls::process_handshake(_In_bytecount_(size_msg) const void *_msg, _In_ size_t size_msg) { - for (const unsigned char *msg = (const unsigned char*)_msg, *msg_end = msg + size_msg; msg < msg_end; ) { + for (const unsigned char *msg = reinterpret_cast(_msg), *msg_end = msg + size_msg; msg < msg_end; ) { // Parse record header. if (msg + sizeof(unsigned int) > msg_end) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete record header."); - unsigned int hdr = ntohl(*(unsigned int*)msg); + unsigned int hdr = ntohl(*reinterpret_cast(msg)); const unsigned char *rec = msg + sizeof(unsigned int), *rec_end = rec + (hdr & 0xffffff); @@ -959,9 +959,9 @@ void eap::method_tls::process_handshake(_In_bytecount_(size_msg) const void *_ms // TLS version if (rec + 2 > rec_end) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Server SSL/TLS version missing or incomplete."); - else if (*(tls_version*)rec < tls_version_1_0 || m_tls_version < *(tls_version*)rec) + else if (*reinterpret_cast(rec) < tls_version_1_0 || m_tls_version < *reinterpret_cast(rec)) throw win_runtime_error(ERROR_NOT_SUPPORTED, __FUNCTION__ " Unsupported SSL/TLS version."); - m_tls_version = *(tls_version*)rec; + m_tls_version = *reinterpret_cast(rec); m_alg_prf = m_tls_version < tls_version_1_2 ? CALG_TLS1PRF : CALG_SHA_256; rec += 2; @@ -1171,7 +1171,7 @@ void eap::method_tls::process_handshake() // Send Schannel's token via EAP. assert(buf_out[0].BufferType == SECBUFFER_TOKEN); assert(m_sc_ctx.m_attrib & ISC_RET_ALLOCATED_MEMORY); - m_packet_res.m_data.assign((const unsigned char*)buf_out[0].pvBuffer, (const unsigned char*)buf_out[0].pvBuffer + buf_out[0].cbBuffer); + m_packet_res.m_data.assign(reinterpret_cast(buf_out[0].pvBuffer), reinterpret_cast(buf_out[0].pvBuffer) + buf_out[0].cbBuffer); if (buf_in[1].BufferType == SECBUFFER_EXTRA) { // Server appended extra data. m_sc_queue.erase(m_sc_queue.begin(), m_sc_queue.end() - buf_in[1].cbBuffer); @@ -1217,7 +1217,7 @@ void eap::method_tls::process_handshake() // Send alert via EAP. Not that EAP will transmit it once we throw this is an error... assert(buf_out[1].BufferType == SECBUFFER_ALERT); assert(m_sc_ctx.m_attrib & ISC_RET_ALLOCATED_MEMORY); - m_packet_res.m_data.assign((const unsigned char*)buf_out[1].pvBuffer, (const unsigned char*)buf_out[1].pvBuffer + buf_out[1].cbBuffer); + m_packet_res.m_data.assign(reinterpret_cast(buf_out[1].pvBuffer), reinterpret_cast(buf_out[1].pvBuffer) + buf_out[1].cbBuffer); } throw sec_runtime_error(status, __FUNCTION__ " Schannel error."); @@ -1265,7 +1265,7 @@ void eap::method_tls::process_application_data() std::vector extra; for (size_t i = 0; i < _countof(buf); i++) if (buf[i].BufferType == SECBUFFER_EXTRA) - extra.insert(extra.end(), (unsigned char*)buf[i].pvBuffer, (unsigned char*)buf[i].pvBuffer + buf[i].cbBuffer); + extra.insert(extra.end(), reinterpret_cast(buf[i].pvBuffer), reinterpret_cast(buf[i].pvBuffer) + buf[i].cbBuffer); m_sc_queue = std::move(extra); } else if (status == SEC_E_INCOMPLETE_MESSAGE) { // Schannel neeeds more data. Send ACK packet to server to send more. @@ -1647,7 +1647,7 @@ eap::sanitizing_blob eap::method_tls::prf( size_S2 = size_S1; const void *S1 = &secret, - *S2 = (const unsigned char*)&secret + (sizeof(tls_master_secret) - size_S2); + *S2 = reinterpret_cast(&secret) + (sizeof(tls_master_secret) - size_S2); // Precalculate HMAC padding for speed. hmac_padding @@ -1656,8 +1656,8 @@ eap::sanitizing_blob eap::method_tls::prf( // Prepare A for p_hash. sanitizing_blob - A1((unsigned char*)seed, (unsigned char*)seed + size_seed), - A2((unsigned char*)seed, (unsigned char*)seed + size_seed); + A1(reinterpret_cast(seed), reinterpret_cast(seed) + size_seed), + A2(reinterpret_cast(seed), reinterpret_cast(seed) + size_seed); sanitizing_blob hmac1, @@ -1706,7 +1706,7 @@ eap::sanitizing_blob eap::method_tls::prf( hmac_padding padding(cp, alg, &secret, sizeof(tls_master_secret)); // Prepare A for p_hash. - sanitizing_blob A((unsigned char*)seed, (unsigned char*)seed + size_seed); + sanitizing_blob A(reinterpret_cast(seed), reinterpret_cast(seed) + size_seed); sanitizing_blob hmac; for (size_t i = 0; i < size; ) { @@ -1759,8 +1759,8 @@ HCRYPTKEY eap::method_tls::create_key( }; sanitizing_blob key_blob; key_blob.reserve(sizeof(key_blob_prefix) + size_secret); - key_blob.assign((const unsigned char*)&prefix, (const unsigned char*)(&prefix + 1)); - key_blob.insert(key_blob.end(), (const unsigned char*)secret, (const unsigned char*)secret + size_secret); + key_blob.assign( reinterpret_cast(&prefix), reinterpret_cast(&prefix + 1)); + key_blob.insert(key_blob.end(), reinterpret_cast( secret), reinterpret_cast(secret) + size_secret); // Import the key. winstd::crypt_key key_out; @@ -1795,7 +1795,7 @@ HCRYPTKEY eap::method_tls::create_key( #pragma pack(pop) sanitizing_blob key_blob; key_blob.reserve(sizeof(key_blob_prefix) + size_key); - key_blob.assign((const unsigned char*)&prefix, (const unsigned char*)(&prefix + 1)); + key_blob.assign(reinterpret_cast(&prefix), reinterpret_cast(&prefix + 1)); // Key in EME-PKCS1-v1_5 (RFC 3447). key_blob.push_back(0); // Initial zero @@ -1818,7 +1818,7 @@ HCRYPTKEY eap::method_tls::create_key( key_blob.push_back(0); // PS and M zero delimiter // M - key_blob.insert(key_blob.end(), (const unsigned char*)secret, (const unsigned char*)secret + size_secret); + key_blob.insert(key_blob.end(), reinterpret_cast(secret), reinterpret_cast(secret) + size_secret); #ifdef _HOST_LOW_ENDIAN std::reverse(key_blob.end() - size_key, key_blob.end()); diff --git a/lib/TLS/src/TLS.cpp b/lib/TLS/src/TLS.cpp index f4ff6a7..c511951 100644 --- a/lib/TLS/src/TLS.cpp +++ b/lib/TLS/src/TLS.cpp @@ -496,11 +496,11 @@ bool eap::packet_tls::append_frag(_In_ const EapPacket *pck) if (pck->Data[1] & flags_req_length_incl) { // Length field is included. packet_data_ptr = pck->Data + 6; - size_packet_data = ntohs(*(unsigned short*)pck->Length) - 10; + size_packet_data = ntohs(*reinterpret_cast(pck->Length)) - 10; } else { // Length field not included. packet_data_ptr = pck->Data + 2; - size_packet_data = ntohs(*(unsigned short*)pck->Length) - 6; + size_packet_data = ntohs(*reinterpret_cast(pck->Length)) - 6; } // Do the EAP-TLS defragmentation. @@ -509,7 +509,7 @@ bool eap::packet_tls::append_frag(_In_ const EapPacket *pck) // Start a new packet. if (pck->Data[1] & flags_req_length_incl) { // Preallocate data according to the Length field. - size_t size_tot = ntohl(*(unsigned int*)(pck->Data + 2)); + size_t size_tot = ntohl(*reinterpret_cast(pck->Data + 2)); m_data.reserve(size_tot); //m_module.log_event(&EAPMETHOD_PACKET_RECV_FRAG_FIRST, event_data((unsigned int)eap_type_tls), event_data((unsigned int)size_packet_data), event_data((unsigned int)size_tot), event_data::blank); } else { @@ -561,7 +561,7 @@ unsigned short eap::packet_tls::get_frag(_Out_bytecap_(size_pck) EapPacket *pck, } else { // But it should be fragmented. m_flags |= flags_res_length_incl | flags_res_more_frag; - *(unsigned int*)(pck->Data + 2) = htonl(size_packet); + *reinterpret_cast(pck->Data + 2) = htonl(size_packet); data_dst = pck->Data + 6; size_data = size_packet_limit - 10; size_packet = size_packet_limit; @@ -585,7 +585,7 @@ unsigned short eap::packet_tls::get_frag(_Out_bytecap_(size_pck) EapPacket *pck, pck->Code = (BYTE)m_code; pck->Id = m_id; - *(unsigned short*)pck->Length = htons((unsigned short)size_packet); + *reinterpret_cast(pck->Length) = htons((unsigned short)size_packet); pck->Data[0] = (BYTE)eap_type_tls; pck->Data[1] = m_flags; memcpy(data_dst, m_data.data(), size_data); diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index ff9572f..a9e1bd0 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -521,7 +521,7 @@ void wxTLSServerTrustPanel::OnRootCAAddFile(wxCommandEvent& event) for (size_t i = 0, i_end = paths.GetCount(); i < i_end; i++) { // Load certificate(s) from file. winstd::cert_store cs; - if (cs.create(CERT_STORE_PROV_FILENAME, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, NULL, CERT_STORE_OPEN_EXISTING_FLAG | CERT_STORE_READONLY_FLAG, (LPCTSTR)(paths[i]))) { + if (cs.create(CERT_STORE_PROV_FILENAME, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, NULL, CERT_STORE_OPEN_EXISTING_FLAG | CERT_STORE_READONLY_FLAG, paths[i])) { for (PCCERT_CONTEXT cert = NULL; (cert = CertEnumCertificatesInStore(cs, cert)) != NULL;) AddRootCA(cert); } else diff --git a/lib/TTLS/src/Config.cpp b/lib/TTLS/src/Config.cpp index 53764b9..6df8fe5 100644 --- a/lib/TTLS/src/Config.cpp +++ b/lib/TTLS/src/Config.cpp @@ -38,7 +38,7 @@ eap::config_method_ttls::config_method_ttls(_In_ module &mod, _In_ unsigned int eap::config_method_ttls::config_method_ttls(const _In_ config_method_ttls &other) : - m_inner(other.m_inner ? (config_method_with_cred*)other.m_inner->clone() : nullptr), + m_inner(other.m_inner ? dynamic_cast(other.m_inner->clone()) : nullptr), m_anonymous_identity(other.m_anonymous_identity), config_method_tls(other) { @@ -57,7 +57,7 @@ eap::config_method_ttls& eap::config_method_ttls::operator=(const _In_ config_me { if (this != &other) { (config_method_tls&)*this = other; - m_inner.reset(other.m_inner ? (config_method_with_cred*)other.m_inner->clone() : nullptr); + m_inner.reset(other.m_inner ? dynamic_cast(other.m_inner->clone()) : nullptr); m_anonymous_identity = other.m_anonymous_identity; } diff --git a/lib/TTLS/src/Credentials.cpp b/lib/TTLS/src/Credentials.cpp index cb3ead9..7989993 100644 --- a/lib/TTLS/src/Credentials.cpp +++ b/lib/TTLS/src/Credentials.cpp @@ -35,7 +35,7 @@ eap::credentials_ttls::credentials_ttls(_In_ module &mod) : eap::credentials_ttls::credentials_ttls(_In_ const credentials_ttls &other) : - m_inner(other.m_inner ? (credentials*)other.m_inner->clone() : nullptr), + m_inner(other.m_inner ? dynamic_cast(other.m_inner->clone()) : nullptr), credentials_tls(other) { } @@ -52,7 +52,7 @@ eap::credentials_ttls& eap::credentials_ttls::operator=(_In_ const credentials_t { if (this != &other) { (credentials_tls&)*this = other; - m_inner.reset(other.m_inner ? (credentials*)other.m_inner->clone() : nullptr); + m_inner.reset(other.m_inner ? dynamic_cast(other.m_inner->clone()) : nullptr); } return *this; diff --git a/lib/TTLS/src/Method.cpp b/lib/TTLS/src/Method.cpp index 1bb4806..8a8b968 100644 --- a/lib/TTLS/src/Method.cpp +++ b/lib/TTLS/src/Method.cpp @@ -157,8 +157,8 @@ void eap::method_ttls::derive_msk() // static const unsigned char s_label[] = "ttls keying material"; sanitizing_blob seed(s_label, s_label + _countof(s_label) - 1); - seed.insert(seed.end(), (const unsigned char*)&m_random_client, (const unsigned char*)(&m_random_client + 1)); - seed.insert(seed.end(), (const unsigned char*)&m_random_server, (const unsigned char*)(&m_random_server + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_client), reinterpret_cast(&m_random_client + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_server), reinterpret_cast(&m_random_server + 1)); sanitizing_blob key_block(prf(m_cp, CALG_TLS1PRF, m_master_secret, seed, 2*sizeof(tls_random))); _key_block = key_block.data(); #else @@ -197,8 +197,8 @@ void eap::method_ttls::derive_challenge() #if EAP_TLS < EAP_TLS_SCHANNEL static const unsigned char s_label[] = "ttls challenge"; sanitizing_blob seed(s_label, s_label + _countof(s_label) - 1); - seed.insert(seed.end(), (const unsigned char*)&m_random_client, (const unsigned char*)(&m_random_client + 1)); - seed.insert(seed.end(), (const unsigned char*)&m_random_server, (const unsigned char*)(&m_random_server + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_client), reinterpret_cast(&m_random_client + 1)); + seed.insert(seed.end(), reinterpret_cast(&m_random_server), reinterpret_cast(&m_random_server + 1)); sanitizing_blob keying(prf(m_cp, CALG_TLS1PRF, m_master_secret, seed, sizeof(challenge_mschapv2) + 1)); memcpy(&inner_mschapv2->m_challenge_server, keying.data(), sizeof(challenge_mschapv2)); inner_mschapv2->m_ident = keying[sizeof(challenge_mschapv2) + 0]; @@ -294,7 +294,7 @@ void eap::method_ttls::process_application_data(_In_bytecount_(size_msg) const v status = EncryptMessage(m_sc_ctx, 0, &buf_desc, 0); if (FAILED(status)) throw sec_runtime_error(status, __FUNCTION__ " Error encrypting message."); - m_packet_res.m_data.insert(m_packet_res.m_data.end(), (const unsigned char*)buf[0].pvBuffer, (const unsigned char*)buf[0].pvBuffer + buf[0].cbBuffer + buf[1].cbBuffer + buf[2].cbBuffer); + m_packet_res.m_data.insert(m_packet_res.m_data.end(), reinterpret_cast(buf[0].pvBuffer), reinterpret_cast(buf[0].pvBuffer) + buf[0].cbBuffer + buf[1].cbBuffer + buf[2].cbBuffer); #endif } else { // Empty packets represent ACK message, and are not encrypted. diff --git a/lib/WinStd b/lib/WinStd index 129b9c9..3b4448d 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 129b9c9a10c2145235e8f447706875dcafa4a4a3 +Subproject commit 3b4448dcf4f2cfd54dc40be1ef262835ac532550 diff --git a/lib/wxExtend b/lib/wxExtend index e9dd2b7..2e3e188 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit e9dd2b7ae5faae80f2a5c785b6def4ad6f3aba21 +Subproject commit 2e3e188026b7e6845e9e2b5552faf7589d25cbfc From b3d4e6b0852e9d1ba2020e890d8a19c488b82374 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 12:45:55 +0200 Subject: [PATCH 15/54] ID 4. Possibility of method_tls class initialization list optimization from security audit fixed --- lib/TLS/include/Method.h | 2 +- lib/TLS/include/TLS.h | 53 ++++++++++++++++++++++++++++++++++++++++ lib/TLS/src/Method.cpp | 27 ++++++-------------- 3 files changed, 62 insertions(+), 20 deletions(-) diff --git a/lib/TLS/include/Method.h b/lib/TLS/include/Method.h index 44ea934..7b71689 100644 --- a/lib/TLS/include/Method.h +++ b/lib/TLS/include/Method.h @@ -461,7 +461,7 @@ namespace eap winstd::crypt_hash m_hash_handshake_msgs_sha1; ///< Running SHA-1 hash of handshake messages winstd::crypt_hash m_hash_handshake_msgs_sha256; ///< Running SHA-256 hash of handshake messages - bool m_handshake[tls_handshake_type_max]; ///< Handshake flags (map od handshake messages received) + tls_handshake_flags m_handshake; ///< Handshake flags (map od handshake messages received) enum { phase_unknown = -1, ///< Unknown phase diff --git a/lib/TLS/include/TLS.h b/lib/TLS/include/TLS.h index a4176ac..88cce47 100644 --- a/lib/TLS/include/TLS.h +++ b/lib/TLS/include/TLS.h @@ -96,12 +96,19 @@ namespace eap /// EAP-TLS packet /// class packet_tls; + + /// + /// TLS map of handshake messages received + /// + class tls_handshake_flags; } #pragma once #include +#include + namespace eap { @@ -615,4 +622,50 @@ namespace eap public: unsigned char m_flags; ///< Packet flags }; + + + class tls_handshake_flags + { + public: + /// + /// Constructs an empty set of flags + /// + inline tls_handshake_flags() + { + memset(m_flags, 0, sizeof(m_flags)); + } + + /// + /// Empty set of flags + /// + inline void clear() + { + memset(m_flags, 0, sizeof(m_flags)); + } + + /// + /// Set particular flag + /// + /// \param[in] type TLS handshake message to set its flag + /// + inline void set(_In_ tls_handshake_type_t type) + { + assert(tls_handshake_type_min <= type && type < tls_handshake_type_max); + m_flags[type] = true; + } + + /// + /// Get particular flag + /// + /// \param[in] type TLS handshake message to get its flag + /// + inline bool operator[](_In_ tls_handshake_type_t type) const + { + assert(tls_handshake_type_min <= type && type < tls_handshake_type_max); + return m_flags[type]; + } + + protected: + bool m_flags[tls_handshake_type_max]; ///< Set of flags + }; } diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index f2397d8..d339a93 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -65,6 +65,10 @@ eap::method_tls::method_tls(_In_ module &module, _In_ config_method_tls &cfg, _I m_cred(cred), m_user_ctx(NULL), #if EAP_TLS < EAP_TLS_SCHANNEL + m_tls_version(tls_version_1_2), +#ifdef _DEBUG + m_alg_prf(0), +#endif m_session_resumed(false), m_phase(phase_unknown), m_seq_num_client(0), @@ -74,12 +78,6 @@ eap::method_tls::method_tls(_In_ module &module, _In_ config_method_tls &cfg, _I #endif method(module, cfg, cred) { -#if EAP_TLS < EAP_TLS_SCHANNEL - m_tls_version = tls_version_1_2; -#ifdef _DEBUG - memset(m_handshake, 0, sizeof(m_handshake)); -#endif -#endif } @@ -111,6 +109,7 @@ eap::method_tls::method_tls(_Inout_ method_tls &&other) : m_hash_handshake_msgs_md5 (std::move(other.m_hash_handshake_msgs_md5 )), m_hash_handshake_msgs_sha1 (std::move(other.m_hash_handshake_msgs_sha1 )), m_hash_handshake_msgs_sha256(std::move(other.m_hash_handshake_msgs_sha256)), + m_handshake (std::move(other.m_handshake )), m_phase (std::move(other.m_phase )), m_seq_num_client (std::move(other.m_seq_num_client )), m_seq_num_server (std::move(other.m_seq_num_server )), @@ -123,12 +122,6 @@ eap::method_tls::method_tls(_Inout_ method_tls &&other) : #endif method (std::move(other )) { -#if EAP_TLS < EAP_TLS_SCHANNEL - memcpy(m_handshake, other.m_handshake, sizeof(m_handshake)); -#ifdef _DEBUG - memset(other.m_handshake, 0, sizeof(m_handshake)); -#endif -#endif } @@ -162,14 +155,10 @@ eap::method_tls& eap::method_tls::operator=(_Inout_ method_tls &&other) m_hash_handshake_msgs_md5 = std::move(other.m_hash_handshake_msgs_md5 ); m_hash_handshake_msgs_sha1 = std::move(other.m_hash_handshake_msgs_sha1 ); m_hash_handshake_msgs_sha256 = std::move(other.m_hash_handshake_msgs_sha256); + m_handshake = std::move(other.m_handshake ); m_phase = std::move(other.m_phase ); m_seq_num_client = std::move(other.m_seq_num_client ); m_seq_num_server = std::move(other.m_seq_num_server ); - - memcpy(m_handshake, other.m_handshake, sizeof(m_handshake)); -#ifdef _DEBUG - memset(other.m_handshake, 0, sizeof(m_handshake)); -#endif #else m_sc_target_name = std::move(other.m_sc_target_name ); m_sc_cred = std::move(other.m_sc_cred ); @@ -310,7 +299,7 @@ void eap::method_tls::process_request_packet( m_key_mppe_server.clear(); } else { // Process the packet. - memset(m_handshake, 0, sizeof(m_handshake)); + m_handshake.clear(); m_packet_res.m_data.clear(); process_packet(m_packet_req.m_data.data(), m_packet_req.m_data.size()); } @@ -1103,7 +1092,7 @@ void eap::method_tls::process_handshake(_In_bytecount_(size_msg) const void *_ms if (type < tls_handshake_type_max) { // Set the flag this handshake message was received. - m_handshake[type] = true; + m_handshake.set(type); } if (type != tls_handshake_type_hello_request) { From bcba624dcbef7a755b123998469ddaa006951359 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 12:50:24 +0200 Subject: [PATCH 16/54] ID 5. Unused variables from security audit partially fixed --- lib/MSCHAPv2/src/Method.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/MSCHAPv2/src/Method.cpp b/lib/MSCHAPv2/src/Method.cpp index 646545c..2e3d0ec 100644 --- a/lib/MSCHAPv2/src/Method.cpp +++ b/lib/MSCHAPv2/src/Method.cpp @@ -151,9 +151,6 @@ void eap::method_mschapv2::process_request_packet( void eap::method_mschapv2::process_packet(_In_bytecount_(size_pck) const void *_pck, _In_ size_t size_pck) { - sanitizing_blob data; - wstring msg_w; - for (const unsigned char *pck = reinterpret_cast(_pck), *pck_end = pck + size_pck; pck < pck_end; ) { if (pck + sizeof(diameter_avp_header) > pck_end) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete message header."); From b212d0abc69b7a85851c33fbdebfea6b3e594296 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 13:00:34 +0200 Subject: [PATCH 17/54] ID 7. Commented out parts of the code from security audit partially resolved --- lib/TLS/src/Method.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index d339a93..5dcd2e1 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -257,8 +257,7 @@ void eap::method_tls::process_request_packet( // Is this a valid EAP-TLS packet? if (dwReceivedPacketSize < 6) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Packet is too small. EAP-%s packets should be at least 6B."); - //else if (pReceivedPacket->Data[0] != eap_type_tls) // Skip method check, to allow TTLS extension. - // throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, string_printf(__FUNCTION__ " Packet is not EAP-TLS (expected: %u, received: %u).", eap_type_tls, pReceivedPacket->Data[0])); + // Don't check packet method type, to allow TTLS extension. if (!m_packet_req.append_frag((const EapPacket*)pReceivedPacket)) { // This was not the only/last fragment. Reply with ACK packet. From c7b96c9aa3c4a50bbca54db72ef9cc0e954915ef Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 13:12:47 +0200 Subject: [PATCH 18/54] ID 8. A typo in the comment from security audit resolved --- lib/TLS/include/Method.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/TLS/include/Method.h b/lib/TLS/include/Method.h index 7b71689..375b73c 100644 --- a/lib/TLS/include/Method.h +++ b/lib/TLS/include/Method.h @@ -461,7 +461,7 @@ namespace eap winstd::crypt_hash m_hash_handshake_msgs_sha1; ///< Running SHA-1 hash of handshake messages winstd::crypt_hash m_hash_handshake_msgs_sha256; ///< Running SHA-256 hash of handshake messages - tls_handshake_flags m_handshake; ///< Handshake flags (map od handshake messages received) + tls_handshake_flags m_handshake; ///< Handshake flags (map of handshake messages received) enum { phase_unknown = -1, ///< Unknown phase From 3a6701452a710b17801018bbfc92cdfaefc2e51b Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 13:49:32 +0200 Subject: [PATCH 19/54] 1.5.2 False positives from security audit resolved --- EventMonitor/App.cpp | 6 +++--- EventMonitor/App.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/EventMonitor/App.cpp b/EventMonitor/App.cpp index f92dd8d..6fef987 100644 --- a/EventMonitor/App.cpp +++ b/EventMonitor/App.cpp @@ -70,9 +70,9 @@ bool wxEventMonitorApp::OnInit() } #endif - m_mainWnd = new wxEventMonitorFrame(NULL); - wxPersistentRegisterAndRestore(m_mainWnd); - m_mainWnd->Show(); + wxEventMonitorFrame *mainWnd = new wxEventMonitorFrame(NULL); + wxPersistentRegisterAndRestore(mainWnd); + mainWnd->Show(); return true; } diff --git a/EventMonitor/App.h b/EventMonitor/App.h index 9c88010..e318603 100644 --- a/EventMonitor/App.h +++ b/EventMonitor/App.h @@ -54,7 +54,6 @@ public: //virtual int OnExit(); public: - wxEventMonitorFrame *m_mainWnd; ///< Main window wxLocale m_locale; ///< Current locale }; From 76729d51cc2ac8bad7cae18d38b81f8c2122e473 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Oct 2016 14:49:17 +0200 Subject: [PATCH 20/54] Code clean-up --- EventMonitor/ETWLog.cpp | 8 ++--- EventMonitor/ETWLog.h | 2 +- lib/EAPBase/include/EAP.h | 64 ++++++++++++++++----------------- lib/EAPBase/include/Module.h | 4 +-- lib/EAPBase/src/Config.cpp | 19 +++++----- lib/EAPBase/src/Credentials.cpp | 4 +-- lib/EAPBase_UI/include/EAP_UI.h | 6 ++-- lib/EAPBase_UI/src/EAP_UI.cpp | 2 +- lib/MSCHAPv2/src/Method.cpp | 4 +-- lib/TLS/src/Config.cpp | 8 ++--- lib/TLS/src/Method.cpp | 14 ++++---- lib/TLS_UI/src/TLS_UI.cpp | 4 +-- lib/TTLS/src/Config.cpp | 2 +- lib/TTLS/src/Module.cpp | 4 +-- lib/TTLS_UI/src/Module.cpp | 2 +- lib/WinStd | 2 +- lib/wxExtend | 2 +- 17 files changed, 75 insertions(+), 76 deletions(-) diff --git a/EventMonitor/ETWLog.cpp b/EventMonitor/ETWLog.cpp index 230dc26..bf1aca2 100644 --- a/EventMonitor/ETWLog.cpp +++ b/EventMonitor/ETWLog.cpp @@ -92,7 +92,7 @@ wxEventTraceProcessorThread::wxEventTraceProcessorThread(wxEvtHandler *parent, c wxEventTraceProcessorThread::~wxEventTraceProcessorThread() { - for (vector::iterator trace = m_traces.begin(), trace_end = m_traces.end(); trace != trace_end; ++trace) { + for (auto trace = m_traces.begin(), trace_end = m_traces.end(); trace != trace_end; ++trace) { TRACEHANDLE &h = *trace; if (h) { // Close trace. @@ -104,7 +104,7 @@ wxEventTraceProcessorThread::~wxEventTraceProcessorThread() void wxEventTraceProcessorThread::Abort() { - for (vector::iterator trace = m_traces.begin(), trace_end = m_traces.end(); trace != trace_end; ++trace) { + for (auto trace = m_traces.begin(), trace_end = m_traces.end(); trace != trace_end; ++trace) { TRACEHANDLE &h = *trace; if (h) { // Close trace. @@ -415,7 +415,7 @@ void wxETWListCtrl::RebuildItems() // Rebuild the index. m_rec_idx.clear(); - set::const_iterator selection_end = selection.end(), focus_end = focus.end(); + auto selection_end = selection.cend(), focus_end = focus.cend(); vector selection_out, focus_out; long center_out = -1; for (size_t i = 0, n = m_rec_db.size(); i < n; i++) { @@ -709,7 +709,7 @@ void wxPersistentETWListCtrl::Save() const SaveValue(wxT("ScrollAuto"), wnd->m_scroll_auto); wxString data_str; - for (wxETWListCtrl::guidset::const_iterator src = wnd->m_sources.cbegin(), src_end = wnd->m_sources.cend(); src != src_end; ++src) + for (auto src = wnd->m_sources.cbegin(), src_end = wnd->m_sources.cend(); src != src_end; ++src) data_str += tstring_guid(*src); SaveValue(wxT("Sources"), data_str); diff --git a/EventMonitor/ETWLog.h b/EventMonitor/ETWLog.h index ffd9101..829f862 100644 --- a/EventMonitor/ETWLog.h +++ b/EventMonitor/ETWLog.h @@ -161,7 +161,7 @@ public: inline void EnableSource(const GUID &guid, bool enable = true) { - guidset::iterator s = m_sources.find(guid); + auto s = m_sources.find(guid); if (enable) { if (s == m_sources.end()) { m_sources.insert(guid); diff --git a/lib/EAPBase/include/EAP.h b/lib/EAPBase/include/EAP.h index 23dd1a5..6bdc15a 100644 --- a/lib/EAPBase/include/EAP.h +++ b/lib/EAPBase/include/EAP.h @@ -720,7 +720,7 @@ namespace eap inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const bool &val) { - eap::cursor_out::ptr_type ptr_end = cursor.ptr + 1; + auto ptr_end = cursor.ptr + 1; assert(ptr_end <= cursor.ptr_end); *cursor.ptr = val ? 1 : 0; cursor.ptr = ptr_end; @@ -736,7 +736,7 @@ inline size_t pksizeof(_In_ const bool &val) inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ bool &val) { - eap::cursor_in::ptr_type ptr_end = cursor.ptr + 1; + auto ptr_end = cursor.ptr + 1; assert(ptr_end <= cursor.ptr_end); val = *cursor.ptr ? true : false; cursor.ptr = ptr_end; @@ -745,7 +745,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ bool &val) inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const unsigned char &val) { - eap::cursor_out::ptr_type ptr_end = cursor.ptr + 1; + auto ptr_end = cursor.ptr + 1; assert(ptr_end <= cursor.ptr_end); *cursor.ptr = val; cursor.ptr = ptr_end; @@ -761,7 +761,7 @@ inline size_t pksizeof(_In_ const unsigned char &val) inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ unsigned char &val) { - eap::cursor_in::ptr_type ptr_end = cursor.ptr + 1; + auto ptr_end = cursor.ptr + 1; assert(ptr_end <= cursor.ptr_end); val = *cursor.ptr; cursor.ptr = ptr_end; @@ -770,7 +770,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ unsigned char &val) inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const unsigned int &val) { - eap::cursor_out::ptr_type ptr_end = cursor.ptr + sizeof(unsigned int); + auto ptr_end = cursor.ptr + sizeof(unsigned int); assert(ptr_end <= cursor.ptr_end); *reinterpret_cast(cursor.ptr) = val; cursor.ptr = ptr_end; @@ -786,7 +786,7 @@ inline size_t pksizeof(_In_ const unsigned int &val) inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ unsigned int &val) { - eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(unsigned int); + auto ptr_end = cursor.ptr + sizeof(unsigned int); assert(ptr_end <= cursor.ptr_end); val = *reinterpret_cast(cursor.ptr); cursor.ptr = ptr_end; @@ -796,7 +796,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ unsigned int &val) #ifdef _WIN64 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const size_t &val) { - eap::cursor_out::ptr_type ptr_end = cursor.ptr + sizeof(size_t); + auto ptr_end = cursor.ptr + sizeof(size_t); assert(ptr_end <= cursor.ptr_end); *(size_t*)cursor.ptr = val; cursor.ptr = ptr_end; @@ -812,7 +812,7 @@ inline size_t pksizeof(_In_ const size_t &val) inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ size_t &val) { - eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(size_t); + auto ptr_end = cursor.ptr + sizeof(size_t); assert(ptr_end <= cursor.ptr_end); val = *(size_t*)cursor.ptr; cursor.ptr = ptr_end; @@ -823,10 +823,10 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ size_t &val) template inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::basic_string<_Elem, _Traits, _Ax> &val) { - std::basic_string<_Elem, _Traits, _Ax>::size_type count = val.length(); + size_t count = val.length(); assert(strlen(val.c_str()) == count); // String should not contain zero terminators. size_t size = sizeof(_Elem)*(count + 1); - eap::cursor_out::ptr_type ptr_end = cursor.ptr + size; + auto ptr_end = cursor.ptr + size; assert(ptr_end <= cursor.ptr_end); memcpy(cursor.ptr, (const _Elem*)val.c_str(), size); cursor.ptr = ptr_end; @@ -844,7 +844,7 @@ template inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::basic_string<_Elem, _Traits, _Ax> &val) { size_t count_max = cursor.ptr_end - cursor.ptr; - std::basic_string<_Elem, _Traits, _Ax>::size_type count = strnlen((const _Elem*&)cursor.ptr, count_max); + size_t count = strnlen((const _Elem*&)cursor.ptr, count_max); assert(count < count_max); // String should be zero terminated. val.assign((const _Elem*&)cursor.ptr, count); cursor.ptr += sizeof(_Elem)*(count + 1); @@ -879,13 +879,13 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::basic_string inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::vector<_Ty, _Ax> &val) { - std::vector<_Ty, _Ax>::size_type count = val.size(); + auto count = val.size(); cursor << count; // Since we do not know wheter vector elements are primitives or objects, iterate instead of memcpy. // For performance critical vectors of flat opaque data types write specialized template instantiation. - for (std::vector<_Ty, _Ax>::size_type i = 0; i < count; i++) - cursor << val[i]; + for (auto i = val.cbegin(), i_end = val.cend(); i != i_end; ++i) + cursor << *i; } @@ -894,10 +894,10 @@ inline size_t pksizeof(const std::vector<_Ty, _Ax> &val) { // Since we do not know wheter vector elements are primitives or objects, iterate instead of sizeof(). // For performance critical vectors of flat opaque data types write specialized template instantiation. - std::vector<_Ty, _Ax>::size_type count = val.size(); + auto count = val.size(); size_t size = pksizeof(count); - for (std::vector<_Ty, _Ax>::size_type i = 0; i < count; i++) - size += pksizeof(val[i]); + for (auto i = val.cbegin(), i_end = val.cend(); i != i_end; ++i) + size += pksizeof(*i); return size; } @@ -905,14 +905,14 @@ inline size_t pksizeof(const std::vector<_Ty, _Ax> &val) template inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::vector<_Ty, _Ax> &val) { - std::vector<_Ty, _Ax>::size_type count; + std::vector<_Ty, _Ax>::size_type i, count; cursor >> count; // Since we do not know wheter vector elements are primitives or objects, iterate instead of assign(). // For performance critical vectors of flat opaque data types write specialized template instantiation. val.clear(); val.reserve(count); - for (std::vector<_Ty, _Ax>::size_type i = 0; i < count; i++) { + for (i = 0; i < count; i++) { _Ty el; cursor >> el; val.push_back(el); @@ -923,12 +923,12 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::vector<_Ty, _A template inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::list<_Ty, _Ax> &val) { - std::list<_Ty, _Ax>::size_type count = val.size(); + auto count = val.size(); cursor << count; // Since we do not know wheter list elements are primitives or objects, iterate instead of memcpy. // For performance critical vectors of flat opaque data types write specialized template instantiation. - for (std::list<_Ty, _Ax>::const_iterator i = val.cbegin(), i_end = val.cend(); i != i_end; ++i) + for (auto i = val.cbegin(), i_end = val.cend(); i != i_end; ++i) cursor << *i; } @@ -938,9 +938,9 @@ inline size_t pksizeof(const std::list<_Ty, _Ax> &val) { // Since we do not know wheter list elements are primitives or objects, iterate instead of sizeof(). // For performance critical vectors of flat opaque data types write specialized template instantiation. - std::list<_Ty, _Ax>::size_type count = val.size(); + auto count = val.size(); size_t size = pksizeof(count); - for (std::list<_Ty, _Ax>::const_iterator i = val.cbegin(), i_end = val.cend(); i != i_end; ++i) + for (auto i = val.cbegin(), i_end = val.cend(); i != i_end; ++i) size += pksizeof(*i); return size; } @@ -949,13 +949,11 @@ inline size_t pksizeof(const std::list<_Ty, _Ax> &val) template inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::list<_Ty, _Ax> &val) { - std::list<_Ty, _Ax>::size_type count; + std::list<_Ty, _Ax>::size_type i, count; cursor >> count; - // Since we do not know wheter list elements are primitives or objects, iterate instead of assign(). - // For performance critical vectors of flat opaque data types write specialized template instantiation. val.clear(); - for (std::list<_Ty, _Ax>::size_type i = 0; i < count; i++) { + for (i = 0; i < count; i++) { _Ty el; cursor >> el; val.push_back(el); @@ -990,7 +988,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const winstd::cert_ if (val) { cursor << (unsigned int)val->dwCertEncodingType; cursor << (unsigned int)val->cbCertEncoded ; - eap::cursor_out::ptr_type ptr_end = cursor.ptr + val->cbCertEncoded; + auto ptr_end = cursor.ptr + val->cbCertEncoded; assert(ptr_end <= cursor.ptr_end); memcpy(cursor.ptr, val->pbCertEncoded, val->cbCertEncoded); cursor.ptr = ptr_end; @@ -1022,7 +1020,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ winstd::cert_contex cursor >> (unsigned int&)dwCertEncodedSize; if (dwCertEncodedSize) { - eap::cursor_in::ptr_type ptr_end = cursor.ptr + dwCertEncodedSize; + auto ptr_end = cursor.ptr + dwCertEncodedSize; assert(ptr_end <= cursor.ptr_end); val.create(dwCertEncodingType, (BYTE*)cursor.ptr, dwCertEncodedSize); cursor.ptr = ptr_end; @@ -1052,7 +1050,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ winstd::eap_type_t template inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::sanitizing_blob_f &val) { - eap::cursor_out::ptr_type ptr_end = cursor.ptr + sizeof(eap::sanitizing_blob_f); + auto ptr_end = cursor.ptr + sizeof(eap::sanitizing_blob_f); assert(ptr_end <= cursor.ptr_end); memcpy(cursor.ptr, val.data, sizeof(eap::sanitizing_blob_f)); cursor.ptr = ptr_end; @@ -1070,7 +1068,7 @@ inline size_t pksizeof(_In_ const eap::sanitizing_blob_f &val) template inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::sanitizing_blob_f &val) { - eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(eap::sanitizing_blob_f); + auto ptr_end = cursor.ptr + sizeof(eap::sanitizing_blob_f); assert(ptr_end <= cursor.ptr_end); memcpy(val.data, cursor.ptr, sizeof(eap::sanitizing_blob_f)); cursor.ptr = ptr_end; @@ -1079,7 +1077,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::sanitizing_blo inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const GUID &val) { - eap::cursor_out::ptr_type ptr_end = cursor.ptr + sizeof(GUID); + auto ptr_end = cursor.ptr + sizeof(GUID); assert(ptr_end <= cursor.ptr_end); memcpy(cursor.ptr, &val, sizeof(GUID)); cursor.ptr = ptr_end; @@ -1095,7 +1093,7 @@ inline size_t pksizeof(_In_ const GUID &val) inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ GUID &val) { - eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(GUID); + auto ptr_end = cursor.ptr + sizeof(GUID); assert(ptr_end <= cursor.ptr_end); memcpy(&val, cursor.ptr, sizeof(GUID)); cursor.ptr = ptr_end; diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index 28ca9b4..d9dcfdf 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -162,7 +162,7 @@ namespace eap desc.reserve(count + 2); desc.push_back(winstd::event_data( name )); desc.push_back(winstd::event_data((unsigned int)count)); - for (std::list, _Ax_list>::const_iterator v = value.cbegin(), v_end = value.cend(); v != v_end; ++v) + for (auto v = value.cbegin(), v_end = value.cend(); v != v_end; ++v) desc.push_back(winstd::event_data(*v)); m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_ANSI_STRING_ARRAY, (ULONG)desc.size(), desc.data()); @@ -180,7 +180,7 @@ namespace eap desc.reserve(count + 2); desc.push_back(winstd::event_data( name )); desc.push_back(winstd::event_data((unsigned int)count)); - for (std::list, _Ax_list>::const_iterator v = value.cbegin(), v_end = value.cend(); v != v_end; ++v) + for (auto v = value.cbegin(), v_end = value.cend(); v != v_end; ++v) desc.push_back(winstd::event_data(*v)); m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_UNICODE_STRING_ARRAY, (ULONG)desc.size(), desc.data()); diff --git a/lib/EAPBase/src/Config.cpp b/lib/EAPBase/src/Config.cpp index f2e2928..5aeb4d6 100644 --- a/lib/EAPBase/src/Config.cpp +++ b/lib/EAPBase/src/Config.cpp @@ -375,7 +375,7 @@ eap::config_provider::config_provider(_In_ const config_provider &other) : config (other ) { m_methods.reserve(other.m_methods.size()); - for (vector >::const_iterator method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method) + for (auto method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method) m_methods.push_back(std::move(unique_ptr(*method ? dynamic_cast(method->get()->clone()) : nullptr))); } @@ -414,7 +414,7 @@ eap::config_provider& eap::config_provider::operator=(_In_ const config_provider m_methods.clear(); m_methods.reserve(other.m_methods.size()); - for (vector >::const_iterator method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method) + for (auto method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method) m_methods.push_back(std::move(unique_ptr(*method ? dynamic_cast(method->get()->clone()) : nullptr))); } @@ -519,7 +519,7 @@ void eap::config_provider::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pC if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:AuthenticationMethods"), bstr(L"AuthenticationMethods"), namespace_eapmetadata, pXmlElAuthenticationMethods))) throw com_runtime_error(hr, __FUNCTION__ " Error creating element."); - for (vector >::const_iterator method = m_methods.cbegin(), method_end = m_methods.cend(); method != method_end; ++method) { + for (auto method = m_methods.cbegin(), method_end = m_methods.cend(); method != method_end; ++method) { // com_obj pXmlElAuthenticationMethod; if (FAILED(hr = eapxml::create_element(pDoc, bstr(L"AuthenticationMethod"), namespace_eapmetadata, pXmlElAuthenticationMethod))) @@ -685,11 +685,12 @@ void eap::config_provider::operator>>(_Inout_ cursor_in &cursor) cursor >> m_lbl_alt_identity ; cursor >> m_lbl_alt_password ; - list::size_type count; - bool is_nonnull; + list::size_type i, count; cursor >> count; m_methods.clear(); - for (list::size_type i = 0; i < count; i++) { + m_methods.reserve(count); + for (i = 0; i < count; i++) { + bool is_nonnull; cursor >> is_nonnull; if (is_nonnull) { unique_ptr el(m_module.make_config_method()); @@ -763,7 +764,7 @@ void eap::config_connection::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode * if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:EAPIdentityProviderList"), bstr(L"EAPIdentityProviderList"), namespace_eapmetadata, pXmlElIdentityProviderList))) throw com_runtime_error(hr, __FUNCTION__ " Error creating element."); - for (provider_list::const_iterator provider = m_providers.cbegin(), provider_end = m_providers.cend(); provider != provider_end; ++provider) { + for (auto provider = m_providers.cbegin(), provider_end = m_providers.cend(); provider != provider_end; ++provider) { // com_obj pXmlElIdentityProvider; if (FAILED(hr = eapxml::create_element(pDoc, bstr(L"EAPIdentityProvider"), namespace_eapmetadata, pXmlElIdentityProvider))) @@ -825,10 +826,10 @@ void eap::config_connection::operator>>(_Inout_ cursor_in &cursor) { config::operator>>(cursor); - provider_list::size_type count; + provider_list::size_type i, count; cursor >> count; m_providers.clear(); - for (provider_list::size_type i = 0; i < count; i++) { + for (i = 0; i < count; i++) { config_provider el(m_module); cursor >> el; m_providers.push_back(std::move(el)); diff --git a/lib/EAPBase/src/Credentials.cpp b/lib/EAPBase/src/Credentials.cpp index 7195ff4..0f36497 100644 --- a/lib/EAPBase/src/Credentials.cpp +++ b/lib/EAPBase/src/Credentials.cpp @@ -657,7 +657,7 @@ void eap::credentials_connection::load(_In_ IXMLDOMNode *pConfigRoot) m_module.log_config((xpath + L" ID").c_str(), m_id.c_str()); // Look-up the provider. - for (config_connection::provider_list::const_iterator cfg_prov = m_cfg.m_providers.cbegin(), cfg_prov_end = m_cfg.m_providers.cend(); ; ++cfg_prov) { + for (auto cfg_prov = m_cfg.m_providers.cbegin(), cfg_prov_end = m_cfg.m_providers.cend(); ; ++cfg_prov) { if (cfg_prov != cfg_prov_end) { if (match(*cfg_prov)) { // Matching provider found. Create matching blank credential set, then load. @@ -700,7 +700,7 @@ void eap::credentials_connection::operator>>(_Inout_ cursor_in &cursor) cursor >> m_id ; // Look-up the provider. - for (config_connection::provider_list::const_iterator cfg_prov = m_cfg.m_providers.cbegin(), cfg_prov_end = m_cfg.m_providers.cend(); ; ++cfg_prov) { + for (auto cfg_prov = m_cfg.m_providers.cbegin(), cfg_prov_end = m_cfg.m_providers.cend(); ; ++cfg_prov) { if (cfg_prov != cfg_prov_end) { if (match(*cfg_prov)) { // Matching provider found. Create matching blank credential set, then read. diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index 8f424ae..2831a3b 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -203,10 +203,10 @@ public: std::unique_ptr cfg_dummy(cfg.m_module.make_config_method()); m_banner->m_title->SetLabel(wxString::Format("%s %s", wxT(PRODUCT_NAME_STR), cfg_dummy->get_method_str())); - for (eap::config_connection::provider_list::iterator provider = m_cfg.m_providers.begin(), provider_end = m_cfg.m_providers.end(); provider != provider_end; ++provider) { + for (auto provider = m_cfg.m_providers.begin(), provider_end = m_cfg.m_providers.end(); provider != provider_end; ++provider) { bool is_single = provider->m_methods.size() == 1; std::vector >::size_type count = 0; - std::vector >::iterator method = provider->m_methods.begin(), method_end = provider->m_methods.end(); + auto method = provider->m_methods.begin(), method_end = provider->m_methods.end(); for (; method != method_end; ++method, count++) { m_providers->AddPage( new _wxT( @@ -299,7 +299,7 @@ protected: if (wxMessageBox(tstring_printf(_("Are you sure you want to permanently remove %ls provider from configuration?"), wxEAPGetProviderName(cfg_provider.m_name).c_str()), _("Warning"), wxYES_NO, this) == wxYES) { // Delete provider. - eap::config_connection::provider_list::iterator it(m_cfg.m_providers.begin()); + auto it = m_cfg.m_providers.begin(); for (int i = 0; i < idx; i++, ++it); m_cfg.m_providers.erase(it); m_providers->DeletePage(idx); diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp index c88a458..717e3a7 100644 --- a/lib/EAPBase_UI/src/EAP_UI.cpp +++ b/lib/EAPBase_UI/src/EAP_UI.cpp @@ -528,7 +528,7 @@ void eap::monitor_ui::release_slaves(_In_bytecount_(size) const void *data, _In_ { assert(!size || data); - for (list::const_iterator slave = m_slaves.begin(), slave_end = m_slaves.end(); slave != slave_end; ++slave) { + for (auto slave = m_slaves.cbegin(), slave_end = m_slaves.cend(); slave != slave_end; ++slave) { // Get slave's PID. DWORD pid_slave; GetWindowThreadProcessId(*slave, &pid_slave); diff --git a/lib/MSCHAPv2/src/Method.cpp b/lib/MSCHAPv2/src/Method.cpp index 2e3d0ec..7bb229e 100644 --- a/lib/MSCHAPv2/src/Method.cpp +++ b/lib/MSCHAPv2/src/Method.cpp @@ -198,7 +198,7 @@ void eap::method_mschapv2::process_success(_In_ const list &argv) { m_success = false; - for (list::const_iterator arg = argv.cbegin(), arg_end = argv.cend(); arg != arg_end; ++arg) { + for (auto arg = argv.cbegin(), arg_end = argv.cend(); arg != arg_end; ++arg) { const string &val = *arg; if ((val[0] == 'S' || val[0] == 's') && val[1] == '=') { // "S=" @@ -227,7 +227,7 @@ void eap::method_mschapv2::process_success(_In_ const list &argv) void eap::method_mschapv2::process_error(_In_ const list &argv) { - for (list::const_iterator arg = argv.cbegin(), arg_end = argv.cend(); arg != arg_end; ++arg) { + for (auto arg = argv.cbegin(), arg_end = argv.cend(); arg != arg_end; ++arg) { const string &val = *arg; if ((val[0] == 'E' || val[0] == 'e') && val[1] == '=') { DWORD dwResult = strtoul(val.data() + 2, NULL, 10); diff --git a/lib/TLS/src/Config.cpp b/lib/TLS/src/Config.cpp index d4007fe..a57812d 100644 --- a/lib/TLS/src/Config.cpp +++ b/lib/TLS/src/Config.cpp @@ -148,7 +148,7 @@ void eap::config_method_tls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode * if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:ServerSideCredential"), bstr(L"ServerSideCredential"), namespace_eapmetadata, pXmlElServerSideCredential))) throw com_runtime_error(hr, __FUNCTION__ " Error creating element."); - for (list::const_iterator i = m_trusted_root_ca.begin(), i_end = m_trusted_root_ca.end(); i != i_end; ++i) { + for (auto i = m_trusted_root_ca.cbegin(), i_end = m_trusted_root_ca.cend(); i != i_end; ++i) { // com_obj pXmlElCA; if (FAILED(hr = eapxml::create_element(pDoc, bstr(L"CA"), namespace_eapmetadata, pXmlElCA))) @@ -168,7 +168,7 @@ void eap::config_method_tls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode * } // - for (list::const_iterator i = m_server_names.begin(), i_end = m_server_names.end(); i != i_end; ++i) { + for (auto i = m_server_names.cbegin(), i_end = m_server_names.cend(); i != i_end; ++i) { if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElServerSideCredential, bstr(L"ServerName"), namespace_eapmetadata, bstr(*i)))) throw com_runtime_error(hr, __FUNCTION__ " Error creating element."); } @@ -221,7 +221,7 @@ void eap::config_method_tls::load(_In_ IXMLDOMNode *pConfigRoot) // Log loaded CA certificates. list cert_names; - for (std::list::const_iterator cert = m_trusted_root_ca.cbegin(), cert_end = m_trusted_root_ca.cend(); cert != cert_end; ++cert) + for (auto cert = m_trusted_root_ca.cbegin(), cert_end = m_trusted_root_ca.cend(); cert != cert_end; ++cert) cert_names.push_back(std::move(get_cert_title(*cert))); m_module.log_config((xpathServerSideCredential + L"/CA").c_str(), cert_names); } @@ -311,7 +311,7 @@ bool eap::config_method_tls::add_trusted_ca(_In_ DWORD dwCertEncodingType, _In_ return false; } - for (list::const_iterator i = m_trusted_root_ca.cbegin(), i_end = m_trusted_root_ca.cend();; ++i) { + for (auto i = m_trusted_root_ca.cbegin(), i_end = m_trusted_root_ca.cend();; ++i) { if (i != i_end) { if (*i == cert) { // This certificate is already on the list. diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index 5dcd2e1..a2feb1c 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -199,7 +199,7 @@ void eap::method_tls::begin_session( #else // Build (expected) server name(s) for Schannel. m_sc_target_name.clear(); - for (list::const_iterator name = m_cfg.m_server_names.cbegin(), name_end = m_cfg.m_server_names.cend(); name != name_end; ++name) { + for (auto name = m_cfg.m_server_names.cbegin(), name_end = m_cfg.m_server_names.cend(); name != name_end; ++name) { if (name != m_cfg.m_server_names.cbegin()) m_sc_target_name += _T(';'); #ifdef _UNICODE @@ -1294,7 +1294,7 @@ void eap::method_tls::verify_server_trust() const throw sec_runtime_error(status, __FUNCTION__ " Error retrieving server certificate from Schannel."); #endif - for (list::const_iterator c = m_cfg.m_trusted_root_ca.cbegin(), c_end = m_cfg.m_trusted_root_ca.cend(); c != c_end; ++c) { + for (auto c = m_cfg.m_trusted_root_ca.cbegin(), c_end = m_cfg.m_trusted_root_ca.cend(); c != c_end; ++c) { if (cert->cbCertEncoded == (*c)->cbCertEncoded && memcmp(cert->pbCertEncoded, (*c)->pbCertEncoded, cert->cbCertEncoded) == 0) { @@ -1343,7 +1343,7 @@ void eap::method_tls::verify_server_trust() const } has_san = true; - for (list::const_iterator s = m_cfg.m_server_names.cbegin(), s_end = m_cfg.m_server_names.cend(); !found && s != s_end; ++s) { + for (auto s = m_cfg.m_server_names.cbegin(), s_end = m_cfg.m_server_names.cend(); !found && s != s_end; ++s) { for (DWORD idx_entry = 0; !found && idx_entry < san_info->cAltEntry; idx_entry++) { if (san_info->rgAltEntry[idx_entry].dwAltNameChoice == CERT_ALT_NAME_DNS_NAME && _wcsicmp(s->c_str(), san_info->rgAltEntry[idx_entry].pwszDNSName) == 0) @@ -1361,7 +1361,7 @@ void eap::method_tls::verify_server_trust() const if (!CertGetNameStringW(cert, CERT_NAME_DNS_TYPE, CERT_NAME_STR_ENABLE_PUNYCODE_FLAG, NULL, subj)) throw win_runtime_error(__FUNCTION__ " Error retrieving server's certificate subject name."); - for (list::const_iterator s = m_cfg.m_server_names.cbegin(), s_end = m_cfg.m_server_names.cend(); !found && s != s_end; ++s) { + for (auto s = m_cfg.m_server_names.cbegin(), s_end = m_cfg.m_server_names.cend(); !found && s != s_end; ++s) { if (_wcsicmp(s->c_str(), subj.c_str()) == 0) { m_module.log_event(&EAPMETHOD_TLS_SERVER_NAME_TRUSTED1, event_data(subj), event_data::blank); found = true; @@ -1381,12 +1381,12 @@ void eap::method_tls::verify_server_trust() const cert_store store; if (!store.create(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, NULL, 0, NULL)) throw win_runtime_error(__FUNCTION__ " Error creating temporary certificate store."); - for (list::const_iterator c = m_cfg.m_trusted_root_ca.cbegin(), c_end = m_cfg.m_trusted_root_ca.cend(); c != c_end; ++c) + for (auto c = m_cfg.m_trusted_root_ca.cbegin(), c_end = m_cfg.m_trusted_root_ca.cend(); c != c_end; ++c) CertAddCertificateContextToStore(store, *c, CERT_STORE_ADD_REPLACE_EXISTING, NULL); // Add all intermediate certificates from the server's certificate chain. #if EAP_TLS < EAP_TLS_SCHANNEL - for (list::const_iterator c = m_server_cert_chain.cbegin(), c_end = m_server_cert_chain.cend(); ++c != c_end;) { + for (auto c = m_server_cert_chain.cbegin(), c_end = m_server_cert_chain.cend(); ++c != c_end;) { const cert_context &_c = *c; if (_c->pCertInfo->Issuer.cbData == _c->pCertInfo->Subject.cbData && memcmp(_c->pCertInfo->Issuer.pbData, _c->pCertInfo->Subject.pbData, _c->pCertInfo->Issuer.cbData) == 0) @@ -1453,7 +1453,7 @@ void eap::method_tls::verify_server_trust() const throw sec_runtime_error(SEC_E_CERT_UNKNOWN, __FUNCTION__ " Can not verify empty certificate chain."); PCCERT_CONTEXT cert_root = context->rgpChain[0]->rgpElement[context->rgpChain[0]->cElement-1]->pCertContext; - for (list::const_iterator c = m_cfg.m_trusted_root_ca.cbegin(), c_end = m_cfg.m_trusted_root_ca.cend();; ++c) { + for (auto c = m_cfg.m_trusted_root_ca.cbegin(), c_end = m_cfg.m_trusted_root_ca.cend();; ++c) { if (c != c_end) { if (cert_root->cbCertEncoded == (*c)->cbCertEncoded && memcmp(cert_root->pbCertEncoded, (*c)->pbCertEncoded, cert_root->cbCertEncoded) == 0) diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index a9e1bd0..24b6395 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -246,7 +246,7 @@ bool wxFQDNListValidator::TransferToWindow() if (m_val) { wxString str; - for (std::list::const_iterator name = m_val->cbegin(), name_end = m_val->cend(); name != name_end; ++name) { + for (auto name = m_val->cbegin(), name_end = m_val->cend(); name != name_end; ++name) { if (!str.IsEmpty()) str += wxT("; "); str += *name; } @@ -421,7 +421,7 @@ wxTLSServerTrustPanel::wxTLSServerTrustPanel(const eap::config_provider &prov, e bool wxTLSServerTrustPanel::TransferDataToWindow() { // Populate trusted CA list. - for (std::list::const_iterator cert = m_cfg.m_trusted_root_ca.cbegin(), cert_end = m_cfg.m_trusted_root_ca.cend(); cert != cert_end; ++cert) + for (auto cert = m_cfg.m_trusted_root_ca.cbegin(), cert_end = m_cfg.m_trusted_root_ca.cend(); cert != cert_end; ++cert) m_root_ca->Append(wxString(eap::get_cert_title(*cert)), new wxCertificateClientData(cert->duplicate())); // Set server acceptable names. The edit control will get populated by validator. diff --git a/lib/TTLS/src/Config.cpp b/lib/TTLS/src/Config.cpp index 6df8fe5..6ff015a 100644 --- a/lib/TTLS/src/Config.cpp +++ b/lib/TTLS/src/Config.cpp @@ -292,7 +292,7 @@ wstring eap::config_method_ttls::get_public_identity(const credentials_ttls &cre } else if (m_anonymous_identity.compare(L"@") == 0) { // Strip username part from identity (RFC 4822). wstring identity(std::move(cred.get_identity())); - wstring::size_type offset = identity.find(L'@'); + auto offset = identity.find(L'@'); if (offset != wstring::npos) identity.erase(0, offset); return identity; } else { diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index 5ccbc28..5eb4690 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -204,7 +204,7 @@ EAP_SESSION_HANDLE eap::peer_ttls::begin_session( config_method_ttls *cfg_method; - for (config_connection::provider_list::iterator cfg_prov = s->m_cfg.m_providers.begin(), cfg_prov_end = s->m_cfg.m_providers.end();; ++cfg_prov) { + for (auto cfg_prov = s->m_cfg.m_providers.begin(), cfg_prov_end = s->m_cfg.m_providers.end();; ++cfg_prov) { if (cfg_prov != cfg_prov_end) { if (s->m_cred.match(*cfg_prov)) { // Matching provider found. @@ -366,7 +366,7 @@ const eap::config_method_ttls* eap::peer_ttls::combine_credentials( user_impersonator impersonating(hTokenImpersonateUser); - for (config_connection::provider_list::const_iterator cfg_prov = cfg.m_providers.cbegin(), cfg_prov_end = cfg.m_providers.cend(); cfg_prov != cfg_prov_end; ++cfg_prov) { + for (auto cfg_prov = cfg.m_providers.cbegin(), cfg_prov_end = cfg.m_providers.cend(); cfg_prov != cfg_prov_end; ++cfg_prov) { wstring target_name(std::move(cfg_prov->get_id())); // Get method configuration. diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp index b481867..e2db628 100644 --- a/lib/TTLS_UI/src/Module.cpp +++ b/lib/TTLS_UI/src/Module.cpp @@ -184,7 +184,7 @@ void eap::peer_ttls_ui::invoke_identity_ui( // Create credentials dialog and populate it with providers. bool combined = false; wxEAPCredentialsConnectionDialog dlg(&parent); - for (config_connection::provider_list::iterator cfg_prov = cfg.m_providers.begin(), cfg_prov_end = cfg.m_providers.end(); cfg_prov != cfg_prov_end; ++cfg_prov) { + for (auto cfg_prov = cfg.m_providers.begin(), cfg_prov_end = cfg.m_providers.end(); cfg_prov != cfg_prov_end; ++cfg_prov) { wstring target_name(std::move(cfg_prov->get_id())); // Get method configuration. diff --git a/lib/WinStd b/lib/WinStd index 3b4448d..7b0b38a 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 3b4448dcf4f2cfd54dc40be1ef262835ac532550 +Subproject commit 7b0b38aab38c777d2b058baaab62fe55cba09b64 diff --git a/lib/wxExtend b/lib/wxExtend index 2e3e188..d7ac16d 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit 2e3e188026b7e6845e9e2b5552faf7589d25cbfc +Subproject commit d7ac16dd8dea0bc0d1e9618093f57e57538c1503 From 6671c810f49580250818e6d4757408b5d7cbc587 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 4 Oct 2016 09:04:09 +0200 Subject: [PATCH 21/54] Documentation update --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 48d6c0a..4d798b7 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Suite of EAP supplicants for Windows - IEEE 802.1X plug-ins for enterprise netwo - _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's _Bin_ folder to path. ### wxWidgets -GÉANTLink is using wxWidgets v3.0.2 static libraries. Unfortunately, dynamic libraries (DLL) variant is available as a binary download only. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets). +GÉANTLink is using wxWidgets v3.0.2 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets). #### Compiling wxWidgets Win32 static libraries 1. Start _Visual Studio Command Prompt (2010)_ @@ -52,13 +52,17 @@ Next, one must configure a network profile actually using GÉANTLink for the aut GÉANTLink EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLSUI.dll_). ##### Backend DLL -The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _VS10Solution.sln_, and attach to running _Eap3Host.exe_ process. -On initial connection attempt _Eap3Host.exe_ will load the DLL and will not release it until _EapHost_ service is restarted. -To debug early life of our backend DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to attach the debugger to _Eap3Host.exe_ process before our DLL starts servicing authentication. +The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _VS10Solution.sln_, and attach to the running _Eap3Host.exe_ process. + +On initial connection attempt _Eap3Host.exe_ will load the DLL and will not release it until _EapHost_ service is restarted. To release our DLL (i.e. for rebuild) you have to restart _EapHost_ service manually or run `nmake register` again. + +To debug early life of our backend DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to catch emerging _Eap3Host.exe_ process and attach the debugger to it before our DLL starts servicing authentication. ##### GUI DLL The GUI DLL is loaded by _DllHost.exe_ process on XML profile configuration import/export and when interactive user interface is required. + A few seconds after desired function call has finished, _DllHost.exe_ terminates and releases the DLL. + To debug early life of our GUI DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to attach the debugger to _DllHost.exe_ process before our DLL starts. #### Building in command line From 1d06d782948075f35757eb8cd3da04c7365d1481 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 4 Oct 2016 09:16:14 +0200 Subject: [PATCH 22/54] Some more C casting replaced with C++ dynamic casting --- lib/TTLS/src/Credentials.cpp | 4 ++-- lib/TTLS/src/Module.cpp | 8 ++++---- lib/TTLS_UI/src/Module.cpp | 6 +++--- lib/TTLS_UI/src/TTLS_UI.cpp | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/TTLS/src/Credentials.cpp b/lib/TTLS/src/Credentials.cpp index 7989993..88dc60c 100644 --- a/lib/TTLS/src/Credentials.cpp +++ b/lib/TTLS/src/Credentials.cpp @@ -191,8 +191,8 @@ eap::credentials::source_t eap::credentials_ttls::combine( // Combine inner credentials. source_t src_inner = m_inner->combine( - cred_cached ? ((const credentials_ttls*)cred_cached)->m_inner.get() : NULL, - *((const config_method_ttls&)cfg).m_inner, + cred_cached ? dynamic_cast(cred_cached)->m_inner.get() : NULL, + *dynamic_cast(cfg).m_inner, pszTargetName); return std::min(src_outer, src_inner); diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index 5eb4690..8abff68 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -98,7 +98,7 @@ void eap::peer_ttls::get_identity( } // Build our identity. ;) - wstring identity(std::move(cfg_method->get_public_identity((const credentials_ttls&)*cred_out.m_cred))); + wstring identity(std::move(cfg_method->get_public_identity(*dynamic_cast(cred_out.m_cred.get())))); log_event(&EAPMETHOD_TRACE_EVT_CRED_OUTER_ID1, event_data((unsigned int)eap_type_ttls), event_data(identity), event_data::blank); size_t size = sizeof(WCHAR)*(identity.length() + 1); *ppwszIdentity = (WCHAR*)alloc_memory(size); @@ -218,7 +218,7 @@ EAP_SESSION_HANDLE eap::peer_ttls::begin_session( } // We have configuration, we have credentials, create method. - s->m_method.reset(new method_ttls(*this, *cfg_method, *(credentials_ttls*)s->m_cred.m_cred.get())); + s->m_method.reset(new method_ttls(*this, *cfg_method, *dynamic_cast(s->m_cred.m_cred.get()))); // Initialize method. s->m_method->begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize); @@ -378,7 +378,7 @@ const eap::config_method_ttls* eap::peer_ttls::combine_credentials( assert(cfg_method); // Combine credentials. We could use eap::credentials_ttls() to do all the work, but we would not know which credentials is missing then. - credentials_ttls *cred = (credentials_ttls*)cfg_method->make_credentials(); + credentials_ttls *cred = dynamic_cast(cfg_method->make_credentials()); cred_out.m_cred.reset(cred); #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE bool has_cached = cred_in.m_cred && cred_in.match(*cfg_prov); @@ -402,7 +402,7 @@ const eap::config_method_ttls* eap::peer_ttls::combine_credentials( // Combine inner credentials. eap::credentials::source_t src_inner = cred->m_inner->combine( #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE - has_cached ? ((credentials_ttls*)cred_in.m_cred.get())->m_inner.get() : NULL, + has_cached ? dynamic_cast(cred_in.m_cred.get())->m_inner.get() : NULL, #else NULL, #endif diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp index e2db628..98b6abd 100644 --- a/lib/TTLS_UI/src/Module.cpp +++ b/lib/TTLS_UI/src/Module.cpp @@ -199,7 +199,7 @@ void eap::peer_ttls_ui::invoke_identity_ui( credentials_connection cred_method(*this, cfg); cred_method.m_namespace = cfg_prov->m_namespace; cred_method.m_id = cfg_prov->m_id; - credentials_ttls *_cred_method = (credentials_ttls*)cfg_method->make_credentials(); + credentials_ttls *_cred_method = dynamic_cast(cfg_method->make_credentials()); cred_method.m_cred.reset(_cred_method); #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE bool has_cached = cred_in.m_cred && cred_in.match(*cfg_prov); @@ -224,7 +224,7 @@ void eap::peer_ttls_ui::invoke_identity_ui( // Combine inner credentials. eap::credentials::source_t src_inner = _cred_method->m_inner->combine( #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE - has_cached ? ((credentials_ttls*)cred_in.m_cred.get())->m_inner.get() : NULL, + has_cached ? dynamic_cast(cred_in.m_cred.get())->m_inner.get() : NULL, #else NULL, #endif @@ -299,7 +299,7 @@ void eap::peer_ttls_ui::invoke_identity_ui( throw win_runtime_error(ERROR_CANCELLED, __FUNCTION__ " Cancelled."); // Build our identity. ;) - wstring identity(std::move(cfg_method->get_public_identity((const credentials_ttls&)*cred_out.m_cred))); + wstring identity(std::move(cfg_method->get_public_identity(*dynamic_cast(cred_out.m_cred.get())))); log_event(&EAPMETHOD_TRACE_EVT_CRED_OUTER_ID1, event_data((unsigned int)eap_type_ttls), event_data(identity), event_data::blank); size_t size = sizeof(WCHAR)*(identity.length() + 1); *ppwszIdentity = (WCHAR*)alloc_memory(size); diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index 42d9230..ba5cffc 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -231,14 +231,14 @@ wxTTLSConfigWindow::~wxTTLSConfigWindow() bool wxTTLSConfigWindow::TransferDataToWindow() { - switch (((eap::config_method_ttls&)m_cfg).m_inner->get_method_id()) { + switch (dynamic_cast(m_cfg).m_inner->get_method_id()) { case winstd::eap_type_legacy_pap: - m_cfg_pap = *(eap::config_method_pap*)((eap::config_method_ttls&)m_cfg).m_inner.get(); + m_cfg_pap = *(eap::config_method_pap*)dynamic_cast(m_cfg).m_inner.get(); m_inner_type->SetSelection(0); // 0=PAP break; case winstd::eap_type_legacy_mschapv2: - m_cfg_mschapv2 = *(eap::config_method_mschapv2*)((eap::config_method_ttls&)m_cfg).m_inner.get(); + m_cfg_mschapv2 = *(eap::config_method_mschapv2*)dynamic_cast(m_cfg).m_inner.get(); m_inner_type->SetSelection(1); // 1=MSCHAPv2 break; @@ -260,11 +260,11 @@ bool wxTTLSConfigWindow::TransferDataFromWindow() // This is not a provider-locked configuration. Save the data. switch (m_inner_type->GetSelection()) { case 0: // 0=PAP - ((eap::config_method_ttls&)m_cfg).m_inner.reset(new eap::config_method_pap(m_cfg_pap)); + dynamic_cast(m_cfg).m_inner.reset(new eap::config_method_pap(m_cfg_pap)); break; case 1: // 1=MSCHAPv2 - ((eap::config_method_ttls&)m_cfg).m_inner.reset(new eap::config_method_mschapv2(m_cfg_mschapv2)); + dynamic_cast(m_cfg).m_inner.reset(new eap::config_method_mschapv2(m_cfg_mschapv2)); break; default: From 822cf929158a6f78d71432c22b580d48d681d73f Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 4 Oct 2016 10:20:01 +0200 Subject: [PATCH 23/54] Some more C casting replaced with C++ dynamic casting --- lib/TTLS/src/Method.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/TTLS/src/Method.cpp b/lib/TTLS/src/Method.cpp index 8a8b968..c56acb9 100644 --- a/lib/TTLS/src/Method.cpp +++ b/lib/TTLS/src/Method.cpp @@ -64,9 +64,11 @@ void eap::method_ttls::begin_session( method_tls::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize); // Initialize inner method. - switch (dynamic_cast(m_cfg).m_inner->get_method_id()) { - case eap_type_legacy_pap : m_inner.reset(new method_pap (m_module, (config_method_pap &)*dynamic_cast(m_cfg).m_inner, (credentials_pass&)*dynamic_cast(m_cred).m_inner.get())); break; - case eap_type_legacy_mschapv2: m_inner.reset(new method_mschapv2(m_module, (config_method_mschapv2&)*dynamic_cast(m_cfg).m_inner, (credentials_pass&)*dynamic_cast(m_cred).m_inner.get())); break; + auto * cfg_inner = dynamic_cast(m_cfg ).m_inner.get(); + auto *cred_inner = dynamic_cast(m_cred).m_inner.get(); + switch (cfg_inner->get_method_id()) { + case eap_type_legacy_pap : m_inner.reset(new method_pap (m_module, dynamic_cast(*cfg_inner), dynamic_cast(*cred_inner))); break; + case eap_type_legacy_mschapv2: m_inner.reset(new method_mschapv2(m_module, dynamic_cast(*cfg_inner), dynamic_cast(*cred_inner))); break; default: throw invalid_argument(__FUNCTION__ " Unsupported inner authentication method."); } m_inner->begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, MAXDWORD); From 896bff53cc452e53e0201dff19b7ba1dfc6d06b0 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 4 Oct 2016 12:33:43 +0200 Subject: [PATCH 24/54] Both XML selection namespaces (eap-metadata and eaphostconfig) are configured now --- EAPMethods/src/Main_UI.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/src/Main_UI.cpp index dd5407a..aba2414 100644 --- a/EAPMethods/src/Main_UI.cpp +++ b/EAPMethods/src/Main_UI.cpp @@ -130,8 +130,10 @@ DWORD WINAPI EapPeerConfigXml2Blob( else if (!pdwConnectionDataOutSize) g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwConnectionDataOutSize is NULL."))); else { + // Configure XML selection namespaces used. + pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\"")); + // - pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\"")); com_obj pXmlElConfig; if (FAILED(eapxml::select_element(pConfigDoc, bstr(L"//eaphostconfig:Config"), pXmlElConfig))) { g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" Error reading element."))); @@ -139,7 +141,6 @@ DWORD WINAPI EapPeerConfigXml2Blob( } // Load configuration. - pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\"")); try { g_peer.config_xml2blob(dwFlags, pXmlElConfig, pConnectionDataOut, pdwConnectionDataOutSize); } catch (std::exception &err) { @@ -212,9 +213,11 @@ DWORD WINAPI EapPeerConfigBlob2Xml( return dwResult; } + // Configure XML selection namespaces used. + pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\"")); + // Select node. com_obj pXmlElConfig; - pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\"")); if (FAILED(eapxml::select_node(pConfigDoc, bstr(L"eaphostconfig:Config"), pXmlElConfig))) { g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_FOUND, _T(__FUNCTION__) _T(" Error selecting element."))); return dwResult; From 01a83faca651eb72c3da3ff1770fce8078d8b932 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 5 Oct 2016 12:11:17 +0200 Subject: [PATCH 25/54] wxInitializeLocale moved to wxExtend --- lib/EAPBase_UI/include/EAP_UI.h | 28 ---------------------------- lib/TTLS_UI/build/TTLS_UI.props | 2 +- lib/TTLS_UI/src/StdAfx.h | 2 ++ lib/wxExtend | 2 +- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index 2831a3b..eeb0c04 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -122,11 +122,6 @@ inline wxString wxEAPGetProviderName(const std::wstring &id); /// inline void wxInitializeConfig(); -/// -/// Inizializes wxWidgets localization scheme -/// -inline bool wxInitializeLocale(wxLocale &locale); - namespace eap { @@ -994,29 +989,6 @@ inline void wxInitializeConfig() } -inline bool wxInitializeLocale(wxLocale &locale) -{ - // Read language from configuration. - wxLanguage lang_code; - wxString lang; - if (wxConfigBase::Get()->Read(wxT("Language"), &lang)) { - const wxLanguageInfo *lang_info = wxLocale::FindLanguageInfo(lang); - lang_code = lang_info ? (wxLanguage)lang_info->Language : wxLANGUAGE_DEFAULT; - } else - lang_code = wxLANGUAGE_DEFAULT; - - if (wxLocale::IsAvailable(lang_code)) { - // Language is "available". Well... Known actually. - wxString sPath; - if (wxConfigBase::Get()->Read(wxT("LocalizationRepositoryPath"), &sPath)) - locale.AddCatalogLookupPathPrefix(sPath); - return locale.Init(lang_code); - } - - return false; -} - - namespace eap { class monitor_ui diff --git a/lib/TTLS_UI/build/TTLS_UI.props b/lib/TTLS_UI/build/TTLS_UI.props index 4997b71..fe94d27 100644 --- a/lib/TTLS_UI/build/TTLS_UI.props +++ b/lib/TTLS_UI/build/TTLS_UI.props @@ -5,7 +5,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\wxExtend\include;%(AdditionalIncludeDirectories) diff --git a/lib/TTLS_UI/src/StdAfx.h b/lib/TTLS_UI/src/StdAfx.h index bb9941f..27f80e8 100644 --- a/lib/TTLS_UI/src/StdAfx.h +++ b/lib/TTLS_UI/src/StdAfx.h @@ -28,5 +28,7 @@ #include "../../PAP_UI/include/PAP_UI.h" #include "../../MSCHAPv2_UI/include/MSCHAPv2_UI.h" +#include + #include #include diff --git a/lib/wxExtend b/lib/wxExtend index d7ac16d..887a2c8 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit d7ac16dd8dea0bc0d1e9618093f57e57538c1503 +Subproject commit 887a2c8116b1bd639cf1583cc88a05778f7626bb From f89f3eb4b9f4b53b9310e5fb73e4da3237015f19 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 7 Oct 2016 15:28:47 +0200 Subject: [PATCH 26/54] Host name and FQDN validators moved to wxExtend; Incorrect FeatureComponent mappings of EventMonitor localization components fixed # Conflicts: # lib/wxExtend --- EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj | 3 + EAPMethods/MSIBuild/Makefile | Bin 36830 -> 38860 bytes EventMonitor/App.cpp | 2 +- EventMonitor/MSIBuild/Makefile | Bin 32574 -> 35424 bytes Makefile | Bin 187040 -> 194466 bytes include/MSIBuildCfg.mak | Bin 12596 -> 13158 bytes lib/TLS_UI/build/TLS_UI.props | 2 +- lib/TLS_UI/include/TLS_UI.h | 160 +------------- lib/TLS_UI/src/StdAfx.h | 2 + lib/TLS_UI/src/TLS_UI.cpp | 276 +------------------------ lib/TTLS_UI/src/Module.cpp | 2 +- lib/wxExtend | 2 +- output/locale/.gitignore | 2 +- 13 files changed, 20 insertions(+), 431 deletions(-) diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index b696b13..071aa83 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -130,6 +130,9 @@ {47399d91-7eb9-41de-b521-514ba5db0c43} + + {d3e29951-d9f5-486d-a167-20ae8e90b1fa} + diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile index debc36efa3ead9baa04525c5a273d9d107a6b5ba..78c823b1bc7bb30ae4292980f053bd13e0776ab9 100644 GIT binary patch delta 849 zcmZY7%}T>S5C`y7Jj4q1gMd;BwNOMPvGQXM4lKs3JdV3t|T-WekQz#@H)n&?)C}{uH>rbNDjJSPHJ}e*YxWP5~`P!M!U%c4f*`_av-&GUb7( z`UP}-g@Wb@)T@4e(DdK-EGX_cl&l& zk#%{|b6HXJc#-f~QSo^(5wK!6;Kg@LWJ6x`LUu;6v5&*q6#eHJjMr6)4BbZ+C&wa& zwLCqiq0A?7L+f8nrO4n_7SY!8kwM(d(DhVdpNjY~Ht2e;M@y;5Dq&%Xnk;IvTIkyS z!D+gvDsIn{cyP*?cdPhqig$a(|UR+4D@`6y7MfaV7(zAi-^=+qU`dMkx) OSi-oPe7{%Q_(y?kuDBt+VtNRshCBPDm73MhYZ293g!Vs z3%)=fAVVLZIQam50`cp2KeOF)&$;KGd-KoI_giWC>|=FiAa(@O@gcJA9umK{>%CkP zwjCS!KQyrM9i?vE5bnD+L{ll%^m4+}^`cjS=vhcKUOI%+p0v|=drSCf4waubGjI@0 zbxkn)Hj;q7z1cppV4}G6j_}^MR2{hnyd#0%3sa>QE!IbF1+{^xG?`174{X#mSDh1v zE#A4ixIE>|x#r^sLSrcJYO~immbu!TYaJ6dl1nt#^$b)`1dcCxe_r$}n2s!nkUdh5 x@G+7ZG>#TBL&zDTg@M|{sRP{wxs|7 diff --git a/EventMonitor/App.cpp b/EventMonitor/App.cpp index 6fef987..53168fd 100644 --- a/EventMonitor/App.cpp +++ b/EventMonitor/App.cpp @@ -52,7 +52,7 @@ bool wxEventMonitorApp::OnInit() return false; if (wxInitializeLocale(m_locale)) { - //wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion))); + wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion))); wxVERIFY(m_locale.AddCatalog(wxT("EventMonitor"))); } diff --git a/EventMonitor/MSIBuild/Makefile b/EventMonitor/MSIBuild/Makefile index e09911472ca0f94ff68436ba0fa9df0fa21440d5..0a2e78bd003200ca9b50d7c043f04921267e10cc 100644 GIT binary patch delta 1455 zcmZuxKWq|V6h92Z<$`C!AzVspKxiezA`ns$O@o7k0v1|OlbXho77eBqnrJi*N(Yn1 z!Jt3KrqZ}I4Qb+H9JH=3;@Sb39gOa#@xJ@+xR&n*;Jx4D{oZ@u`}6tG(tCSiFP26) z<-u;&j-9mJmxW;w{t&AdT%rC?BfJ0kCd45~y`z@J%zD;O5=Y|hX(q9TThddhY*ix6mh@&Ywx6Rey)gqBjAhjf+{g0bmbnnO%GH$b3ik-> z+0!PuU(KnW1AN~p%49I>H?OF?Bx$W?Tz-s6*ra2?*e(QI`baRgO5W_L-{;NJjTFq# zFBD~%w?pPdM5>ZLWQ>nDEa?Ns*q%pS`tS`rn-KHqR{&iKt*;I(Z|HjR$ zu+$`doEe|Bgrtpj5Ixz6)@=a|msJ_kn4-&QyLfD5$zTRipAM$yO8DgO7QdIw>uAPuc48R%8k^6u}lJ$VG{vIZHz| zCKUfFuQi==Penv@<_w>LdP%6QtI5d~4+13`t8-CCcZElN(uz+d>PN7xNnUAN9Q!wn Xvci}2OGEiyUEYUdE%)K@R`T3`9XYpq delta 1110 zcmZvcy-Pw-7{)Cm>LiC;OrncLQ4n3TsO&?cHuK|p{RXL!hK6vkpn`~SmbipZqx1(v zgU}Wsx->aBG)DLbgwPrxd6)3KC+>KD&+|U#o z7z(3S97ovj--#uTlU)Um5htN*PLA@fOji7qWMdpvKO_3>F@}`RrAcL->hH%n9&|d% zg|_YxJQv{3IEdehKzLzf=tLKcDE0Y}d=$J#X|97DLvzv!Pk?4qkPA?HWQybRAMz?D zlLN?3526^8d`m$J-%c~IAQ!HwqCLYg7nkJ7#fiR@XE=}d%IkSAw0*iI1-3-5w4PtU z{l2*EdQjZ93im0)#Jm-sK{?8!;Ai$Pt8zRiWb#KMAKV;;kW9XWdNZ1yEjPn!NWM)u zNy)9nZp)Igryizc^Nb-AmOXtbN>-N`cvd9sTDNg2v2iN)vQDA7c8%_`bHR{bwZf;- wmsIg`Y^25H=9KF+o$|fLQ6!}Kx*KVl+_TQm(8S~>X_Ni~#%As5?eJ#y7yf!JApigX diff --git a/Makefile b/Makefile index 56d67aa1e225d0aeb0a343dd0e4c6e7e1e188816..1c627994f4d4ac424e048de7126ae8330b60245b 100644 GIT binary patch delta 3491 zcmbuB&ubG=5Xay15TQkybX!{tN;ddF4Vcx7zYq+icoOZsSfb`2l$xNZ;9*;|gi>PN zjPmeDNH+cfCRp+69#mA2t`huFS}o$i(vrenH}jnzrDvVx zdS~TBzHgLWWarp0yT-1wLG`=BQf!P}fW&khJxgBIAmVlBvmNLa#}hFA06(|p1$ejc zbMrC&d3`}Z`XO#>P2#rIMd9amCWo3z{W$N1(xV;Nn_Cw=`~rk-gyHP%9t;50KLSbx z^kH)7g!15f0rddvEb2ZuYbql%C>-n=+_o_%z$oIj?z&?8oI9o_(;DxF;1mvV%&@HN z;~fwwp_ioI%T@C63s9ZHpOL8vs8}c*Tnn|mS5@Dw*gm$aB40+2<+d%#{?2_BfxG=M zUf%UI2uFueAta`SJQL=DLr8V1dL3n#*m;&z|EYHMrv9s5>&qz=-m2byGJE7J&UU;Q zl`Hj~90yzTWH2nfI*A2Co(^z2xbPYUgT6rK%HmdzgRMyck(Xp?$ausDUR@-64elE} zeFxsgju5rXMqnbR!N#}4XcC*9SsGEkovgiyD6YL$UpJP>bg+Npk!j5Y)$}%z($H?) zdo@((Db;_Vj<<$U@I5&y(iT2Kw6j7QUGxqp%`P9hvqq1J`4f$anxO*r{|eBhF0BEs zLHgZ6OzY5?BfBo2?D2_-yG{pZ_WFR^!=F5Gq^tSJyS+68sihCOk7z!d+Xgu(kXS~+ zYD*FDVuReoAymWJncAj$ZB3J7eH?AJkXVTwBe!yP8A6{2FmbCTiyrQwPx#DqSIJyi kjN{sFu61;B(%^$o@uF%U?D@CuL8)QfoUK2ft@D-TzYs8v!VXwhRHcwhRL7 E>Jb$b)Bpeg diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index df305cd605b15e6677fcc374dc28ac2d5f56b0cd..0d3139c268ce1dde0a7f1035f5f0b52175ae4ac6 100644 GIT binary patch delta 237 zcmdmz^ek<|J$>;UhD?Seh8Tu&h6)B(ATD7@WyoVlnfy^db@K!L5XQ+O(sQ!WBpDPK zd>Qf?QW#1Za)8Qt8MweWoFM{eL - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\wxExtend\include;%(AdditionalIncludeDirectories) diff --git a/lib/TLS_UI/include/TLS_UI.h b/lib/TLS_UI/include/TLS_UI.h index 4867708..e1a2460 100644 --- a/lib/TLS_UI/include/TLS_UI.h +++ b/lib/TLS_UI/include/TLS_UI.h @@ -24,6 +24,7 @@ #include +#include #include #include @@ -40,21 +41,6 @@ /// class wxCertificateClientData; -/// -/// Validator for host name -/// -class wxHostNameValidator; - -/// -/// Validator for FQDN -/// -class wxFQDNValidator; - -/// -/// Validator for FQDN lists -/// -class wxFQDNListValidator; - /// /// TLS credential panel /// @@ -110,144 +96,6 @@ public: }; -class wxHostNameValidator : public wxValidator -{ - wxDECLARE_DYNAMIC_CLASS(wxHostNameValidator); - wxDECLARE_NO_ASSIGN_CLASS(wxHostNameValidator); - -public: - /// - /// Construct the validator with a value to store data - /// - wxHostNameValidator(std::wstring *val = NULL); - - /// - /// Copy constructor - /// - wxHostNameValidator(const wxHostNameValidator &other); - - /// - /// Copies this validator - /// - virtual wxObject* Clone() const; - - /// - /// Validates the value - /// - virtual bool Validate(wxWindow *parent); - - /// - /// Transfers the value to the window - /// - virtual bool TransferToWindow(); - - /// - /// Transfers the value from the window - /// - virtual bool TransferFromWindow(); - - /// - /// Parses FQDN value - /// - static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::wstring *val_out = NULL); - -protected: - std::wstring *m_val; ///< Pointer to variable to receive control's parsed value -}; - - -class wxFQDNValidator : public wxValidator -{ - wxDECLARE_DYNAMIC_CLASS(wxFQDNValidator); - wxDECLARE_NO_ASSIGN_CLASS(wxFQDNValidator); - -public: - /// - /// Construct the validator with a value to store data - /// - wxFQDNValidator(std::wstring *val = NULL); - - /// - /// Copy constructor - /// - wxFQDNValidator(const wxFQDNValidator &other); - - /// - /// Copies this validator - /// - virtual wxObject* Clone() const; - - /// - /// Validates the value - /// - virtual bool Validate(wxWindow *parent); - - /// - /// Transfers the value to the window - /// - virtual bool TransferToWindow(); - - /// - /// Transfers the value from the window - /// - virtual bool TransferFromWindow(); - - /// - /// Parses FQDN value - /// - static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::wstring *val_out = NULL); - -protected: - std::wstring *m_val; ///< Pointer to variable to receive control's parsed value -}; - - -class wxFQDNListValidator : public wxValidator -{ - wxDECLARE_DYNAMIC_CLASS(wxFQDNListValidator); - wxDECLARE_NO_ASSIGN_CLASS(wxFQDNListValidator); - -public: - /// - /// Construct the validator with a value to store data - /// - wxFQDNListValidator(std::list *val = NULL); - - /// - /// Copy constructor - /// - wxFQDNListValidator(const wxFQDNListValidator &other); - - /// - /// Copies this validator - /// - virtual wxObject* Clone() const; - - /// - /// Validates the value - /// - virtual bool Validate(wxWindow *parent); - - /// - /// Transfers the value to the window - /// - virtual bool TransferToWindow(); - - /// - /// Transfers the value from the window - /// - virtual bool TransferFromWindow(); - - /// - /// Parses FQDN list value - /// - static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::list *val_out = NULL); - -protected: - std::list *m_val; ///< Pointer to variable to receive control's parsed value -}; - - class wxTLSCredentialsPanel : public wxEAPCredentialsPanel { public: @@ -302,9 +150,9 @@ protected: bool AddRootCA(PCCERT_CONTEXT cert); protected: - const eap::config_provider &m_prov; ///< EAP provider - eap::config_method_tls &m_cfg; ///< TLS configuration - std::list m_server_names_val; ///< Acceptable authenticating server names + const eap::config_provider &m_prov; ///< EAP provider + eap::config_method_tls &m_cfg; ///< TLS configuration + wxArrayString m_server_names_val; ///< Acceptable authenticating server names }; diff --git a/lib/TLS_UI/src/StdAfx.h b/lib/TLS_UI/src/StdAfx.h index 9ed5d92..65415c4 100644 --- a/lib/TLS_UI/src/StdAfx.h +++ b/lib/TLS_UI/src/StdAfx.h @@ -26,4 +26,6 @@ #include "../include/TLS_UI.h" +#include + #include diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index 24b6395..b1845c5 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -39,274 +39,6 @@ wxCertificateClientData::~wxCertificateClientData() } -////////////////////////////////////////////////////////////////////// -// wxHostNameValidator -////////////////////////////////////////////////////////////////////// - -wxIMPLEMENT_DYNAMIC_CLASS(wxHostNameValidator, wxValidator); - - -wxHostNameValidator::wxHostNameValidator(std::wstring *val) : - m_val(val), - wxValidator() -{ -} - - -wxHostNameValidator::wxHostNameValidator(const wxHostNameValidator &other) : - m_val(other.m_val), - wxValidator(other) -{ -} - - -wxObject* wxHostNameValidator::Clone() const -{ - return new wxHostNameValidator(*this); -} - - -bool wxHostNameValidator::Validate(wxWindow *parent) -{ - wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl))); - wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow(); - if (!ctrl->IsEnabled()) return true; - - wxString val(ctrl->GetValue()); - return Parse(val, 0, val.Length(), ctrl, parent); -} - - -bool wxHostNameValidator::TransferToWindow() -{ - wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl))); - - if (m_val) - ((wxTextCtrl*)GetWindow())->SetValue(*m_val); - - return true; -} - - -bool wxHostNameValidator::TransferFromWindow() -{ - wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl))); - wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow(); - - wxString val(ctrl->GetValue()); - return Parse(val, 0, val.Length(), ctrl, NULL, m_val); -} - - -bool wxHostNameValidator::Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::wstring *val_out) -{ - const wxStringCharType *buf = val_in; - - size_t i = i_start; - for (;;) { - if (i >= i_end) { - // End of host name found. - if (val_out) val_out->assign(val_in.c_str() + i_start, i - i_start); - return true; - } else if (buf[i] == _T('-') || buf[i] == _T('_') || buf[i] == _T('*') || _istalnum(buf[i])) { - // Valid character found. - i++; - } else { - // Invalid character found. - ctrl->SetFocus(); - ctrl->SetSelection(i, i + 1); - wxMessageBox(wxString::Format(_("Invalid character in host name found: %c"), buf[i]), _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent); - return false; - } - } -} - - -////////////////////////////////////////////////////////////////////// -// wxFQDNValidator -////////////////////////////////////////////////////////////////////// - -wxIMPLEMENT_DYNAMIC_CLASS(wxFQDNValidator, wxValidator); - - -wxFQDNValidator::wxFQDNValidator(std::wstring *val) : - m_val(val), - wxValidator() -{ -} - - -wxFQDNValidator::wxFQDNValidator(const wxFQDNValidator &other) : - m_val(other.m_val), - wxValidator(other) -{ -} - - -wxObject* wxFQDNValidator::Clone() const -{ - return new wxFQDNValidator(*this); -} - - -bool wxFQDNValidator::Validate(wxWindow *parent) -{ - wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl))); - wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow(); - if (!ctrl->IsEnabled()) return true; - - wxString val(ctrl->GetValue()); - return Parse(val, 0, val.Length(), ctrl, parent); -} - - -bool wxFQDNValidator::TransferToWindow() -{ - wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl))); - - if (m_val) - ((wxTextCtrl*)GetWindow())->SetValue(*m_val); - - return true; -} - - -bool wxFQDNValidator::TransferFromWindow() -{ - wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl))); - wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow(); - - wxString val(ctrl->GetValue()); - return Parse(val, 0, val.Length(), ctrl, NULL, m_val); -} - - -bool wxFQDNValidator::Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::wstring *val_out) -{ - const wxStringCharType *buf = val_in; - - size_t i = i_start; - for (;;) { - const wxStringCharType *buf_next; - if ((buf_next = wmemchr(buf + i, L'.', i_end - i)) != NULL) { - // FQDN separator found. - if (!wxHostNameValidator::Parse(val_in, i, buf_next - buf, ctrl, parent)) - return false; - i = buf_next - buf + 1; - } else if (wxHostNameValidator::Parse(val_in, i, i_end, ctrl, parent)) { - // The rest of the FQDN parsed succesfully. - if (val_out) val_out->assign(val_in.c_str() + i_start, i_end - i_start); - return true; - } else - return false; - } -} - - -////////////////////////////////////////////////////////////////////// -// wxFQDNListValidator -////////////////////////////////////////////////////////////////////// - -wxIMPLEMENT_DYNAMIC_CLASS(wxFQDNListValidator, wxValidator); - - -wxFQDNListValidator::wxFQDNListValidator(std::list *val) : - m_val(val), - wxValidator() -{ -} - - -wxFQDNListValidator::wxFQDNListValidator(const wxFQDNListValidator &other) : - m_val(other.m_val), - wxValidator(other) -{ -} - - -wxObject* wxFQDNListValidator::Clone() const -{ - return new wxFQDNListValidator(*this); -} - - -bool wxFQDNListValidator::Validate(wxWindow *parent) -{ - wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow(); - if (!ctrl->IsEnabled()) return true; - - wxString val(ctrl->GetValue()); - return Parse(val, 0, val.Length(), ctrl, parent); -} - - -bool wxFQDNListValidator::TransferToWindow() -{ - wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl))); - - if (m_val) { - wxString str; - for (auto name = m_val->cbegin(), name_end = m_val->cend(); name != name_end; ++name) { - if (!str.IsEmpty()) str += wxT("; "); - str += *name; - } - ((wxTextCtrl*)GetWindow())->SetValue(str); - } - - return true; -} - - -bool wxFQDNListValidator::TransferFromWindow() -{ - wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl))); - wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow(); - - wxString val(ctrl->GetValue()); - return Parse(val, 0, val.Length(), ctrl, NULL, m_val); -} - - -bool wxFQDNListValidator::Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::list *val_out) -{ - const wxStringCharType *buf = val_in; - std::wstring _fqdn, *fqdn = val_out ? &_fqdn : NULL; - std::list _val_out; - - size_t i = i_start; - for (;;) { - // Skip initial white-space. - for (; i < i_end && _istspace(buf[i]); i++); - - const wxStringCharType *buf_next; - if ((buf_next = wmemchr(buf + i, L';', i_end - i)) != NULL) { - // FQDN list separator found. - - // Skip trailing white-space. - size_t i_next = buf_next - buf; - for (; i < i_next && _istspace(buf[i_next - 1]); i_next--); - - if (!wxFQDNValidator::Parse(val_in, i, i_next, ctrl, parent, fqdn)) - return false; - if (fqdn && !fqdn->empty()) _val_out.push_back(std::move(*fqdn)); - - i = buf_next - buf + 1; - } else { - // Skip trailing white-space. - for (; i < i_end && _istspace(buf[i_end - 1]); i_end--); - - if (wxFQDNValidator::Parse(val_in, i, i_end, ctrl, parent, fqdn)) { - // The rest of the FQDN list parsed succesfully. - if (fqdn && !fqdn->empty()) _val_out.push_back(std::move(*fqdn)); - if (val_out) *val_out = std::move(_val_out); - return true; - } else - return false; - } - } -} - - ////////////////////////////////////////////////////////////////////// // wxTLSCredentialsPanel ////////////////////////////////////////////////////////////////////// @@ -425,7 +157,9 @@ bool wxTLSServerTrustPanel::TransferDataToWindow() m_root_ca->Append(wxString(eap::get_cert_title(*cert)), new wxCertificateClientData(cert->duplicate())); // Set server acceptable names. The edit control will get populated by validator. - m_server_names_val = m_cfg.m_server_names; + m_server_names_val.clear(); + for (auto name = m_cfg.m_server_names.cbegin(), name_end = m_cfg.m_server_names.cend(); name != name_end; ++name) + m_server_names_val.push_back(*name); return wxTLSServerTrustPanelBase::TransferDataToWindow(); } @@ -447,7 +181,9 @@ bool wxTLSServerTrustPanel::TransferDataFromWindow() } // Save acceptable server names. - m_cfg.m_server_names = m_server_names_val; + m_cfg.m_server_names.clear(); + for (wxArrayString::const_iterator name = m_server_names_val.begin(), name_end = m_server_names_val.end(); name != name_end; ++name) + m_cfg.m_server_names.push_back(std::wstring(*name)); } return true; diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp index 98b6abd..04d606b 100644 --- a/lib/TTLS_UI/src/Module.cpp +++ b/lib/TTLS_UI/src/Module.cpp @@ -344,7 +344,7 @@ wxInitializerPeer::wxInitializerPeer(_In_ HINSTANCE instance) // Do our wxWidgets configuration and localization initialization. wxInitializeConfig(); if (wxInitializeLocale(s_locale)) { - //s_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)); + s_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)); s_locale.AddCatalog(wxT("EAPTTLSUI")); } } diff --git a/lib/wxExtend b/lib/wxExtend index 887a2c8..1c527e1 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit 887a2c8116b1bd639cf1583cc88a05778f7626bb +Subproject commit 1c527e114c1f5d4c682123086093be1f450e5e27 diff --git a/output/locale/.gitignore b/output/locale/.gitignore index 98f8aa9..f17e7e7 100644 --- a/output/locale/.gitignore +++ b/output/locale/.gitignore @@ -1,4 +1,4 @@ */EAPTTLSUI.mo */EventMonitor.mo -*/wxExtend13.mo +*/wxExtend14.mo */wxstd.mo From e178d6d0496175daf8375c7323f12739fba007b3 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 7 Oct 2016 15:38:32 +0200 Subject: [PATCH 27/54] Sub-module update --- lib/wxExtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/wxExtend b/lib/wxExtend index 1c527e1..d9e9f05 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit 1c527e114c1f5d4c682123086093be1f450e5e27 +Subproject commit d9e9f052ac67047c149585d861b63fbd6405418c From e75e2dcce584900b2930273a8a7e8a2074547625 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 10 Oct 2016 09:46:09 +0200 Subject: [PATCH 28/54] Translations update --- EAPMethods/locale/bg_BG.po | 27 ++-- EAPMethods/locale/sr_RS.po | 237 +++++++++++++++++++++-------------- EventMonitor/locale/sr_RS.po | 97 +++++++------- MSI/Base/locale/sr_RS.po | 6 +- MSI/MSIBuild | 2 +- WLANManager/locale/sr_RS.po | 5 +- lib/WinStd | 2 +- lib/wxExtend | 2 +- 8 files changed, 218 insertions(+), 160 deletions(-) diff --git a/EAPMethods/locale/bg_BG.po b/EAPMethods/locale/bg_BG.po index 9c07256..4c9dd1a 100644 --- a/EAPMethods/locale/bg_BG.po +++ b/EAPMethods/locale/bg_BG.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: EAPMethods\n" "POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: University of Ruse , 2016\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,27 +25,27 @@ msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 msgid "+" -msgstr "" +msgstr "+" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38 msgid "Adds new provider" -msgstr "" +msgstr "Добавяне на нов доставчик" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42 msgid "-" -msgstr "" +msgstr "-" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43 msgid "Removes selected provider" -msgstr "" +msgstr "Премахване на избрания доставчик" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47 msgid "Advanced..." -msgstr "" +msgstr "За напреднали ..." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:48 msgid "Opens dialog with provider settings" -msgstr "" +msgstr "Отваряне на диалог за настройки на доставчика" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 #, c-format @@ -104,7 +104,7 @@ msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 msgid "User ID and Password" -msgstr "" +msgstr "Потребителско ID и парола" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." @@ -112,23 +112,24 @@ msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" -msgstr "" +msgstr "Потребителско ID:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" +"Въведете Вашето потребителско име тук (user@domain.org, DOMAIN\\User, т.н.)" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" -msgstr "" +msgstr "Парола:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" -msgstr "" +msgstr "Въведете Вашата парола тук" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" -msgstr "" +msgstr "Вашата организация" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" @@ -138,7 +139,7 @@ msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" -msgstr "" +msgstr "Вашата организация &name:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" diff --git a/EAPMethods/locale/sr_RS.po b/EAPMethods/locale/sr_RS.po index 15fb732..38ba03a 100644 --- a/EAPMethods/locale/sr_RS.po +++ b/EAPMethods/locale/sr_RS.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: EAPMethods\n" "POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: Marko Eremija , 2016\n" "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,133 +25,146 @@ msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 msgid "+" -msgstr "" +msgstr "+" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38 msgid "Adds new provider" -msgstr "" +msgstr "Dodaje novog provajdera" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42 msgid "-" -msgstr "" +msgstr "-" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43 msgid "Removes selected provider" -msgstr "" +msgstr "Uklanja izabranog provajdera" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47 msgid "Advanced..." -msgstr "" +msgstr "Napredno..." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:48 msgid "Opens dialog with provider settings" -msgstr "" +msgstr "Otvara dijalog sa podešavanjima za provajdera" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 #, c-format msgid "%s User Credentials" -msgstr "" +msgstr "%s korisnikovi kredencijali" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 msgid "Select the source where your credentials used to connect are stored." -msgstr "" +msgstr "Izaberite izvor gde se nalaze vaši kredencijali za povezivanje." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 msgid "Use credentials from Credential &Manager:" -msgstr "" +msgstr "Koristi kredencijale iz &Manager kredencijala:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 msgid "" "Select this option if you would like to use credentials stored in Windows " "Credential Manager" msgstr "" +"Odaberite ovu opciju ako želite da koristite kredencijale sačuvane u Windows" +" menadžeru kredencijala" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 msgid "Your present credentials stored in Windows Credential Manager" -msgstr "" +msgstr "Vaši trenutni kredencijali se čuvaju u Windows menadžeru kredencijala" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 msgid "&Clear Credentials" -msgstr "" +msgstr "&Clear kredencijale" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" +"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:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." -msgstr "" +msgstr "&Set kredencijale..." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" -msgstr "" +msgstr "Kliknite ovde kako biste promenili svoje kredencijale" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 msgid "Use credentials from &profile configuration:" -msgstr "" +msgstr "Koristi kredencijale iz konfiguracije &profila:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 msgid "" "Select this option if you would like to store credentials as a part of " "profile configuration" msgstr "" +"Odaberite ovu opciju ako želite da sačuvate kredencijale kao deo " +"konfiguracije profila" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 msgid "Profile configuration credentials" -msgstr "" +msgstr "Kredencijali za konfiguraciju profila" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 msgid "User ID and Password" -msgstr "" +msgstr "Korisničko ime i lozinka" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." -msgstr "" +msgstr "Unesite vaše korisničko ime i lozinku." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" -msgstr "" +msgstr "Korisničko ime:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" +"Unesite vaše korisničko ime ovde (korisnik@domen.ac.rs, DOMEN\\Korisnik, " +"itd.)" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" -msgstr "" +msgstr "Lozinka:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" -msgstr "" +msgstr "Unesite lozinku ovde" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" -msgstr "" +msgstr "Vaša organizacija" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" +"Opišite vašu organizaciju kako biste prilagodili vođenje korisnika kroz " +"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:418 msgid "Your organization &name:" -msgstr "" +msgstr "&name vaše organizacije:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" +"Ime vaše institucije u formatu koji će se pojavljivati u obaveštenjima " +"službe za podršku korisnicima" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" -msgstr "" +msgstr "(budite kratki, molimo vas)" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" -msgstr "" +msgstr "Helpdesk kontakt &information:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" @@ -159,7 +172,7 @@ msgstr "¶" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" -msgstr "" +msgstr "Web stranice službe za podršku korisnicima" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" @@ -167,7 +180,7 @@ msgstr "*" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" -msgstr "" +msgstr "e-mail adresa službe za podršku korisnicima" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" @@ -175,21 +188,23 @@ msgstr ")" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" -msgstr "" +msgstr "Broj telefona službe za podršku korisnicima" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" -msgstr "" +msgstr "Jedinstveni identifikator provajdera" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" +"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:522 msgid "&Namespace:" -msgstr "" +msgstr "&Namespace:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" @@ -201,62 +216,71 @@ msgstr "urn:uuid" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" -msgstr "" +msgstr "Jedinstveni &identifier provajdera: " #: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" +"ID vaše organizacije kako bi se dodelili isti kredencijali kao i na drugim " +"profilima" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" -msgstr "" +msgstr "Zaključavanje konfiguracije" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" +"Vaša konfiguracija se može zaključati kako bi se sprečile slučajne " +"modifikacije od strane krajnjih korisnika. Korisnici će moći jedino da unesu" +" kredencijale. " #: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" +"&Lock ovu konfiguraciju i sprečite bilo kakve nove izmene preko korisničkog " +"interfejsa." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" +"(Upozorenje: Kada se jednom zaključa, ne možete se vratiti na početna " +"podešavanja!)" #: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" -msgstr "" +msgstr "%s kredencijali" #: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 #: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" -msgstr "" +msgstr "EAP kredencijali" #: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" -msgstr "" +msgstr "Za dodatnu pomoć i instrukcije, kontaktirajte %s na:" #: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" -msgstr "" +msgstr "vaš provajder" #: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" -msgstr "" +msgstr "Otvorite uobičajeni web brauzer" #: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" -msgstr "" +msgstr "Otvorite vašeg mejl klijenta" #: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" -msgstr "" +msgstr "Pozovite broj" #: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format @@ -264,303 +288,326 @@ msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" +"%s ima predefinisane delove ove konfiguracije. Ti delovi su zaključani kako " +"bi se izbegla njihova slučajna izmena." #: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" -msgstr "" +msgstr "Vaš provajder" #: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" +"Prethodni pokušaj povezivanja je prijavio da ste uneli pogrešne " +"kredencijale." #: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" +"Prethodni pokušaj povezivanja je prijavio da su vaši kredencijali istekli." #: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" +"Prethodni pokušaj povezivanja je prijavio da se vaši kredencijali trenutno " +"menjaju." #: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." -msgstr "" +msgstr "Prethodni pokušaj povezivanja nije bio uspešan." #: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +"Proverite da li ste uneli ispravne kredencijale ili pokušajte ponovo " +"kasnije." #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 msgid "MSCHAPv2 User ID and Password" -msgstr "" +msgstr "MSCHAPv2 korisničko ime i lozinka" #: lib/PAP_UI/src/PAP_UI.cpp:33 msgid "PAP User ID and Password" -msgstr "" +msgstr "PAP korisničko ime i lozinka" #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" -msgstr "" +msgstr "Serveri kojima se veruje" #: lib/TLS_UI/res/wxTLS_UI.cpp:28 msgid "" "Describe the servers you trust to prevent credential interception in case of" " man-in-the-middle attacks." msgstr "" +"Opišite servere kojima verujete kako bi se izbegla mogućnost krađe " +"kredencijala u slučaju man-in-the-middle napada." #: lib/TLS_UI/res/wxTLS_UI.cpp:35 msgid "Acceptable Certificate Authorities:" -msgstr "" +msgstr "Prihvatljiva sertifikaciona tela:" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 msgid "" "Server's certificate must be issued by one of certificate authorities listed" " here" msgstr "" +"Sertifikat servera mora biti izdat od strane sertifikacionog tela koje je " +"izlistano ovde" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." -msgstr "" +msgstr "Dodaj CA sertifikat iz skladišta..." #: lib/TLS_UI/res/wxTLS_UI.cpp:48 msgid "" "Adds a new certificate authority from the certificate store to the list" -msgstr "" +msgstr "Dodaje na listu novo sertifikaciono telo iz skladišta sertifikata" #: lib/TLS_UI/res/wxTLS_UI.cpp:52 msgid "Add CA from File..." -msgstr "" +msgstr "Dodaj CA sertifikat iz fajla..." #: lib/TLS_UI/res/wxTLS_UI.cpp:53 msgid "Adds a new certificate authority from the file to the list" -msgstr "" +msgstr "Dodaje novo sertifikaciono telo iz fajla u listu" #: lib/TLS_UI/res/wxTLS_UI.cpp:57 msgid "&Remove CA" -msgstr "" +msgstr "&Remove CA" #: lib/TLS_UI/res/wxTLS_UI.cpp:59 msgid "Removes selected certificate authorities from the list" -msgstr "" +msgstr "Uklanja odabrano sertifikaciono telo sa liste" #: lib/TLS_UI/res/wxTLS_UI.cpp:72 msgid "Acceptable server &names:" -msgstr "" +msgstr "Prihvatljiva &names servera" #: lib/TLS_UI/res/wxTLS_UI.cpp:77 msgid "" "A semicolon delimited list of acceptable server FQDN names; blank to skip " "name check; Unicode characters allowed" msgstr "" +"Lista prihvatljivih FQDN imena servera razdvojenih tačka-zarezom; ostaviti " +"prazno ukoliko nije potrebna provera imena servera; dozvoljeno je korišćenje" +" unicode karaktera" #: lib/TLS_UI/res/wxTLS_UI.cpp:81 msgid "(Example: foo.bar.com;server2.bar.com)" -msgstr "" +msgstr "(npr: foo.bar.com;server2.bar.com)" #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 msgid "User Certificate" -msgstr "" +msgstr "Korisnički sertifikat" #: lib/TLS_UI/res/wxTLS_UI.cpp:129 msgid "Please select your &certificate to use for authentication." -msgstr "" +msgstr "Izaberite vaš &certificate koji ćete koristiti za autentifikaciju." #: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" -msgstr "" +msgstr "Klijentski sertifikat koji se koristi za autentifikaciju" #: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" -msgstr "" +msgstr "Proizvoljan &identity:" #: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" +"Vaš identitet (korisničko_ime@domen.ac.rs) kako biste obrisali korisničko " +"ime iz sertifikata; ili prazno kako biste koristili ono koje se nalazi u " +"sertifikatu" #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" -msgstr "" +msgstr "Neispravan karakter je pronađen u DNS imenu: %c" #: lib/TLS_UI/src/TLS_UI.cpp:118 msgid "Validation conflict" -msgstr "" +msgstr "Konflikt prilikom validacije" #: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 #: lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" -msgstr "" +msgstr "" #: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" -msgstr "" +msgstr "Dodaj sertifikat" #: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" -msgstr "" +msgstr "Fajlovi sa sertifikatima (*.cer;*.crt;*.der;*.p7b;*.pem)" #: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" -msgstr "" +msgstr "Fajlovi sa X.509 sertifikatima (*.cer;*.crt;*.der;*.pem)" #: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" -msgstr "" +msgstr "Fajlovi sa PKCS #7 sertifikatima (*.p7b)" #: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" -msgstr "" +msgstr "Svi fajlovi (*.*)" #: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" -msgstr "" +msgstr "Pogrešan ili nepodržan sertifikat %s" #: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" -msgstr "" +msgstr "Greška" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:17 msgid "Outer Identity" -msgstr "" +msgstr "Spoljni identitet" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28 msgid "Select the user ID supplicant introduces itself as to authenticator:" msgstr "" +"Izaberite korisničko ime kojim se softver predstavlja autentifikatoru:" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:35 msgid "&True identity" -msgstr "" +msgstr "&True identitet" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:36 msgid "Use my true user name" -msgstr "" +msgstr "Koristi moje pravo korisničko ime" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40 msgid "Use &empty outer identity (RFC 4822)" -msgstr "" +msgstr "Koristi &empty spoljni identitet (RFC 4822)" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41 msgid "Ommit my user name and use @mydomain.org only" -msgstr "" +msgstr "Izostavi korisničko ime i koristi samo @mojdomen.ac.rs" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:48 msgid "&Custom outer identity:" -msgstr "" +msgstr "&Custom spoljni identitet:" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:49 msgid "Specify custom outer identity" -msgstr "" +msgstr "Unesite proizvoljan spoljni identitet" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:54 msgid "Custom outer identity to use" -msgstr "" +msgstr "Koristi proizvoljan spoljni identitet" #: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 #: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" +"Greška prilikom upisa kredencijala u Menadžera kredencijala: %hs (greška %u)" #: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 #: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." -msgstr "" +msgstr "Upis kredencijala je neuspešan." #: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" -msgstr "" +msgstr "Unutrašnja autentifikacija" #: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" -msgstr "" +msgstr "Spoljna autentifikacija" #: lib/TTLS_UI/src/TTLS_UI.cpp:187 msgid "Select inner authentication method from the list" -msgstr "" +msgstr "Izaberite unutrašnji metod autentifikacije sa liste" #: lib/TTLS_UI/src/TTLS_UI.cpp:189 msgid "PAP" -msgstr "" +msgstr "PAP" #: lib/TTLS_UI/src/TTLS_UI.cpp:191 msgid "MSCHAPv2" -msgstr "" +msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" +"Da li ste sigurni da želite da trajno uklonite %ls provajdera iz " +"konfiguracije?" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" -msgstr "" +msgstr "Upozorenje" #: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" -msgstr "" +msgstr "Podešavanja provajdera" #: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." -msgstr "" +msgstr "Brisanje kredencijala neuspešno (greška %u)." #: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:820 msgid "&Remember" -msgstr "" +msgstr "&Zapamti" #: lib/EAPBase_UI/include/EAP_UI.h:821 msgid "Check if you would like to save credentials" -msgstr "" +msgstr "Označite ako želite da sačuvate kredencijale" #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.h:69 msgid "EAP Connection Configuration" -msgstr "" +msgstr "Podešavanja za EAP povezivanje" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" -msgstr "" +msgstr "EAP metodi" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" -msgstr "" +msgstr "Moduli podržani u određenim EAP metodima" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" -msgstr "" +msgstr "TTLS" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" -msgstr "" +msgstr "Tunneled Transport Layer Security" diff --git a/EventMonitor/locale/sr_RS.po b/EventMonitor/locale/sr_RS.po index fd4512d..8bf431f 100644 --- a/EventMonitor/locale/sr_RS.po +++ b/EventMonitor/locale/sr_RS.po @@ -5,6 +5,7 @@ msgstr "" "Project-Id-Version: EventMonitor\n" "POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" +"Last-Translator: Marko Eremija , 2016\n" "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,32 +21,32 @@ msgstr "" #: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" -msgstr "" +msgstr "Monitor događaja" #: ETWLog.cpp:83 #, c-format msgid "Error opening event trace (error %u)." -msgstr "" +msgstr "Greška prilikom otvaranja log fajla za praćenje događaja (greška %u)." #: ETWLog.cpp:167 msgid "Time" -msgstr "" +msgstr "Vreme" #: ETWLog.cpp:168 msgid "PID" -msgstr "" +msgstr "PID" #: ETWLog.cpp:169 msgid "TID" -msgstr "" +msgstr "TID" #: ETWLog.cpp:170 msgid "Source" -msgstr "" +msgstr "Izvor" #: ETWLog.cpp:171 msgid "Event" -msgstr "" +msgstr "Događaj" #: ETWLog.cpp:228 msgid "" @@ -53,169 +54,173 @@ msgid "" "(Run As Administrator) or be a member of Performance Log Users group to " "start event tracing session." msgstr "" +"Pristup zabranjen prilikom kreiranja sesije: potrebne su vam " +"administratorske privilegije (\"Run As Administrator\") ili da budete član " +"\"Performance Log Users\" grupe kako biste mogli da počnete sa praćenjem ove" +" sesije." #: ETWLog.cpp:231 #, c-format msgid "The %s event session already exists." -msgstr "" +msgstr "Ova %s sesija već postoji." #: ETWLog.cpp:235 #, c-format msgid "Error creating event session (error %u)." -msgstr "" +msgstr "Greška prilikom kreiranja sesije (greška %u)." #: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281 #, c-format msgid "Error enabling %s event provider (error %u)." -msgstr "" +msgstr "Greška prilikom omogućavanja %s provajdera (greška %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 "" +msgstr "Isključuje prikaz %s zapisa" #: Frame.cpp:65 msgid "E&xit" -msgstr "" +msgstr "E&xit" #: Frame.cpp:65 msgid "Quits this program" -msgstr "" +msgstr "Prekida izvršavanje ovog programa" #: Frame.cpp:69 msgid "&Program" -msgstr "" +msgstr "&Program" #: Frame.cpp:73 msgid "&Copy" -msgstr "" +msgstr "&Copy" #: Frame.cpp:73 Frame.cpp:154 msgid "Copies selected records to clipboard" -msgstr "" +msgstr "Kopira izabrane zapise na clipboard" #: Frame.cpp:78 msgid "Copy A&ll" -msgstr "" +msgstr "Kopiraj A&ll" #: Frame.cpp:78 Frame.cpp:156 msgid "Copies all records to clipboard (including hidden)" -msgstr "" +msgstr "Kopira sve zapise na clipboard (uključujući i skrivene)" #: Frame.cpp:83 Frame.cpp:158 msgid "Clear" -msgstr "" +msgstr "Skloni" #: Frame.cpp:83 Frame.cpp:158 msgid "Clears all records from the log" -msgstr "" +msgstr "Sklanja sve zapise iz log fajla" #: Frame.cpp:90 msgid "Select &All" -msgstr "" +msgstr "Izaberi &All" #: Frame.cpp:90 msgid "Selects all visible records" -msgstr "" +msgstr "Odabira sve vidljive zapise" #: Frame.cpp:94 msgid "Select &None" -msgstr "" +msgstr "Odaberi &None" #: Frame.cpp:94 msgid "Clears record selection" -msgstr "" +msgstr "Uklanja izbor zapisa" #: Frame.cpp:97 Frame.cpp:142 msgid "&Edit" -msgstr "" +msgstr "&Edit" #: Frame.cpp:101 msgid "Auto &Scroll" -msgstr "" +msgstr "Automatski &Scroll" #: Frame.cpp:101 Frame.cpp:164 msgid "Automatically scrolls to the most recent records as they come-in" -msgstr "" +msgstr "Automatski skroluje na najnovije zapise kako se pojavljuju" #: Frame.cpp:123 Frame.cpp:176 msgid "Verbose" -msgstr "" +msgstr "Detalj" #: Frame.cpp:123 Frame.cpp:176 msgid "Displays all levels of records" -msgstr "" +msgstr "Prikazuje sve nivoe zapisa" #: Frame.cpp:127 Frame.cpp:178 msgid "Informational" -msgstr "" +msgstr "Informacija" #: Frame.cpp:127 Frame.cpp:178 msgid "Displays all records up to informational level" -msgstr "" +msgstr "Prikazuje sve zapise za određeni nivo informacija" #: Frame.cpp:131 Frame.cpp:180 msgid "Warning" -msgstr "" +msgstr "Upozorenje" #: Frame.cpp:131 Frame.cpp:180 msgid "Displays all records up to warning level" -msgstr "" +msgstr "Prikazuje sve zapise za određeni nivo upozorenja" #: Frame.cpp:135 Frame.cpp:182 msgid "Error" -msgstr "" +msgstr "Greška" #: Frame.cpp:135 Frame.cpp:182 msgid "Displays error level records only" -msgstr "" +msgstr "Prikazuje samo zapise za greške koje su se javile" #: Frame.cpp:142 Frame.cpp:146 #, c-format msgid "%s toolbar" -msgstr "" +msgstr "%s toolbar" #: Frame.cpp:142 Frame.cpp:146 #, c-format msgid "Toggles display of %s toolbar" -msgstr "" +msgstr "Isključuje prikaz %s toolbar" #: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185 msgid "View" -msgstr "" +msgstr "Prikaži" #: Frame.cpp:146 Frame.cpp:149 msgid "&View" -msgstr "" +msgstr "&View" #: Frame.cpp:154 msgid "Copy" -msgstr "" +msgstr "Kopiraj" #: Frame.cpp:156 msgid "Copy All" -msgstr "" +msgstr "Kopiraj sve" #: Frame.cpp:161 msgid "Edit" -msgstr "" +msgstr "Izmeni" #: Frame.cpp:164 msgid "Auto Scroll" -msgstr "" +msgstr "Automaski skrol" #: Frame.cpp:189 msgid "Trace Log" -msgstr "" +msgstr "Log fajl" #: 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 "" +msgstr "Prikaz internih događaja u realnom vremenu" #: 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 "" +msgstr "EVENTM~1|GÉANTLink Event Monitor" diff --git a/MSI/Base/locale/sr_RS.po b/MSI/Base/locale/sr_RS.po index 86b1f96..459db21 100644 --- a/MSI/Base/locale/sr_RS.po +++ b/MSI/Base/locale/sr_RS.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: GÉANTLink MSI\n" "POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: Marko Eremija , 2016\n" "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,11 +22,13 @@ msgstr "" #: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." msgstr "" +"[ProductName] zahteva Windows Vista operativni sistem ili noviju verziju " +"Windows operativnog sistema." #: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 #: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" -msgstr "" +msgstr "http://www.geant.org/" #: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/MSIBuild b/MSI/MSIBuild index d2e4553..99716d6 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit d2e4553dd0e12d0a891efffb44768b55934a8cde +Subproject commit 99716d6aa1277789dbebe9a4ee15990dea9e7a8c diff --git a/WLANManager/locale/sr_RS.po b/WLANManager/locale/sr_RS.po index 58523e7..db6438d 100644 --- a/WLANManager/locale/sr_RS.po +++ b/WLANManager/locale/sr_RS.po @@ -5,6 +5,7 @@ msgstr "" "Project-Id-Version: WLANManager\n" "POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" +"Last-Translator: Marko Eremija , 2016\n" "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "WLAN Manager" -msgstr "" +msgstr "WLAN Manager" #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 @@ -31,3 +32,5 @@ msgstr "" msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" +"Alat za podršku koji pomaže prilikom kreiranja direktnih prečica za bežične " +"mrežne profile" diff --git a/lib/WinStd b/lib/WinStd index 7b0b38a..7b1863d 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 7b0b38aab38c777d2b058baaab62fe55cba09b64 +Subproject commit 7b1863d8b2734e77796b0526f1cc6f58a8ad0b54 diff --git a/lib/wxExtend b/lib/wxExtend index d9e9f05..ca0cb0f 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit d9e9f052ac67047c149585d861b63fbd6405418c +Subproject commit ca0cb0f1f83c233eec4eaa15b7dc4c21c8a741f2 From c94d7897cadcc42a69849f5cc9b534b55211c2c7 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 10 Oct 2016 09:50:50 +0200 Subject: [PATCH 29/54] Serbian translation added to MSI (Except from MSI setup, UI is completely translated to Serbian now) --- Makefile | Bin 194466 -> 194442 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 1c627994f4d4ac424e048de7126ae8330b60245b..3fc9816c58ffadddfd91f3fdc7f401b96083bdfc 100644 GIT binary patch delta 285 zcmZ4Vp1bQkcf%IOA8)2#_{8Wiyyk!j9Zt#b3 z1}|JjZMy*%lL%Dhg}qE7)Aa_YV zzD-~EmXU3Gk0le|^nwo|4&32%e9YlIN(1CKY5N80HN+1{fnkLD_GTm+~!~x%? OZ`j8qw(TC%B1r&HQgCbl delta 303 zcmeBr&%Nk9cf%IOA8)2F_{Hcl-655UZ~CmKj1k)xyk)$^3l|icKCg~Z1j=n;654L? zhj9v2x^bb=QrKSr=G6hZdIR}*3@RZSM`hs(e3ezXNV+@+U;V7ff z_5<8Zbv$4#+kqx{C`@lKWOAB*AdE?2dO|8w#P$YDrYxE1=Yp7SYzGS3@xkQrUgMCaZ5Gn<>17*%g0|2E|ckKWG From 9af304d57a8e4d71d62b1ed564ea279611ef2ee8 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 10 Oct 2016 17:33:59 +0200 Subject: [PATCH 30/54] Translation updated --- EAPMethods/locale/bg_BG.po | 170 +++++++++++++++++---------- EAPMethods/locale/ca_ES.po | 231 ++++++++++++++++++++++--------------- EAPMethods/locale/el_GR.po | 29 +++-- EAPMethods/locale/nb_NO.po | 210 +++++++++++++++++++-------------- MSI/MSIBuild | 2 +- lib/wxExtend | 2 +- 6 files changed, 390 insertions(+), 254 deletions(-) diff --git a/EAPMethods/locale/bg_BG.po b/EAPMethods/locale/bg_BG.po index 4c9dd1a..a9f74c3 100644 --- a/EAPMethods/locale/bg_BG.po +++ b/EAPMethods/locale/bg_BG.po @@ -50,57 +50,71 @@ msgstr "Отваряне на диалог за настройки на дост #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 #, c-format msgid "%s User Credentials" -msgstr "" +msgstr "%s Удостоверения за самолочност на потребителя" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 msgid "Select the source where your credentials used to connect are stored." msgstr "" +"Изберете източника, съхраняващ Вашите удостоверения за самоличност за " +"свързване." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 msgid "Use credentials from Credential &Manager:" -msgstr "" +msgstr "Използвайте удостоверения за самоличност от Credential &Manager:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 msgid "" "Select this option if you would like to use credentials stored in Windows " "Credential Manager" msgstr "" +"Изберете тази опция, ако желаете да използвате удостоверения за " +"самосличност, съхранявани в Windows Credential Manager" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 msgid "Your present credentials stored in Windows Credential Manager" msgstr "" +"Вашите настоящи удостоверения за самоличност са съхранени в Windows " +"Credential Manager" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 msgid "&Clear Credentials" -msgstr "" +msgstr "&Изчистете удостоверенията за самоличност" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" +"Кликнете, за да изчистите Вашите удостоверения за самоличност от Credential Manager.\n" +"\n" +"Забележка: Когато се свързвате, ще Ви бъде поискано да въведете удостоверения за самоличност." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." -msgstr "" +msgstr "&Настройте удостоверения за самоличност ..." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" msgstr "" +"Кликнете тук, за да настроите или модифицирате Вашите удостоверения за " +"самоличност" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 msgid "Use credentials from &profile configuration:" msgstr "" +"Използвайте удостоверения за самоличност от &конфигурацията на профила:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 msgid "" "Select this option if you would like to store credentials as a part of " "profile configuration" msgstr "" +"Изберете тази опция, ако желаете да съхраните удостоверенията за самоличност" +" като част от конфигурацията на профила" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 msgid "Profile configuration credentials" -msgstr "" +msgstr "Конфигуриране на удостоверенията за самоличност на профила" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 msgid "User ID and Password" @@ -108,7 +122,7 @@ msgstr "Потребителско ID и парола" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." -msgstr "" +msgstr "Моля въведете Вашият потребителски ID и парола." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" @@ -136,6 +150,9 @@ 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:418 msgid "Your organization &name:" @@ -145,14 +162,15 @@ msgstr "Вашата организация &name:" msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" +"Името на организацията Ви както ще бъде изписано в контактите за помощ" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" -msgstr "" +msgstr "(Бъдете кратки, моля)" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" -msgstr "" +msgstr "Контакти за помощ &информация:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" @@ -160,7 +178,7 @@ msgstr "¶" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" -msgstr "" +msgstr "Уебсайт адреса за помощ" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" @@ -168,7 +186,7 @@ msgstr "*" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" -msgstr "" +msgstr "E-mail адреса за помощ" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" @@ -176,21 +194,24 @@ msgstr ")" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" -msgstr "" +msgstr "Телефонен номер за помощ" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" -msgstr "" +msgstr "Доставчик на уникален идентификатор" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" +"Определете уникален ID на Вашата организация, за да разрешите споделяне на " +"същите удостоверения за самоличност, настроени между различните мрежови " +"профили." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" -msgstr "" +msgstr "&Пространство от имена:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" @@ -202,62 +223,71 @@ msgstr "urn:uuid" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" -msgstr "" +msgstr "Доставчик на уникален &идентификатор:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" +"ID на Вашата организация за определяне на същите удостоверения за " +"самоличност от другите профили" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" -msgstr "" +msgstr "Заключване на конфигурацията" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" +"Вашата конфигурация може да бъде заключена, за да се предотврати случайното " +"й модифициране от крайните потребители. На потребителите ще им бъде " +"позволено единствено да въвеждат удостоверения за самоличност. " #: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" +"&Заключете тази конфигурация и предотвратете всякакви по-нататъшни " +"модификации посредством потребителския интерфейс." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" +"(Внимание: Веднъж заключен, не може да се върнете назад, използвайки този " +"диалог!)" #: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" -msgstr "" +msgstr "%s Удостоверения за самоличност" #: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 #: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" -msgstr "" +msgstr "EAP удостоверения за самоличност" #: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" -msgstr "" +msgstr "За допълнителна помощ и инструкции, моля свържете се с %s на:" #: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" -msgstr "" +msgstr "Вашият доставчик" #: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" -msgstr "" +msgstr "Отворете уеб браузера по подразбиране" #: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" -msgstr "" +msgstr "Отворете Вашата програма за електронна поща" #: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" -msgstr "" +msgstr "Наберете телефонният номер" #: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format @@ -265,102 +295,121 @@ msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" +"%s има предварително настроени части на тази конфигурация. Тези части са " +"заключени, за да се предотврати инцидентно модифициране." #: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" -msgstr "" +msgstr "Вашият доставчик" #: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." msgstr "" +"Предишният опит за свързване докладва невалидни удостоверения за " +"самоличност." #: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" +"Предишният опит за свързване докладва, че Вашите удостоверения за " +"самоличност са изтекли." #: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" +"Предишният опит за свързване докладва, че Вашите удостоверения за " +"самоличност са били променени." #: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." -msgstr "" +msgstr "Предишният опит за свързване е неуспешен." #: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +"Моля уверете се, че удостоверенията Ви за самоличност са коректни или " +"опитайте отново по-късно." #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 msgid "MSCHAPv2 User ID and Password" -msgstr "" +msgstr "MSCHAPv2 потребителски ID и парола" #: lib/PAP_UI/src/PAP_UI.cpp:33 msgid "PAP User ID and Password" -msgstr "" +msgstr "PAP потребителски ID и парола" #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" -msgstr "" +msgstr "Верен сървър" #: lib/TLS_UI/res/wxTLS_UI.cpp:28 msgid "" "Describe the servers you trust to prevent credential interception in case of" " man-in-the-middle attacks." msgstr "" +"Опишете сървърите, на които вярвате, за да предотвратите прихващане на " +"удостоверения за самоличност, в случай на man-in-the-middle атаки." #: lib/TLS_UI/res/wxTLS_UI.cpp:35 msgid "Acceptable Certificate Authorities:" -msgstr "" +msgstr "Допустими Certificate Authorities:" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 msgid "" "Server's certificate must be issued by one of certificate authorities listed" " here" msgstr "" +"Сертификатът на сървъра трябва да бъде издаден от един от изброените тук " +"certificate authorities" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." -msgstr "" +msgstr "Добавете CA от ..." #: lib/TLS_UI/res/wxTLS_UI.cpp:48 msgid "" "Adds a new certificate authority from the certificate store to the list" msgstr "" +"Добавяне към списъка на нов certificate authority от хранилището със " +"сертификати" #: lib/TLS_UI/res/wxTLS_UI.cpp:52 msgid "Add CA from File..." -msgstr "" +msgstr "Добавете CA от файл ..." #: lib/TLS_UI/res/wxTLS_UI.cpp:53 msgid "Adds a new certificate authority from the file to the list" -msgstr "" +msgstr "Добавяне към списъка на нов certificate authority от файл" #: lib/TLS_UI/res/wxTLS_UI.cpp:57 msgid "&Remove CA" -msgstr "" +msgstr "&Премахнете CA" #: lib/TLS_UI/res/wxTLS_UI.cpp:59 msgid "Removes selected certificate authorities from the list" -msgstr "" +msgstr "Премахване на избраните certificate authorities от списъка" #: lib/TLS_UI/res/wxTLS_UI.cpp:72 msgid "Acceptable server &names:" -msgstr "" +msgstr "Допустими сървър &имена:" #: lib/TLS_UI/res/wxTLS_UI.cpp:77 msgid "" "A semicolon delimited list of acceptable server FQDN names; blank to skip " "name check; Unicode characters allowed" msgstr "" +"Допустимите FQDN имена на сървъри са разделени с точка и запетая; оставете " +"непопълнено, за да пропуснете проверката на името; позволени са уникод " +"символи" #: lib/TLS_UI/res/wxTLS_UI.cpp:81 msgid "(Example: foo.bar.com;server2.bar.com)" -msgstr "" +msgstr "(Например: foo.bar.com;server2.bar.com)" #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 msgid "User Certificate" -msgstr "" +msgstr "Потребителски сертификат" #: lib/TLS_UI/res/wxTLS_UI.cpp:129 msgid "Please select your &certificate to use for authentication." @@ -387,24 +436,24 @@ msgstr "" #: lib/TLS_UI/src/TLS_UI.cpp:118 msgid "Validation conflict" -msgstr "" +msgstr "Проверка на конфликт" #: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 #: lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" -msgstr "" +msgstr "<празно>" #: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" -msgstr "" +msgstr "Добавете сертификат" #: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" -msgstr "" +msgstr "Файлове на сертификати (*.cer;*.crt;*.der;*.p7b;*.pem)" #: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" -msgstr "" +msgstr "X.509 файлове на сертификати (*.cer;*.crt;*.der;*.pem)" #: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" @@ -412,20 +461,20 @@ msgstr "" #: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" -msgstr "" +msgstr "Всички файлове (*.*)" #: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" -msgstr "" +msgstr "Невалиден или неподдържан файл на сертификат %s" #: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" -msgstr "" +msgstr "Грешка" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:17 msgid "Outer Identity" -msgstr "" +msgstr "Външна самоличност" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28 msgid "Select the user ID supplicant introduces itself as to authenticator:" @@ -476,7 +525,7 @@ msgstr "" #: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" -msgstr "" +msgstr "Външна аутентикация" #: lib/TTLS_UI/src/TTLS_UI.cpp:187 msgid "Select inner authentication method from the list" @@ -484,11 +533,11 @@ msgstr "" #: lib/TTLS_UI/src/TTLS_UI.cpp:189 msgid "PAP" -msgstr "" +msgstr "PAP" #: lib/TTLS_UI/src/TTLS_UI.cpp:191 msgid "MSCHAPv2" -msgstr "" +msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format @@ -498,7 +547,7 @@ msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" -msgstr "" +msgstr "Предупреждение" #: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" @@ -508,60 +557,61 @@ msgstr "" #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" +"Изтриването на удостоверенията за замоличност е неуспешно (грешка %u)." #: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" -msgstr "" +msgstr "<грешка %u>" #: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" -msgstr "" +msgstr "<грешка>" #: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" -msgstr "" +msgstr "<непопълнен ID>" #: lib/EAPBase_UI/include/EAP_UI.h:820 msgid "&Remember" -msgstr "" +msgstr "&Запомнете" #: lib/EAPBase_UI/include/EAP_UI.h:821 msgid "Check if you would like to save credentials" -msgstr "" +msgstr "Отметнете, ако желаете да запазите удостоверенията за замоличност" #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" -msgstr "" +msgstr "<Вашата организация>" #: lib/EAPBase_UI/res/wxEAP_UI.h:69 msgid "EAP Connection Configuration" -msgstr "" +msgstr "Конфигуриране на EAP свързване" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" -msgstr "" +msgstr "EAP методи" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" -msgstr "" +msgstr "Модули за поддръжка на индивидуални EAP методи" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" -msgstr "" +msgstr "TTLS" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" -msgstr "" +msgstr "Tunneled Transport Layer Security" diff --git a/EAPMethods/locale/ca_ES.po b/EAPMethods/locale/ca_ES.po index a6642d2..68ddfc9 100644 --- a/EAPMethods/locale/ca_ES.po +++ b/EAPMethods/locale/ca_ES.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: EAPMethods\n" "POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: eduki , 2016\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,133 +25,146 @@ msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37 msgid "+" -msgstr "" +msgstr "+" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38 msgid "Adds new provider" -msgstr "" +msgstr "Afegir nou proveidor" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42 msgid "-" -msgstr "" +msgstr "-" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43 msgid "Removes selected provider" -msgstr "" +msgstr "Esborrar proveidor seleccionat" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47 msgid "Advanced..." -msgstr "" +msgstr "Avançat..." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:48 msgid "Opens dialog with provider settings" -msgstr "" +msgstr "Obre formulari amb ajustos de proveidor" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 #, c-format msgid "%s User Credentials" -msgstr "" +msgstr "%s Credencials d'usuari" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 msgid "Select the source where your credentials used to connect are stored." -msgstr "" +msgstr "Selecciona la font on les credencials utilitzades es desen" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 msgid "Use credentials from Credential &Manager:" -msgstr "" +msgstr "Utilitzar credencials del Credential &Manager: " #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 msgid "" "Select this option if you would like to use credentials stored in Windows " "Credential Manager" msgstr "" +"Seleccioneu aquesta opció si voleu utilitzar les credencials desades a " +"l'Administrador de Credencials de Windows" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 msgid "Your present credentials stored in Windows Credential Manager" msgstr "" +"Les vostres credencials actuals a l'Administrador de Credencials de Windows" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 msgid "&Clear Credentials" -msgstr "" +msgstr "&Esborrar Credencials" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:261 msgid "" "Click to clear your credentials from Credential Manager.\n" "Note: You will be prompted to enter credentials when connecting." msgstr "" +"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:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292 msgid "&Set Credentials..." -msgstr "" +msgstr "&Desar Credencials..." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293 msgid "Click here to set or modify your credentials" -msgstr "" +msgstr "Cliqueu aquí per a desar o modificar les vostres credencials" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 msgid "Use credentials from &profile configuration:" -msgstr "" +msgstr "Utilitzeu les credencials de la configuració del vostre &perfil:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 msgid "" "Select this option if you would like to store credentials as a part of " "profile configuration" msgstr "" +"Escolliu aquesta opció si voleu desar les credencials com a part del perfil " +"de configuració" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 msgid "Profile configuration credentials" -msgstr "" +msgstr "Configuració de credencials del perfil" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 msgid "User ID and Password" -msgstr "" +msgstr "ID d'usuari i contrasenya" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." -msgstr "" +msgstr "Sisplau introduiu el vostre ID d'usuari i contrasenya" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" -msgstr "" +msgstr "ID d'usuari:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" msgstr "" +"Introduiu el vostre identificador aquí (identificador@domini.org, " +"DOMINI\\identificador, etc.)" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" -msgstr "" +msgstr "Contrasenya:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" -msgstr "" +msgstr "Introduiu la vostra contrasenya aquí" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" -msgstr "" +msgstr "La vostra organització" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" +"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:418 msgid "Your organization &name:" -msgstr "" +msgstr "El &nom de la vostra organització:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" +"El nom de la vostra organització tal i com apareixerà en les notificacions " +"de contacte del SAU" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" -msgstr "" +msgstr "(Sigueu breus, sisplau)" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" -msgstr "" +msgstr "Contacte d'ajuda i &informació:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" @@ -159,7 +172,7 @@ msgstr "¶" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" -msgstr "" +msgstr "Adreça web del centre de suport" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" @@ -167,7 +180,7 @@ msgstr "*" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" -msgstr "" +msgstr "Adreça de correu del centre de suport" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" @@ -175,21 +188,23 @@ msgstr ")" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" -msgstr "" +msgstr "Telèfon del centre de suport" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" -msgstr "" +msgstr "Identificador únic del proveidor" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" +"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:522 msgid "&Namespace:" -msgstr "" +msgstr "&Namespace:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" @@ -201,62 +216,69 @@ msgstr "urn:uuid" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" -msgstr "" +msgstr "&Identificador únic del proveidor:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" +"L'ID de la vostra organització per assignar les mateixes credencials des " +"d'altres perfils" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" -msgstr "" +msgstr "Bloqueig de configuració" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" +"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:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" +"&Bloqueja la configuració i preveniu qualsevol modificació via interfície " +"d'usuari." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" +"(Alerta: un cop bloquejada, no ho podeu revertir des d'aquesta finestra!)" #: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" -msgstr "" +msgstr "%s Credencials" #: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 #: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" -msgstr "" +msgstr "Credencials EAP" #: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" -msgstr "" +msgstr "Per instruccions i ajuda, sisplau contacteu amb %s a:" #: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" -msgstr "" +msgstr "el vostre proveidor" #: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" -msgstr "" +msgstr "Obriu el navegador per defecte" #: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" -msgstr "" +msgstr "Obriu el programa de correu" #: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" -msgstr "" +msgstr "Marqueu el telèfon" #: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format @@ -264,303 +286,322 @@ msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" +"%s ha preconfigurat parts d'aquesta configuració. Aquestes parts estan " +"bloquejades per evitar modificacions accidentals." #: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" -msgstr "" +msgstr "El vostre proveidor" #: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." -msgstr "" +msgstr "L'intent de connexió anterior ha informat de credencials no vàlides." #: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." -msgstr "" +msgstr "L'intent de connexió anterior indica que les credencials han caducat." #: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" +"L'intent de connexió anterior indica que les credencials han estat " +"modificades." #: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." -msgstr "" +msgstr "L'intent de connexió anterior ha fallat." #: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +"Sisplau assegureu-vos que les vostres credencials són correctes, o proveu-ho" +" més tard." #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 msgid "MSCHAPv2 User ID and Password" -msgstr "" +msgstr "ID d'usuari i contrasenya MSCHAPv2" #: lib/PAP_UI/src/PAP_UI.cpp:33 msgid "PAP User ID and Password" -msgstr "" +msgstr "ID usuari i contrasenya PAP" #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" -msgstr "" +msgstr "Servidors de confiança" #: lib/TLS_UI/res/wxTLS_UI.cpp:28 msgid "" "Describe the servers you trust to prevent credential interception in case of" " man-in-the-middle attacks." msgstr "" +"Descriu els servidors en que hi confieu per prevenir la intercepció de " +"credencials en cas d'atacs 'man-in-the-middle'." #: lib/TLS_UI/res/wxTLS_UI.cpp:35 msgid "Acceptable Certificate Authorities:" -msgstr "" +msgstr "Autoritats de Certificació acceptades:" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 msgid "" "Server's certificate must be issued by one of certificate authorities listed" " here" msgstr "" +"El certificat del servidor ha d'haver estat emés per una de les autoritats " +"de certificació enumerades" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." -msgstr "" +msgstr "Afegir CA des del Repositori..." #: lib/TLS_UI/res/wxTLS_UI.cpp:48 msgid "" "Adds a new certificate authority from the certificate store to the list" msgstr "" +"Afegeix una nova autoritat de certificació des del repositori de certificats" #: lib/TLS_UI/res/wxTLS_UI.cpp:52 msgid "Add CA from File..." -msgstr "" +msgstr "Afegir CA des d'un fitxer..." #: lib/TLS_UI/res/wxTLS_UI.cpp:53 msgid "Adds a new certificate authority from the file to the list" -msgstr "" +msgstr "Afegeix una nova autoritat de certificació des de d'un arxiu" #: lib/TLS_UI/res/wxTLS_UI.cpp:57 msgid "&Remove CA" -msgstr "" +msgstr "&Eliminar CA" #: lib/TLS_UI/res/wxTLS_UI.cpp:59 msgid "Removes selected certificate authorities from the list" -msgstr "" +msgstr "Elimina les autoritats de certificació seleccionades" #: lib/TLS_UI/res/wxTLS_UI.cpp:72 msgid "Acceptable server &names:" -msgstr "" +msgstr "&Noms de servidors acceptats:" #: lib/TLS_UI/res/wxTLS_UI.cpp:77 msgid "" "A semicolon delimited list of acceptable server FQDN names; blank to skip " "name check; Unicode characters allowed" msgstr "" +"Llista de noms de servidors acceptats, separats per ;, en blanc per no " +"comprovar noms. S'admeten caracters Unicode" #: lib/TLS_UI/res/wxTLS_UI.cpp:81 msgid "(Example: foo.bar.com;server2.bar.com)" -msgstr "" +msgstr "(Per exemple: foo.bar.com;server2.bar.com)" #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 msgid "User Certificate" -msgstr "" +msgstr "Certificat d'usuari" #: lib/TLS_UI/res/wxTLS_UI.cpp:129 msgid "Please select your &certificate to use for authentication." -msgstr "" +msgstr "Sisplau escolliu el vostre &certificat per a l'autenticació." #: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" -msgstr "" +msgstr "Certificat de client per a l'autenticació" #: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" -msgstr "" +msgstr "Personalitzar la &identitat:" #: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" +"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:118 #, c-format msgid "Invalid character in host name found: %c" -msgstr "" +msgstr "S'ha trobat un caracter invàlid en el nom de servidor: %c" #: lib/TLS_UI/src/TLS_UI.cpp:118 msgid "Validation conflict" -msgstr "" +msgstr "Conflicte de validació" #: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 #: lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" -msgstr "" +msgstr "" #: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" -msgstr "" +msgstr "Afegir Certificat" #: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" -msgstr "" +msgstr "Fitxers de certificat (*.cer;*.crt;*.der;*.p7b;*.pem)" #: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" -msgstr "" +msgstr "Fitxers de certificat X.509 (*.cer;*.crt;*.der;*.pem)" #: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" -msgstr "" +msgstr "Fitxers de certificat PKCS #7 (*.p7b)" #: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" -msgstr "" +msgstr "Tots els fitxers (*.*)" #: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" -msgstr "" +msgstr "Fitxer de certificat no vàlid o no suportat %s" #: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" -msgstr "" +msgstr "Error" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:17 msgid "Outer Identity" -msgstr "" +msgstr "Identitat externa" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28 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/TTLS_UI/res/wxTTLS_UI.cpp:35 msgid "&True identity" -msgstr "" +msgstr "Identitat &real" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:36 msgid "Use my true user name" -msgstr "" +msgstr "Utitlitza el meu usuari real" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40 msgid "Use &empty outer identity (RFC 4822)" -msgstr "" +msgstr "Utilitza una identitat externa &buida (RFC 4822)" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41 msgid "Ommit my user name and use @mydomain.org only" -msgstr "" +msgstr "Omet el meu identificador i utilitza només @elmeudomini.org" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:48 msgid "&Custom outer identity:" -msgstr "" +msgstr "Identitat externa &personalitzada:" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:49 msgid "Specify custom outer identity" -msgstr "" +msgstr "Especifiqueu la identitat externa personalitzada" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:54 msgid "Custom outer identity to use" -msgstr "" +msgstr "Identitat externa a utilitzar" #: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 #: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" +"Error escrivint les credencial a l'Administrador de credencials: %hs (error " +"%u)" #: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 #: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." -msgstr "" +msgstr "Ha fallat l'escriptura de les credencials." #: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" -msgstr "" +msgstr "Autenticació interna" #: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" -msgstr "" +msgstr "Autenticació externa" #: lib/TTLS_UI/src/TTLS_UI.cpp:187 msgid "Select inner authentication method from the list" -msgstr "" +msgstr "Escolliu de la llista el mètode d'autenticació externa" #: lib/TTLS_UI/src/TTLS_UI.cpp:189 msgid "PAP" -msgstr "" +msgstr "PAP" #: lib/TTLS_UI/src/TTLS_UI.cpp:191 msgid "MSCHAPv2" -msgstr "" +msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" +"Segur que voleu esborrar permanentment el proveidor %ls de la configuració?" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" -msgstr "" +msgstr "Alerta" #: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" -msgstr "" +msgstr "Ajustos del proveidor" #: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." -msgstr "" +msgstr "Ha fallat l'esborrat de credencials (error %u)." #: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:820 msgid "&Remember" -msgstr "" +msgstr "&Recordar" #: lib/EAPBase_UI/include/EAP_UI.h:821 msgid "Check if you would like to save credentials" -msgstr "" +msgstr "Marqueu si voleu desar les credencials" #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.h:69 msgid "EAP Connection Configuration" -msgstr "" +msgstr "Configuració de la connexió EAP" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" -msgstr "" +msgstr "Mètodes EAP" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" -msgstr "" +msgstr "Móduls per soportar mètodes EAP individuals" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" -msgstr "" +msgstr "TTLS" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" -msgstr "" +msgstr "Tunneled Transport Layer Security" diff --git a/EAPMethods/locale/el_GR.po b/EAPMethods/locale/el_GR.po index f54d0c0..19c7211 100644 --- a/EAPMethods/locale/el_GR.po +++ b/EAPMethods/locale/el_GR.po @@ -50,25 +50,30 @@ msgstr "Ανοίγει ένα παράθυρο διαλόγου με τις ρυ #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 #, c-format msgid "%s User Credentials" -msgstr "" +msgstr "%s Διαπιστευτήρια Χρήστη" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 msgid "Select the source where your credentials used to connect are stored." msgstr "" +"Επιλέξτε την πηγή όπου είναι αποθηκευμένα τα διαπιστευτήριά σας που " +"χρησιμοποιείται για τη σύνδεση." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 msgid "Use credentials from Credential &Manager:" -msgstr "" +msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από τον Credential &Manager:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 msgid "" "Select this option if you would like to use credentials stored in Windows " "Credential Manager" msgstr "" +"Επιλέξτε αυτήν την επιλογή αν θέλετε να χρησιμοποιήσετε τα διαπιστευτήρια " +"που αποθηκεύονται στο Windows Credential Manager" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 msgid "Your present credentials stored in Windows Credential Manager" msgstr "" +"Τα παρόντα διαπιστευτήρια είναι αποθηκευμένα στο Windows Credential Manager" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 msgid "&Clear Credentials" @@ -93,21 +98,23 @@ msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 msgid "Use credentials from &profile configuration:" -msgstr "" +msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από το &προφίλ ρύθμισης παραμέτρων:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 msgid "" "Select this option if you would like to store credentials as a part of " "profile configuration" msgstr "" +"Επιλέξτε αυτήν την επιλογή αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια ως " +"μέρος της διαμόρφωσης προφίλ" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 msgid "Profile configuration credentials" -msgstr "" +msgstr "Προφίλ ρύθμισης διαπιστευτηρίων" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 msgid "User ID and Password" -msgstr "" +msgstr "ID χρήστη και κωδικός πρόσβασης" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." @@ -322,11 +329,11 @@ msgstr "" #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 msgid "MSCHAPv2 User ID and Password" -msgstr "" +msgstr "MSCHAPv2 ID χρήστη και κωδικός πρόσβασης" #: lib/PAP_UI/src/PAP_UI.cpp:33 msgid "PAP User ID and Password" -msgstr "" +msgstr "PAP ID χρήστη και κωδικός πρόσβασης" #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" @@ -349,6 +356,8 @@ msgid "" "Server's certificate must be issued by one of certificate authorities listed" " here" msgstr "" +"Το πιστοποιητικό του διακομιστή πρέπει να εκδίδεται από μία από τις αρχές " +"έκδοσης πιστοποιητικών που αναφέρονται εδώ" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." @@ -396,11 +405,13 @@ msgstr "(Παράδειγμα: foo.bar.com;server2.bar.com)" #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 msgid "User Certificate" -msgstr "" +msgstr "Πιστοποιητικό χρήστη" #: lib/TLS_UI/res/wxTLS_UI.cpp:129 msgid "Please select your &certificate to use for authentication." msgstr "" +"Επιλέξτε το &πιστοποιητικό σας που θα χρησιμοποιηθεί για τον έλεγχο " +"ταυτότητας." #: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" @@ -574,7 +585,7 @@ msgstr "&Υπενθύμιση" #: lib/EAPBase_UI/include/EAP_UI.h:821 msgid "Check if you would like to save credentials" -msgstr "" +msgstr "Ελέγξτε αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια" #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" diff --git a/EAPMethods/locale/nb_NO.po b/EAPMethods/locale/nb_NO.po index be03232..30e720b 100644 --- a/EAPMethods/locale/nb_NO.po +++ b/EAPMethods/locale/nb_NO.po @@ -50,25 +50,27 @@ msgstr "Åpner dialog med tilbyder innstillinger" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 #, c-format msgid "%s User Credentials" -msgstr "" +msgstr "%s Påloggingsinformasjon" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 msgid "Select the source where your credentials used to connect are stored." -msgstr "" +msgstr "Velg kilden for din påloggingsinformasjon" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 msgid "Use credentials from Credential &Manager:" -msgstr "" +msgstr "Bruk brukerdetaljer fra Credential &Manager:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 msgid "" "Select this option if you would like to use credentials stored in Windows " "Credential Manager" msgstr "" +"Velg denne opsjonen om du vil bruke brukerinformasjon lagret i Windows " +"Credential Manager" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 msgid "Your present credentials stored in Windows Credential Manager" -msgstr "" +msgstr "Din nåværende brukerinformasjon i Windows Credential Manager" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 msgid "&Clear Credentials" @@ -92,68 +94,74 @@ msgstr "Klikk her for å sette eller endre påloggingsinformasjon" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 msgid "Use credentials from &profile configuration:" -msgstr "" +msgstr "Bruk brukerinformasjon fra &profil konfigurasjon:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 msgid "" "Select this option if you would like to store credentials as a part of " "profile configuration" msgstr "" +"Velg denne opsjonen om du vil lagre brukerinformasjon som en del av profil " +"konfigurasjon" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 msgid "Profile configuration credentials" -msgstr "" +msgstr "Profil konfigurasjon brukerinformasjon" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 msgid "User ID and Password" -msgstr "" +msgstr "Bruker ID og passord" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." -msgstr "" +msgstr "Vennligst oppgi bruker ID og passord." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:355 msgid "User ID:" -msgstr "" +msgstr "Bruker ID:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:360 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)" -msgstr "" +msgstr "Oppgi ditt brukernavn (bruker@domain.org, DOMIAN\\User, etc)" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:364 msgid "Password:" -msgstr "" +msgstr "Passord:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:369 msgid "Enter your password here" -msgstr "" +msgstr "Oppgi ditt passord" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:400 msgid "Your Organization" -msgstr "" +msgstr "Din organisasjon" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:411 msgid "" "Describe your organization to customize user prompts. When organization is " "introduced, end-users find program messages easier to understand and act." msgstr "" +"Beskriv din organisasjon for å tilpasse ledetekster til brukere. Når " +"organisasjon introduseres vil sluttbrukere lettere forstå meldinger fra " +"programmet og kan gi korrekt respons." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:418 msgid "Your organization &name:" -msgstr "" +msgstr "Din organisasjons %navn:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:423 msgid "" "Your organization name as it will appear on helpdesk contact notifications" msgstr "" +"Din organisasjons navn som det vil fremkomme på kontakt helpdesk varslinger" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:427 msgid "(Keep it short, please)" -msgstr "" +msgstr "(Vennligst, vær kort)" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:437 msgid "Helpdesk contact &information:" -msgstr "" +msgstr "Helpdesk kontakt&informasjon:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:447 msgid "¶" @@ -161,7 +169,7 @@ msgstr "¶" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:454 msgid "Your helpdesk website address" -msgstr "" +msgstr "Nettadresse til din helpdesk" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:458 msgid "*" @@ -169,7 +177,7 @@ msgstr "*" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:465 msgid "Your helpdesk e-mail address" -msgstr "" +msgstr "E-post adresse til din helpdesk" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:469 msgid ")" @@ -177,21 +185,23 @@ msgstr ")" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:476 msgid "Your helpdesk phone number" -msgstr "" +msgstr "Telefonnummer til din helpdesk" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:504 msgid "Provider Unique Identifier" -msgstr "" +msgstr "Oppgi unik identifikator" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:515 msgid "" "Assign your organization a unique ID to allow sharing the same credential " "set across different network profiles." msgstr "" +"Tildel din organisasjon en unik ID for å tillate bruk av de samme " +"brukeropplysninger i forskjellige nettverksprofiler" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:522 msgid "&Namespace:" -msgstr "" +msgstr "&Namespace:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:526 msgid "urn:RFC4282:realm" @@ -203,62 +213,67 @@ msgstr "urn:uuid" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Provider unique &identifier:" -msgstr "" +msgstr "Oppgi unik &identifikator:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:543 msgid "Your organization ID to assign same credentials from other profiles" msgstr "" +"Din organisasjons ID for å kunne bruke de samme brukeropplysninger i andre " +"profiler" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:568 msgid "Configuration Lock" -msgstr "" +msgstr "Konfigurasjonslås" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:579 msgid "" "Your configuration can be locked to prevent accidental modification by end-" "users. Users will only be allowed to enter credentials." msgstr "" +"Din konfigurasjon kan låses for å hindre utilsiktet modifikasjon av " +"sluttbrukere. Brukere vil kun kunne oppgi brukerinformasjon." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:586 msgid "" "&Lock this configuration and prevent any further modification via user " "interface." msgstr "" +"&Lås denne konfigurasjonen og hindre modifikasjon via brukergrensesnitt." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:589 msgid "(Warning: Once locked, you can not revert using this dialog!)" -msgstr "" +msgstr "(Advarsel: Når låst, kan du ikke gå tilbake til denne dialogen!)" #: lib/EAPBase_UI/src/EAP_UI.cpp:97 #, c-format msgid "%s Credentials" -msgstr "" +msgstr "%s Brukeropplysninger" #: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355 #: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119 msgid "EAP Credentials" -msgstr "" +msgstr "EAP brukeropplysninger" #: lib/EAPBase_UI/src/EAP_UI.cpp:165 #, c-format msgid "For additional help and instructions, please contact %s at:" -msgstr "" +msgstr "For mer hjelp og instruksjoner, kontakt %s via:" #: lib/EAPBase_UI/src/EAP_UI.cpp:166 msgid "your provider" -msgstr "" +msgstr "Din tilbyder" #: lib/EAPBase_UI/src/EAP_UI.cpp:185 msgid "Open the default web browser" -msgstr "" +msgstr "Åpne standard nettleser" #: lib/EAPBase_UI/src/EAP_UI.cpp:196 msgid "Open your e-mail program" -msgstr "" +msgstr "Åpne e-post program" #: lib/EAPBase_UI/src/EAP_UI.cpp:207 msgid "Dial the phone number" -msgstr "" +msgstr "Ring telefon" #: lib/EAPBase_UI/src/EAP_UI.cpp:227 #, c-format @@ -266,303 +281,322 @@ msgid "" "%s has pre-set parts of this configuration. Those parts are locked to " "prevent accidental modification." msgstr "" +"%s har pre-satt deler av denne konfigurasjonen. De delene er låst for å " +"hindre utilsiktet modifikasjon." #: lib/EAPBase_UI/src/EAP_UI.cpp:228 msgid "Your provider" -msgstr "" +msgstr "Din tibyder" #: lib/EAPBase_UI/src/EAP_UI.cpp:249 msgid "Previous attempt to connect reported invalid credentials." -msgstr "" +msgstr "Tidligere forsøk på tilkobling rapporterte feil brukeropplysninger." #: lib/EAPBase_UI/src/EAP_UI.cpp:250 msgid "Previous attempt to connect reported your credentials expired." msgstr "" +"Tidligere forsøk på tilkobling rapporterte brukeropplysninger utløpt på dato" #: lib/EAPBase_UI/src/EAP_UI.cpp:251 msgid "" "Previous attempt to connect reported your credentials are being changed." msgstr "" +"Tidligere forsøk på tilkobling rapporterte at dine brukeropplysninger blir " +"endret. " #: lib/EAPBase_UI/src/EAP_UI.cpp:252 msgid "Previous attempt to connect failed." -msgstr "" +msgstr "Tidligere forsøk på tilkobling feilet." #: lib/EAPBase_UI/src/EAP_UI.cpp:253 msgid "Please, make sure your credentials are correct, or try again later." msgstr "" +"Vennligst sjekk at dine brukeropplysninger er korrekt, eller prøv igjen " +"senere." #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 msgid "MSCHAPv2 User ID and Password" -msgstr "" +msgstr "MSCHAPv2 bruker ID and passord" #: lib/PAP_UI/src/PAP_UI.cpp:33 msgid "PAP User ID and Password" -msgstr "" +msgstr "PAP bruker ID og passord" #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" -msgstr "" +msgstr "Server Trust" #: lib/TLS_UI/res/wxTLS_UI.cpp:28 msgid "" "Describe the servers you trust to prevent credential interception in case of" " man-in-the-middle attacks." msgstr "" +"Beskriv tjenere du stoler på for å hindre tyveri av brukeropplysninger i " +"tilfelle et man-in-the-middle angrep." #: lib/TLS_UI/res/wxTLS_UI.cpp:35 msgid "Acceptable Certificate Authorities:" -msgstr "" +msgstr "Akseptable sertifikat utstedere:" #: lib/TLS_UI/res/wxTLS_UI.cpp:40 msgid "" "Server's certificate must be issued by one of certificate authorities listed" " here" msgstr "" +"Tjeneren's sertifikat må være utstedt av en av sertifikat utstederene listet" +" her" #: lib/TLS_UI/res/wxTLS_UI.cpp:47 msgid "Add CA from Store..." -msgstr "" +msgstr "Legg til CA fra ..." #: lib/TLS_UI/res/wxTLS_UI.cpp:48 msgid "" "Adds a new certificate authority from the certificate store to the list" -msgstr "" +msgstr "Legg til en ny sertifikat utsteder i listen" #: lib/TLS_UI/res/wxTLS_UI.cpp:52 msgid "Add CA from File..." -msgstr "" +msgstr "Legg til CA fra fil..." #: lib/TLS_UI/res/wxTLS_UI.cpp:53 msgid "Adds a new certificate authority from the file to the list" -msgstr "" +msgstr "Legger til en ny CA fra filen til listen" #: lib/TLS_UI/res/wxTLS_UI.cpp:57 msgid "&Remove CA" -msgstr "" +msgstr "&Fjern CA" #: lib/TLS_UI/res/wxTLS_UI.cpp:59 msgid "Removes selected certificate authorities from the list" -msgstr "" +msgstr "Fjerner valgte CA fra listen" #: lib/TLS_UI/res/wxTLS_UI.cpp:72 msgid "Acceptable server &names:" -msgstr "" +msgstr "Aksepterte tjener&navn:" #: lib/TLS_UI/res/wxTLS_UI.cpp:77 msgid "" "A semicolon delimited list of acceptable server FQDN names; blank to skip " "name check; Unicode characters allowed" msgstr "" +"En semikolon separert liste med aksepterte tjener FQDN navn; blank for å " +"hoppe over navne sjekk; Unicode tegn er tillatt" #: lib/TLS_UI/res/wxTLS_UI.cpp:81 msgid "(Example: foo.bar.com;server2.bar.com)" -msgstr "" +msgstr "(Eksempel: foo.bar.com;server2.bar.com)" #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 msgid "User Certificate" -msgstr "" +msgstr "Bruker sertifikat" #: lib/TLS_UI/res/wxTLS_UI.cpp:129 msgid "Please select your &certificate to use for authentication." -msgstr "" +msgstr "Vennligst velg ditt &sertifikat for autentisering." #: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" -msgstr "" +msgstr "Klientsertifikat for autentisering " #: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" -msgstr "" +msgstr "Tilpasset &identitet:" #: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" +"Din identitet (brukernavn@domene) for overskriving av sertifikat; eller tomt" +" for å bruke den fra sertifikatet. " #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" -msgstr "" +msgstr "Ugyldig tegn funnet i navn: %c" #: lib/TLS_UI/src/TLS_UI.cpp:118 msgid "Validation conflict" -msgstr "" +msgstr "Valideringskonflikt" #: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769 #: lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" -msgstr "" +msgstr "" #: lib/TLS_UI/src/TLS_UI.cpp:500 msgid "Add Certificate" -msgstr "" +msgstr "Legg til sertifikat" #: lib/TLS_UI/src/TLS_UI.cpp:501 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" -msgstr "" +msgstr "Sertifikat filer (*.cer;*.crt;*.der;*.p7b;*.pem)" #: lib/TLS_UI/src/TLS_UI.cpp:502 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" -msgstr "" +msgstr "X.509 sertifikat filer (*.cer;*.crt;*.der;*.pem)" #: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" -msgstr "" +msgstr "PKCS #7 sertifikat filer (*.p7b)" #: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" -msgstr "" +msgstr "Alle filer (*.*)" #: lib/TLS_UI/src/TLS_UI.cpp:520 #, c-format msgid "Invalid or unsupported certificate file %s" -msgstr "" +msgstr "Ugyldig eller ikke støttet sertifikat fil %s" #: lib/TLS_UI/src/TLS_UI.cpp:520 msgid "Error" -msgstr "" +msgstr "Feil" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:17 msgid "Outer Identity" -msgstr "" +msgstr "Ytre identitet" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28 msgid "Select the user ID supplicant introduces itself as to authenticator:" msgstr "" +"Velg den bruker ID som supplikat introduserer seg som til autentikator:" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:35 msgid "&True identity" -msgstr "" +msgstr "&Faktisk identitet" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:36 msgid "Use my true user name" -msgstr "" +msgstr "Bruke mitt faktiske brukernavn" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40 msgid "Use &empty outer identity (RFC 4822)" -msgstr "" +msgstr "Bruk &tom ytre identitet (RFC 4822)" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41 msgid "Ommit my user name and use @mydomain.org only" -msgstr "" +msgstr "Utelat mitt brukernavn og bruk kun @mydomian.org" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:48 msgid "&Custom outer identity:" -msgstr "" +msgstr "&Tilpasset ytre identitet:" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:49 msgid "Specify custom outer identity" -msgstr "" +msgstr "Spesifiser tilpasset ytre identitet" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:54 msgid "Custom outer identity to use" -msgstr "" +msgstr "Tilpasset ytre identitet som brukes" #: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 #: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" +"Feil under skriving av brukeropplysninger til Credential Manager: %hs (feil " +"%u)" #: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 #: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." -msgstr "" +msgstr "Skriving av brukeropplysninger feilet." #: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" -msgstr "" +msgstr "Indre autentisering" #: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" -msgstr "" +msgstr "Ytre autentisering" #: lib/TTLS_UI/src/TTLS_UI.cpp:187 msgid "Select inner authentication method from the list" -msgstr "" +msgstr "Velg den indre autentiseringsmetoden fra listen" #: lib/TTLS_UI/src/TTLS_UI.cpp:189 msgid "PAP" -msgstr "" +msgstr "PAP" #: lib/TTLS_UI/src/TTLS_UI.cpp:191 msgid "MSCHAPv2" -msgstr "" +msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" +"Er du sikker på at du vil fjerne tilbyder %ls permanent fra konfigurasjonen?" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" -msgstr "" +msgstr "Advarsel" #: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" -msgstr "" +msgstr "Tilbyder innstillinger" #: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." -msgstr "" +msgstr "Sletting av brukeropplysninger feilet (feil %u)" #: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:758 msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778 msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:820 msgid "&Remember" -msgstr "" +msgstr "&Husk" #: lib/EAPBase_UI/include/EAP_UI.h:821 msgid "Check if you would like to save credentials" -msgstr "" +msgstr "Huk av om du vil lagre brukeropplysninger " #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" -msgstr "" +msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.h:69 msgid "EAP Connection Configuration" -msgstr "" +msgstr "Konfigurasjon av EAP forbindelse" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "EAP Methods" -msgstr "" +msgstr "EAP Metoder" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" -msgstr "" +msgstr "Moduler for støtte av individuelle EAP metoder" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "TTLS" -msgstr "" +msgstr "TTLS" #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 msgid "Tunneled Transport Layer Security" -msgstr "" +msgstr "Tunneled Transport Layer Security" diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 99716d6..1df7cf1 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 99716d6aa1277789dbebe9a4ee15990dea9e7a8c +Subproject commit 1df7cf10c8058d21d3249b1f2199b80539aa5ab4 diff --git a/lib/wxExtend b/lib/wxExtend index ca0cb0f..49aa002 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit ca0cb0f1f83c233eec4eaa15b7dc4c21c8a741f2 +Subproject commit 49aa002388e9e2b6431fbdc43202995c4a1fa355 From d7894acf7c65e75542ce703f7c944b777a6dd222 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 10 Oct 2016 17:36:18 +0200 Subject: [PATCH 31/54] Catalan translations added to MSI --- Makefile | Bin 194442 -> 194418 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 3fc9816c58ffadddfd91f3fdc7f401b96083bdfc..a36585f05a0edd4d5876065fd22c947121f08c03 100644 GIT binary patch delta 401 zcmYk1F-t;W7=`)HWSZBwTpY^i(hzMLL`0M{L`XzjB0>^MS~anM;ApnosnggGXb`f# zRm_$qU7}H_DZ;!2y)ie_k>@ziiL)M=##m}aSYALy$^sCzco(1XD z5YVv*26OD4dL%YW8KiY9j@2*=dAw-BTc7oOVG+m^SnOpmB(>RzBh8(>OlZ}l+c`s& z*)^o-6kyZ6klT$`0WVfs5?RRLh{bcv>+CT;g2NV$UK>|Q40JMwgP7MTD@{5TS!7=- xQ}30r;(>AG7_2ui;BHw4J30KYT85?FYXoNeS#4$M?j2tJU`I4X8(MTnFas= delta 333 zcmezLj=SqUcf%G&x5v{HJ~6sX571{4nEtPTQ3TB0{^2p>JYER%!be6sJ}`4@023R8 zH8p^VZ~BLej1myd23wefrq_rug-xG#gh^!jflEMRCcI&En6?$jd!x-1G=0M{Cb8{) z0!#`L+WMbAlKFbgaPi33Grh4%ouv zH67?!zU@{WOcqcRHXH_80F)Nmo->U}LKbW*%zrG?FC2&J+YZ#%0M+u~BG7|C8KLcK J4lx}w0RTVPg5dxF From 39ddc6333dc299e86ec203411de9c3a56308d6ba Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 10 Oct 2016 17:37:27 +0200 Subject: [PATCH 32/54] =?UTF-8?q?Norwegian=20Bokm=C3=A5l=20=20translations?= =?UTF-8?q?=20added=20to=20MSI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | Bin 194418 -> 194394 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index a36585f05a0edd4d5876065fd22c947121f08c03..686c2bd7b11193cf9bbdb1c896c5ccb818b3fd49 100644 GIT binary patch delta 384 zcmY+9KS%;$7{+;D!XWLsMOr2z;8tIc{hW zzr~@w)r6XEY0)@DLa?c~`{JVQefWOg^Jf|+-@>HVrQ8Uu586e!#wPqzvhg&gy>^4P z;moOwyLYOhRpGSq#}uSu*n-<9D}oU;*-{5{x?k4Moom5&7TGppZDQkL z&pK3<3hZQ1I^m%%A=*T6#tFCso}g1;OUvd9hj1H|K&r?Fydlp}FG}=dg^yPvMeFJ(FlcfLv delta 317 zcmcchj{DO)?uIRlO0TAUVRV{qaD|Cy`h{vHmg#Fs8O1JZ8Ww$JNhNrZ?PRVw>LQ&-7vYs})Qwf^gH7 QwgV0Bf+*h(3@0sR07r~`C;$Ke From 2086653a7bd5c653262962dcc327909e4a97edf6 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 11 Oct 2016 11:32:22 +0200 Subject: [PATCH 33/54] Localization and compilation separated, as satisfied Localization target skipped building --- MSILocal.mak | Bin 11246 -> 11690 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/MSILocal.mak b/MSILocal.mak index e8e7b2f96991c8595ae3b8996464f903527dd152..4511d0e36b6ccd901a740b9d8d5760bdd15cd34c 100644 GIT binary patch delta 88 zcmaDCzAAcyAMfO2JYkddgv2Hr@X7(%L6bL#uuNVjD=^tXhy_VZ3d+u!?8Fx|c@A$6 WkiG$B3rwEIUjbytZEh3DkOlyOSsxkz delta 52 ucmZ1#{VsfiAMa!{0l&#Hf&!Db@z+c?;FSaNuRv*#cn6dnwb@B1LmB|^VG%?C From 75ba227bcadd6562901211d7b38de18f59b77925 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 14 Oct 2016 10:10:46 +0200 Subject: [PATCH 34/54] Sub-module update --- lib/WinStd | 2 +- lib/wxExtend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/WinStd b/lib/WinStd index 7b1863d..cc090e8 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 7b1863d8b2734e77796b0526f1cc6f58a8ad0b54 +Subproject commit cc090e89eb56e99382966e8f26c609e96d33bb9a diff --git a/lib/wxExtend b/lib/wxExtend index 49aa002..b644d08 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit 49aa002388e9e2b6431fbdc43202995c4a1fa355 +Subproject commit b644d08eac98260556cf3d059a2d272f98955097 From 8b9ab89c048d1204d3d66d993b702feefc6ffe74 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 17 Oct 2016 10:15:41 +0200 Subject: [PATCH 35/54] Localization update --- MSI/Base/locale/bg_BG.po | 6 +++--- MSI/Base/locale/ca_ES.po | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MSI/Base/locale/bg_BG.po b/MSI/Base/locale/bg_BG.po index b5df740..7aa27d4 100644 --- a/MSI/Base/locale/bg_BG.po +++ b/MSI/Base/locale/bg_BG.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: GÉANTLink MSI\n" "POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: University of Ruse , 2016\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,12 +21,12 @@ msgstr "" #: en_US.Win32.Release.LaunchCondition-2.idtx:4 #: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." -msgstr "" +msgstr "[ProductName] изисква Windows Vista или по-висока версия на Windows." #: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 #: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" -msgstr "" +msgstr "http://www.geant.org/" #: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/ca_ES.po b/MSI/Base/locale/ca_ES.po index 164f502..1e09d78 100644 --- a/MSI/Base/locale/ca_ES.po +++ b/MSI/Base/locale/ca_ES.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: GÉANTLink MSI\n" "POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: eduki , 2016\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,12 +21,12 @@ msgstr "" #: en_US.Win32.Release.LaunchCondition-2.idtx:4 #: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." -msgstr "" +msgstr "[ProductName] requereix Windows Vista o posterior" #: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 #: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" -msgstr "" +msgstr "http://www.geant.org/" #: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" From 473070e567997d9deba13d780d89773d37750ff3 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 17 Oct 2016 10:15:41 +0200 Subject: [PATCH 36/54] Localization update --- EAPMethods/locale/bg_BG.po | 42 +++++++++------- EAPMethods/locale/es_ES.po | 29 +++++++---- EventMonitor/locale/bg_BG.po | 96 ++++++++++++++++++----------------- EventMonitor/locale/ca_ES.po | 97 +++++++++++++++++++----------------- MSI/Base/locale/bg_BG.po | 6 +-- MSI/Base/locale/ca_ES.po | 6 +-- MSI/MSIBuild | 2 +- WLANManager/locale/bg_BG.po | 5 +- WLANManager/locale/ca_ES.po | 5 +- lib/wxExtend | 2 +- 10 files changed, 159 insertions(+), 131 deletions(-) diff --git a/EAPMethods/locale/bg_BG.po b/EAPMethods/locale/bg_BG.po index a9f74c3..617e601 100644 --- a/EAPMethods/locale/bg_BG.po +++ b/EAPMethods/locale/bg_BG.po @@ -413,26 +413,28 @@ msgstr "Потребителски сертификат" #: lib/TLS_UI/res/wxTLS_UI.cpp:129 msgid "Please select your &certificate to use for authentication." -msgstr "" +msgstr "Моля изберете Вашия &сертификат, за да се аутентикирате." #: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" -msgstr "" +msgstr "Клиентски сертификат за аутентикация" #: lib/TLS_UI/res/wxTLS_UI.cpp:143 msgid "Custom &identity:" -msgstr "" +msgstr "Клиентска &самоличност:" #: lib/TLS_UI/res/wxTLS_UI.cpp:148 msgid "" "Your identity (username@domain) to override one from certificate; or blank " "to use one provided in certificate" msgstr "" +"Вашата самоличност (username@domain) да препокрие един от сертификатите; или" +" оставете непопълнено, за да използвате една от предоставените в сертификата" #: lib/TLS_UI/src/TLS_UI.cpp:118 #, c-format msgid "Invalid character in host name found: %c" -msgstr "" +msgstr "Открит е невалиден символ в името на хоста: %c" #: lib/TLS_UI/src/TLS_UI.cpp:118 msgid "Validation conflict" @@ -457,7 +459,7 @@ msgstr "X.509 файлове на сертификати (*.cer;*.crt;*.der;*.pe #: lib/TLS_UI/src/TLS_UI.cpp:503 msgid "PKCS #7 Certificate Files (*.p7b)" -msgstr "" +msgstr "PKCS #7 файлови сертификати (*.p7b)" #: lib/TLS_UI/src/TLS_UI.cpp:504 msgid "All Files (*.*)" @@ -478,50 +480,52 @@ msgstr "Външна самоличност" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28 msgid "Select the user ID supplicant introduces itself as to authenticator:" -msgstr "" +msgstr "Изберете потребителски ID, за да се удостоверите:" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:35 msgid "&True identity" -msgstr "" +msgstr "&Истинска самоличност" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:36 msgid "Use my true user name" -msgstr "" +msgstr "Използвай моето истинско потребителско име" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40 msgid "Use &empty outer identity (RFC 4822)" -msgstr "" +msgstr "Използвай &празна външна самоличност (RFC 4822)" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41 msgid "Ommit my user name and use @mydomain.org only" -msgstr "" +msgstr "Пропусни моето потребителско име и използвай само @mydomain.org" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:48 msgid "&Custom outer identity:" -msgstr "" +msgstr "&Клиентска външна самоличност:" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:49 msgid "Specify custom outer identity" -msgstr "" +msgstr "Специфицирай клиентска външна самоличност" #: lib/TTLS_UI/res/wxTTLS_UI.cpp:54 msgid "Custom outer identity to use" -msgstr "" +msgstr "Клиентска външна самоличност да се използва" #: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284 #: lib/EAPBase_UI/include/EAP_UI.h:696 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" +"Грешка при запис на удостоверения за самоличност в Credential Manager: %hs " +"(error %u)" #: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286 #: lib/EAPBase_UI/include/EAP_UI.h:699 msgid "Writing credentials failed." -msgstr "" +msgstr "Записването на удостоверенията за самоличност е неуспешно " #: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181 msgid "Inner Authentication" -msgstr "" +msgstr "Вътрешна аутентикация" #: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196 msgid "Outer Authentication" @@ -529,7 +533,7 @@ msgstr "Външна аутентикация" #: lib/TTLS_UI/src/TTLS_UI.cpp:187 msgid "Select inner authentication method from the list" -msgstr "" +msgstr "Изберете метод за вътрешна аутентикация от списъка" #: lib/TTLS_UI/src/TTLS_UI.cpp:189 msgid "PAP" @@ -544,6 +548,8 @@ msgstr "MSCHAPv2" msgid "" "Are you sure you want to permanently remove %ls provider from configuration?" msgstr "" +"Сигурни ли сте, че искате да изтриете за постоянно %ls доставчика от " +"конфигурацията?" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" @@ -551,13 +557,13 @@ msgstr "Предупреждение" #: lib/EAPBase_UI/include/EAP_UI.h:552 msgid "Provider Settings" -msgstr "" +msgstr "Настройки на доставчика" #: lib/EAPBase_UI/include/EAP_UI.h:717 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -"Изтриването на удостоверенията за замоличност е неуспешно (грешка %u)." +"Изтриването на удостоверенията за самоличност е неуспешно (грешка %u)." #: lib/EAPBase_UI/include/EAP_UI.h:754 #, c-format diff --git a/EAPMethods/locale/es_ES.po b/EAPMethods/locale/es_ES.po index b25e271..d733c94 100644 --- a/EAPMethods/locale/es_ES.po +++ b/EAPMethods/locale/es_ES.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: EAPMethods\n" "POT-Creation-Date: 2016-09-28 13:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: José Manuel Macías , 2016\n" +"Last-Translator: Alberto Martínez , 2016\n" "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,25 +50,30 @@ msgstr "Abrir diálogo configuración de proveedores" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581 #, c-format msgid "%s User Credentials" -msgstr "" +msgstr "Credenciales %s de usuario" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240 msgid "Select the source where your credentials used to connect are stored." msgstr "" +"Selecciona el repositorio en el que se guardan las credenciales de conexión." #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 msgid "Use credentials from Credential &Manager:" -msgstr "" +msgstr "Usa credenciales del &Administrador de Credenciales:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 msgid "" "Select this option if you would like to use credentials stored in Windows " "Credential Manager" msgstr "" +"Selecciona esta opción si quieres usar credenciales guardadas en el " +"Administrador de Credenciales de Windows" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253 msgid "Your present credentials stored in Windows Credential Manager" msgstr "" +"Sus credenciales actuales guardadas en el Administrador de Credenciales de " +"Windows" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260 msgid "&Clear Credentials" @@ -92,21 +97,23 @@ msgstr "Haga clic aquí para establecer o modificar sus credenciales" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276 msgid "Use credentials from &profile configuration:" -msgstr "" +msgstr "Usa las credenciales de la configuración del &perfil:" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277 msgid "" "Select this option if you would like to store credentials as a part of " "profile configuration" msgstr "" +"Selecciona esta opción si quieres guardar credenciales como parte de la " +"configuración del perfil" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285 msgid "Profile configuration credentials" -msgstr "" +msgstr "Credenciales de la configuración del perfil" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335 msgid "User ID and Password" -msgstr "" +msgstr "Identificador de usuario y contraseña" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345 msgid "Please provide your user ID and password." @@ -321,11 +328,11 @@ msgstr "" #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33 msgid "MSCHAPv2 User ID and Password" -msgstr "" +msgstr "Identificador MSCHAPv2 de usuario y contraseña" #: lib/PAP_UI/src/PAP_UI.cpp:33 msgid "PAP User ID and Password" -msgstr "" +msgstr "Identificador PAP de usuario y contraseña" #: lib/TLS_UI/res/wxTLS_UI.cpp:17 msgid "Server Trust" @@ -397,11 +404,11 @@ msgstr "(Ejemplo: foo.bar.com;servidor2.bar.com)" #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571 msgid "User Certificate" -msgstr "" +msgstr "Certificado de usuario" #: lib/TLS_UI/res/wxTLS_UI.cpp:129 msgid "Please select your &certificate to use for authentication." -msgstr "" +msgstr "Por favor seleccione su &certificado a usar para la autenticación." #: lib/TLS_UI/res/wxTLS_UI.cpp:136 msgid "Client certificate to use for authentication" @@ -572,7 +579,7 @@ msgstr "&Recordar" #: lib/EAPBase_UI/include/EAP_UI.h:821 msgid "Check if you would like to save credentials" -msgstr "" +msgstr "Marca si quieres guardar las credenciales" #: lib/EAPBase_UI/include/EAP_UI.h:964 msgid "" diff --git a/EventMonitor/locale/bg_BG.po b/EventMonitor/locale/bg_BG.po index d785e5e..d9c4ea2 100644 --- a/EventMonitor/locale/bg_BG.po +++ b/EventMonitor/locale/bg_BG.po @@ -5,6 +5,7 @@ msgstr "" "Project-Id-Version: EventMonitor\n" "POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" +"Last-Translator: University of Ruse , 2016\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,32 +21,32 @@ msgstr "" #: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" -msgstr "" +msgstr "Следене на събития" #: ETWLog.cpp:83 #, c-format msgid "Error opening event trace (error %u)." -msgstr "" +msgstr "Грешка при отваряне проследяването на събитие (error %u)." #: ETWLog.cpp:167 msgid "Time" -msgstr "" +msgstr "Време" #: ETWLog.cpp:168 msgid "PID" -msgstr "" +msgstr "PID" #: ETWLog.cpp:169 msgid "TID" -msgstr "" +msgstr "TID" #: ETWLog.cpp:170 msgid "Source" -msgstr "" +msgstr "Източник" #: ETWLog.cpp:171 msgid "Event" -msgstr "" +msgstr "Събитие" #: ETWLog.cpp:228 msgid "" @@ -53,169 +54,172 @@ msgid "" "(Run As Administrator) or be a member of Performance Log Users group to " "start event tracing session." msgstr "" +"Достъпът до създаването сесия на събитие е отказан: необходимо е да имате " +"администраторски права (Run As Administrator) или да бъдете член на групата " +"Performance Log Users, за да стартирате сесия за проследяване на събитие." #: ETWLog.cpp:231 #, c-format msgid "The %s event session already exists." -msgstr "" +msgstr "Сесията на събитие %s вече съществува." #: ETWLog.cpp:235 #, c-format msgid "Error creating event session (error %u)." -msgstr "" +msgstr "Грешка при създаване сесията на събитие (error %u)." #: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281 #, c-format msgid "Error enabling %s event provider (error %u)." -msgstr "" +msgstr "Грешка при разрешаване %s събитие на доставчик (error %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 "" +msgstr "Сборно изобразяване на записи %s" #: Frame.cpp:65 msgid "E&xit" -msgstr "" +msgstr "Из&ход" #: Frame.cpp:65 msgid "Quits this program" -msgstr "" +msgstr "Излизане от тази програма" #: Frame.cpp:69 msgid "&Program" -msgstr "" +msgstr "&Програма" #: Frame.cpp:73 msgid "&Copy" -msgstr "" +msgstr "&Копиране" #: Frame.cpp:73 Frame.cpp:154 msgid "Copies selected records to clipboard" -msgstr "" +msgstr "Копиране на избраните записи в клипборда" #: Frame.cpp:78 msgid "Copy A&ll" -msgstr "" +msgstr "Копиране на Всич&ко" #: Frame.cpp:78 Frame.cpp:156 msgid "Copies all records to clipboard (including hidden)" -msgstr "" +msgstr "Копиране на всички записи в клипборда (включително скритите)" #: Frame.cpp:83 Frame.cpp:158 msgid "Clear" -msgstr "" +msgstr "Изчистване" #: Frame.cpp:83 Frame.cpp:158 msgid "Clears all records from the log" -msgstr "" +msgstr "Изчистване на всички записи от лога" #: Frame.cpp:90 msgid "Select &All" -msgstr "" +msgstr "Изберете &всичко" #: Frame.cpp:90 msgid "Selects all visible records" -msgstr "" +msgstr "Изберете всички видими записи" #: Frame.cpp:94 msgid "Select &None" -msgstr "" +msgstr "Изберете &Нищо" #: Frame.cpp:94 msgid "Clears record selection" -msgstr "" +msgstr "Изчистете избраните записи" #: Frame.cpp:97 Frame.cpp:142 msgid "&Edit" -msgstr "" +msgstr "&Редактиране" #: Frame.cpp:101 msgid "Auto &Scroll" -msgstr "" +msgstr "Автоматичен &скрол" #: Frame.cpp:101 Frame.cpp:164 msgid "Automatically scrolls to the most recent records as they come-in" -msgstr "" +msgstr "Автоматичен скрол на най-последните записи, така както са влезли" #: Frame.cpp:123 Frame.cpp:176 msgid "Verbose" -msgstr "" +msgstr "Подробно" #: Frame.cpp:123 Frame.cpp:176 msgid "Displays all levels of records" -msgstr "" +msgstr "Показва всички нива на записите" #: Frame.cpp:127 Frame.cpp:178 msgid "Informational" -msgstr "" +msgstr "Информационен" #: Frame.cpp:127 Frame.cpp:178 msgid "Displays all records up to informational level" -msgstr "" +msgstr "Показва всички записи, по-високи от информационното ниво" #: Frame.cpp:131 Frame.cpp:180 msgid "Warning" -msgstr "" +msgstr "Предупреждение" #: Frame.cpp:131 Frame.cpp:180 msgid "Displays all records up to warning level" -msgstr "" +msgstr "Показва всички записи, по-високи от ниво предупреждение" #: Frame.cpp:135 Frame.cpp:182 msgid "Error" -msgstr "" +msgstr "Грешка" #: Frame.cpp:135 Frame.cpp:182 msgid "Displays error level records only" -msgstr "" +msgstr "Показва само записи с ниво грешка" #: Frame.cpp:142 Frame.cpp:146 #, c-format msgid "%s toolbar" -msgstr "" +msgstr "%s лента с инструменти" #: Frame.cpp:142 Frame.cpp:146 #, c-format msgid "Toggles display of %s toolbar" -msgstr "" +msgstr "Сборно изобразяване на лентата с инструменти %s" #: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185 msgid "View" -msgstr "" +msgstr "Изглед" #: Frame.cpp:146 Frame.cpp:149 msgid "&View" -msgstr "" +msgstr "&Изглед" #: Frame.cpp:154 msgid "Copy" -msgstr "" +msgstr "Копиране" #: Frame.cpp:156 msgid "Copy All" -msgstr "" +msgstr "Копиране на всичко" #: Frame.cpp:161 msgid "Edit" -msgstr "" +msgstr "Редактиране" #: Frame.cpp:164 msgid "Auto Scroll" -msgstr "" +msgstr "Автоматичен скрол" #: Frame.cpp:189 msgid "Trace Log" -msgstr "" +msgstr "Лог с проследяване" #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4 msgid "Real-time display of internal events" -msgstr "" +msgstr "Покзва в реално време вътрешни събития" #: 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 "" +msgstr "EVENTM~1|GÉANTLink следене на събитие" diff --git a/EventMonitor/locale/ca_ES.po b/EventMonitor/locale/ca_ES.po index 891b9a2..4266162 100644 --- a/EventMonitor/locale/ca_ES.po +++ b/EventMonitor/locale/ca_ES.po @@ -5,6 +5,7 @@ msgstr "" "Project-Id-Version: EventMonitor\n" "POT-Creation-Date: 2016-09-19 11:14+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" +"Last-Translator: eduki , 2016\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,32 +21,32 @@ msgstr "" #: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" -msgstr "" +msgstr "Monitor de Successos" #: ETWLog.cpp:83 #, c-format msgid "Error opening event trace (error %u)." -msgstr "" +msgstr "Error obrint la traça (error %u)." #: ETWLog.cpp:167 msgid "Time" -msgstr "" +msgstr "Temps" #: ETWLog.cpp:168 msgid "PID" -msgstr "" +msgstr "PID" #: ETWLog.cpp:169 msgid "TID" -msgstr "" +msgstr "TID" #: ETWLog.cpp:170 msgid "Source" -msgstr "" +msgstr "Font" #: ETWLog.cpp:171 msgid "Event" -msgstr "" +msgstr "Succés" #: ETWLog.cpp:228 msgid "" @@ -53,169 +54,173 @@ msgid "" "(Run As Administrator) or be a member of Performance Log Users group to " "start event tracing session." msgstr "" +"Accés denegat creant sessió de successos: necessiteu privilegis " +"administratius (Executa com Administrador) o bé ser membre del grup " +"d'usuaris del Log de Rendiment per iniciar una sessió de traces de " +"successos." #: ETWLog.cpp:231 #, c-format msgid "The %s event session already exists." -msgstr "" +msgstr "La sessió de successos %s ja existeix." #: ETWLog.cpp:235 #, c-format msgid "Error creating event session (error %u)." -msgstr "" +msgstr "Error creant la sessió de successos (error %u)." #: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281 #, c-format msgid "Error enabling %s event provider (error %u)." -msgstr "" +msgstr "Error habilitant el proveidor de successos %s (error %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 "" +msgstr "Canvia la visualització de %s registres" #: Frame.cpp:65 msgid "E&xit" -msgstr "" +msgstr "S&ortida" #: Frame.cpp:65 msgid "Quits this program" -msgstr "" +msgstr "Surt del programa" #: Frame.cpp:69 msgid "&Program" -msgstr "" +msgstr "&Programa" #: Frame.cpp:73 msgid "&Copy" -msgstr "" +msgstr "&Copia" #: Frame.cpp:73 Frame.cpp:154 msgid "Copies selected records to clipboard" -msgstr "" +msgstr "Copia els registres seleccionats al portapapers" #: Frame.cpp:78 msgid "Copy A&ll" -msgstr "" +msgstr "Copia T&ot" #: Frame.cpp:78 Frame.cpp:156 msgid "Copies all records to clipboard (including hidden)" -msgstr "" +msgstr "Copia tots els registres al portapapers (incloent els amagats)" #: Frame.cpp:83 Frame.cpp:158 msgid "Clear" -msgstr "" +msgstr "Neteja" #: Frame.cpp:83 Frame.cpp:158 msgid "Clears all records from the log" -msgstr "" +msgstr "Esborra tots els registres del log" #: Frame.cpp:90 msgid "Select &All" -msgstr "" +msgstr "Selecciona-ho &Tot" #: Frame.cpp:90 msgid "Selects all visible records" -msgstr "" +msgstr "Selecciona tots els registres visibles" #: Frame.cpp:94 msgid "Select &None" -msgstr "" +msgstr "&Esborrar selecció" #: Frame.cpp:94 msgid "Clears record selection" -msgstr "" +msgstr "Esborra la selecció de registres" #: Frame.cpp:97 Frame.cpp:142 msgid "&Edit" -msgstr "" +msgstr "&Edita" #: Frame.cpp:101 msgid "Auto &Scroll" -msgstr "" +msgstr "Auto &Scroll" #: Frame.cpp:101 Frame.cpp:164 msgid "Automatically scrolls to the most recent records as they come-in" -msgstr "" +msgstr "Mostra automàticament els registres més recents així que arriben" #: Frame.cpp:123 Frame.cpp:176 msgid "Verbose" -msgstr "" +msgstr "Detallat" #: Frame.cpp:123 Frame.cpp:176 msgid "Displays all levels of records" -msgstr "" +msgstr "Mostra tots els nivells de registre" #: Frame.cpp:127 Frame.cpp:178 msgid "Informational" -msgstr "" +msgstr "Informatiu" #: Frame.cpp:127 Frame.cpp:178 msgid "Displays all records up to informational level" -msgstr "" +msgstr "Mostra els registres fins al nivell informatiu" #: Frame.cpp:131 Frame.cpp:180 msgid "Warning" -msgstr "" +msgstr "Alerta" #: Frame.cpp:131 Frame.cpp:180 msgid "Displays all records up to warning level" -msgstr "" +msgstr "Mostra els registres fins al nivell d'alerta" #: Frame.cpp:135 Frame.cpp:182 msgid "Error" -msgstr "" +msgstr "Error" #: Frame.cpp:135 Frame.cpp:182 msgid "Displays error level records only" -msgstr "" +msgstr "Mostra només els registres d'error" #: Frame.cpp:142 Frame.cpp:146 #, c-format msgid "%s toolbar" -msgstr "" +msgstr "Barra %s" #: Frame.cpp:142 Frame.cpp:146 #, c-format msgid "Toggles display of %s toolbar" -msgstr "" +msgstr "Alterna la visió de la barra %s" #: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185 msgid "View" -msgstr "" +msgstr "Vista" #: Frame.cpp:146 Frame.cpp:149 msgid "&View" -msgstr "" +msgstr "&Vista" #: Frame.cpp:154 msgid "Copy" -msgstr "" +msgstr "Copia" #: Frame.cpp:156 msgid "Copy All" -msgstr "" +msgstr "Copia-ho tot" #: Frame.cpp:161 msgid "Edit" -msgstr "" +msgstr "Edita" #: Frame.cpp:164 msgid "Auto Scroll" -msgstr "" +msgstr "Auto Scroll" #: Frame.cpp:189 msgid "Trace Log" -msgstr "" +msgstr "Registre de traces" #: 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 "" +msgstr "Mostra en temps real dels successos interns" #: 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 "" +msgstr "EVENTM~1|GÉANTLink Monitor de successos" diff --git a/MSI/Base/locale/bg_BG.po b/MSI/Base/locale/bg_BG.po index b5df740..7aa27d4 100644 --- a/MSI/Base/locale/bg_BG.po +++ b/MSI/Base/locale/bg_BG.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: GÉANTLink MSI\n" "POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: University of Ruse , 2016\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,12 +21,12 @@ msgstr "" #: en_US.Win32.Release.LaunchCondition-2.idtx:4 #: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." -msgstr "" +msgstr "[ProductName] изисква Windows Vista или по-висока версия на Windows." #: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 #: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" -msgstr "" +msgstr "http://www.geant.org/" #: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/Base/locale/ca_ES.po b/MSI/Base/locale/ca_ES.po index 164f502..1e09d78 100644 --- a/MSI/Base/locale/ca_ES.po +++ b/MSI/Base/locale/ca_ES.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: GÉANTLink MSI\n" "POT-Creation-Date: 2016-09-19 11:20+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" -"Last-Translator: Simon Rozman , 2016\n" +"Last-Translator: eduki , 2016\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,12 +21,12 @@ msgstr "" #: en_US.Win32.Release.LaunchCondition-2.idtx:4 #: en_US.x64.Release.LaunchCondition-2.idtx:4 msgid "[ProductName] requires Windows Vista or later version of Windows." -msgstr "" +msgstr "[ProductName] requereix Windows Vista o posterior" #: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5 #: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5 msgid "http://www.geant.org/" -msgstr "" +msgstr "http://www.geant.org/" #: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6 msgid "https://github.com/Amebis/GEANTLink/releases" diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 1df7cf1..131e528 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 1df7cf10c8058d21d3249b1f2199b80539aa5ab4 +Subproject commit 131e528a94017d591ca0c6a15637ef23fcdaadea diff --git a/WLANManager/locale/bg_BG.po b/WLANManager/locale/bg_BG.po index 12d0e94..0267da7 100644 --- a/WLANManager/locale/bg_BG.po +++ b/WLANManager/locale/bg_BG.po @@ -5,6 +5,7 @@ msgstr "" "Project-Id-Version: WLANManager\n" "POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" +"Last-Translator: University of Ruse , 2016\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "WLAN Manager" -msgstr "" +msgstr "Управление на WLAN" #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 @@ -31,3 +32,5 @@ msgstr "" msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" +"Помощно средство, поддържащо директен пряк линк до Wireless Network " +"Properties" diff --git a/WLANManager/locale/ca_ES.po b/WLANManager/locale/ca_ES.po index cf2ae4b..f284f5c 100644 --- a/WLANManager/locale/ca_ES.po +++ b/WLANManager/locale/ca_ES.po @@ -5,6 +5,7 @@ msgstr "" "Project-Id-Version: WLANManager\n" "POT-Creation-Date: 2016-09-19 11:22+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" +"Last-Translator: eduki , 2016\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "WLAN Manager" -msgstr "" +msgstr "Administrador de WLAN" #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 @@ -31,3 +32,5 @@ msgstr "" msgid "" "Helper utility to support direct shortcuts to Wireless Network Properties" msgstr "" +"Utilitat d'ajuda per a accessos directes a les Propietats de Xarxa " +"inalàmbrica" diff --git a/lib/wxExtend b/lib/wxExtend index b644d08..dee95d7 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit b644d08eac98260556cf3d059a2d272f98955097 +Subproject commit dee95d7d6c246fe521e2cd5c1f76937484f3717c From 0dcb8c04c58fb505b5949865a65edd36db779828 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 17 Oct 2016 10:28:47 +0200 Subject: [PATCH 37/54] Bulgarian translation included in final MSI --- Makefile | Bin 194394 -> 194370 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 686c2bd7b11193cf9bbdb1c896c5ccb818b3fd49..2ffa1a6f61a7e60ec7271ef802ed6b821d39793b 100644 GIT binary patch delta 267 zcmcchj{DF%?uIRl_a053pv~m4UEwh!6Cap4-5`%qVEU~sj1toW_?UdA2ShV*Y=7{P z@enUunrHim|BT;|_|t)Wmg!v=86~y@_4p}3%zU87#Kk-Pf-+Ocb_W}#C^@)(f$eXi zn9Lwj(}7ZxrUUsx(-WpMu}$wg$n@itXEiBt3HX~aDR>?A*<2;ktbcIZ&58G=FG2Jr(08Y1K%>V!Z delta 298 zcmX@~j{DX-?uIRl_a04O^_bCVxAF^Nofn9B5S`hq;5^aWd{eKHUef%b|_|ChnUxBWvD z6VNeWJs`pDK*2wFZ7~32m=C#B{_20B8+(zW@LL From 1911b53c10a13bcef728435f0db1246dabb2fcbb Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 17 Oct 2016 14:04:21 +0200 Subject: [PATCH 38/54] Missing type-cast preventing correct CA certificate file import fixed (broken in 559ffc5ead99b6848386588319bf49005da9b5d4) --- lib/TLS_UI/include/TLS_UI.h | 2 +- lib/TLS_UI/src/TLS_UI.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/TLS_UI/include/TLS_UI.h b/lib/TLS_UI/include/TLS_UI.h index e1a2460..38b9160 100644 --- a/lib/TLS_UI/include/TLS_UI.h +++ b/lib/TLS_UI/include/TLS_UI.h @@ -100,7 +100,7 @@ class wxTLSCredentialsPanel : public wxEAPCredentialsPanel(paths[i]))) { for (PCCERT_CONTEXT cert = NULL; (cert = CertEnumCertificatesInStore(cs, cert)) != NULL;) AddRootCA(cert); } else - wxMessageBox(wxString::Format(_("Invalid or unsupported certificate file %s"), paths[i]), _("Error"), wxOK | wxICON_EXCLAMATION, this); + wxMessageBox(wxString::Format(_("Invalid or unsupported certificate file %s"), paths[i].c_str()), _("Error"), wxOK | wxICON_EXCLAMATION, this); } } From fd7b0a93c014be65b2e9e0c65ddcde2eedd1aacb Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 17 Oct 2016 16:15:26 +0200 Subject: [PATCH 39/54] wxEAPGetProviderName() output fixed --- lib/EAPBase_UI/include/EAP_UI.h | 4 ++-- lib/EAPBase_UI/src/EAP_UI.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index eeb0c04..cdf3d26 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -210,7 +210,7 @@ public: m_providers), is_single ? wxEAPGetProviderName(provider->m_name) : - winstd::tstring_printf(_T("%s (%u)"), wxEAPGetProviderName(provider->m_name), count)); + winstd::tstring_printf(_T("%s (%u)"), static_cast(wxEAPGetProviderName(provider->m_name)), count)); } } @@ -292,7 +292,7 @@ protected: int idx = m_providers->GetSelection(); eap::config_provider &cfg_provider = dynamic_cast<_wxT*>(m_providers->GetPage(idx))->GetProvider(); - if (wxMessageBox(tstring_printf(_("Are you sure you want to permanently remove %ls provider from configuration?"), wxEAPGetProviderName(cfg_provider.m_name).c_str()), _("Warning"), wxYES_NO, this) == wxYES) { + if (wxMessageBox(tstring_printf(_("Are you sure you want to permanently remove %ls provider from configuration?"), static_cast(wxEAPGetProviderName(cfg_provider.m_name))), _("Warning"), wxYES_NO, this) == wxYES) { // Delete provider. auto it = m_cfg.m_providers.begin(); for (int i = 0; i < idx; i++, ++it); diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp index 717e3a7..01da353 100644 --- a/lib/EAPBase_UI/src/EAP_UI.cpp +++ b/lib/EAPBase_UI/src/EAP_UI.cpp @@ -96,7 +96,7 @@ wxEAPCredentialsDialog::wxEAPCredentialsDialog(const eap::config_provider &prov, wxEAPGeneralDialog(parent, id, title, pos, size, style) { // Set banner title. - m_banner->m_title->SetLabel(wxString::Format(_("%s Credentials"), wxEAPGetProviderName(prov.m_name).c_str())); + m_banner->m_title->SetLabel(wxString::Format(_("%s Credentials"), wxEAPGetProviderName(prov.m_name))); } From d602a03caca6df61a081dd54002b340842adc717 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 17 Oct 2016 16:38:00 +0200 Subject: [PATCH 40/54] Incorrect string template fixed --- EAPMethods/locale/EAPMethods.pot | 2 +- EAPMethods/locale/bg_BG.po | 4 ++-- EAPMethods/locale/ca_ES.po | 4 ++-- EAPMethods/locale/de_DE.po | 4 ++-- EAPMethods/locale/el_GR.po | 4 ++-- EAPMethods/locale/es_ES.po | 4 ++-- EAPMethods/locale/hr_HR.po | 4 ++-- EAPMethods/locale/lt_LT.po | 4 ++-- EAPMethods/locale/nb_NO.po | 4 ++-- EAPMethods/locale/pl_PL.po | 4 ++-- EAPMethods/locale/sl_SI.po | 4 ++-- EAPMethods/locale/sr_RS.po | 4 ++-- lib/EAPBase_UI/include/EAP_UI.h | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/EAPMethods/locale/EAPMethods.pot b/EAPMethods/locale/EAPMethods.pot index 9aaa02d..de51777 100644 --- a/EAPMethods/locale/EAPMethods.pot +++ b/EAPMethods/locale/EAPMethods.pot @@ -463,7 +463,7 @@ msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format -msgid "Are you sure you want to permanently remove %ls provider from configuration?" +msgid "Are you sure you want to permanently remove %s provider from configuration?" msgstr "" #: lib/EAPBase_UI/include/EAP_UI.h:292 diff --git a/EAPMethods/locale/bg_BG.po b/EAPMethods/locale/bg_BG.po index 617e601..d0fbbfd 100644 --- a/EAPMethods/locale/bg_BG.po +++ b/EAPMethods/locale/bg_BG.po @@ -546,9 +546,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Сигурни ли сте, че искате да изтриете за постоянно %ls доставчика от " +"Сигурни ли сте, че искате да изтриете за постоянно %s доставчика от " "конфигурацията?" #: lib/EAPBase_UI/include/EAP_UI.h:292 diff --git a/EAPMethods/locale/ca_ES.po b/EAPMethods/locale/ca_ES.po index 68ddfc9..99702c1 100644 --- a/EAPMethods/locale/ca_ES.po +++ b/EAPMethods/locale/ca_ES.po @@ -532,9 +532,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Segur que voleu esborrar permanentment el proveidor %ls de la configuració?" +"Segur que voleu esborrar permanentment el proveidor %s de la configuració?" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" diff --git a/EAPMethods/locale/de_DE.po b/EAPMethods/locale/de_DE.po index 22d689c..61b14ef 100644 --- a/EAPMethods/locale/de_DE.po +++ b/EAPMethods/locale/de_DE.po @@ -542,9 +542,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Sind Sie sicher, dass Sie den Identitätsprovider %ls aus der Konfiguration " +"Sind Sie sicher, dass Sie den Identitätsprovider %s aus der Konfiguration " "löschen möchten?" #: lib/EAPBase_UI/include/EAP_UI.h:292 diff --git a/EAPMethods/locale/el_GR.po b/EAPMethods/locale/el_GR.po index 19c7211..0a3c400 100644 --- a/EAPMethods/locale/el_GR.po +++ b/EAPMethods/locale/el_GR.po @@ -548,9 +548,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %ls από τη " +"Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %s από τη " "διαμόρφωση;" #: lib/EAPBase_UI/include/EAP_UI.h:292 diff --git a/EAPMethods/locale/es_ES.po b/EAPMethods/locale/es_ES.po index d733c94..be4aae5 100644 --- a/EAPMethods/locale/es_ES.po +++ b/EAPMethods/locale/es_ES.po @@ -542,10 +542,10 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" "¿está seguro de que quiere borrar permanentemente la configuración del " -"proveedor %ls?" +"proveedor %s?" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" diff --git a/EAPMethods/locale/hr_HR.po b/EAPMethods/locale/hr_HR.po index 087a766..8667a26 100644 --- a/EAPMethods/locale/hr_HR.po +++ b/EAPMethods/locale/hr_HR.po @@ -521,9 +521,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Da li ste sigurni da želite za stalno opbrisati davatelja usluge %ls iz " +"Da li ste sigurni da želite za stalno opbrisati davatelja usluge %s iz " "konfiguracije ? " #: lib/EAPBase_UI/include/EAP_UI.h:292 diff --git a/EAPMethods/locale/lt_LT.po b/EAPMethods/locale/lt_LT.po index f29df47..8aab77b 100644 --- a/EAPMethods/locale/lt_LT.po +++ b/EAPMethods/locale/lt_LT.po @@ -527,9 +527,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Ar tikrai norite visam laikui pašalinti teikėją „%ls“ iš konfigūracijos?" +"Ar tikrai norite visam laikui pašalinti teikėją „%s“ iš konfigūracijos?" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" diff --git a/EAPMethods/locale/nb_NO.po b/EAPMethods/locale/nb_NO.po index 30e720b..5f246f5 100644 --- a/EAPMethods/locale/nb_NO.po +++ b/EAPMethods/locale/nb_NO.po @@ -527,9 +527,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Er du sikker på at du vil fjerne tilbyder %ls permanent fra konfigurasjonen?" +"Er du sikker på at du vil fjerne tilbyder %s permanent fra konfigurasjonen?" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" diff --git a/EAPMethods/locale/pl_PL.po b/EAPMethods/locale/pl_PL.po index cb711b5..f3700f7 100644 --- a/EAPMethods/locale/pl_PL.po +++ b/EAPMethods/locale/pl_PL.po @@ -526,9 +526,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Czy jesteś pewny, że chcesz usunąć konfigurację dostawcy tożsamości %ls?" +"Czy jesteś pewny, że chcesz usunąć konfigurację dostawcy tożsamości %s?" #: lib/EAPBase_UI/include/EAP_UI.h:292 msgid "Warning" diff --git a/EAPMethods/locale/sl_SI.po b/EAPMethods/locale/sl_SI.po index 99740a3..7767724 100644 --- a/EAPMethods/locale/sl_SI.po +++ b/EAPMethods/locale/sl_SI.po @@ -524,9 +524,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Ali ste prepričani, da želite trajno izbrisati ponudnika %ls iz " +"Ali ste prepričani, da želite trajno izbrisati ponudnika %s iz " "konfiguracije?" #: lib/EAPBase_UI/include/EAP_UI.h:292 diff --git a/EAPMethods/locale/sr_RS.po b/EAPMethods/locale/sr_RS.po index 38ba03a..a3e52bc 100644 --- a/EAPMethods/locale/sr_RS.po +++ b/EAPMethods/locale/sr_RS.po @@ -537,9 +537,9 @@ msgstr "MSCHAPv2" #: lib/EAPBase_UI/include/EAP_UI.h:292 #, c-format msgid "" -"Are you sure you want to permanently remove %ls provider from configuration?" +"Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -"Da li ste sigurni da želite da trajno uklonite %ls provajdera iz " +"Da li ste sigurni da želite da trajno uklonite %s provajdera iz " "konfiguracije?" #: lib/EAPBase_UI/include/EAP_UI.h:292 diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index cdf3d26..193c779 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -292,7 +292,7 @@ protected: int idx = m_providers->GetSelection(); eap::config_provider &cfg_provider = dynamic_cast<_wxT*>(m_providers->GetPage(idx))->GetProvider(); - if (wxMessageBox(tstring_printf(_("Are you sure you want to permanently remove %ls provider from configuration?"), static_cast(wxEAPGetProviderName(cfg_provider.m_name))), _("Warning"), wxYES_NO, this) == wxYES) { + if (wxMessageBox(tstring_printf(_("Are you sure you want to permanently remove %s provider from configuration?"), static_cast(wxEAPGetProviderName(cfg_provider.m_name))), _("Warning"), wxYES_NO, this) == wxYES) { // Delete provider. auto it = m_cfg.m_providers.begin(); for (int i = 0; i < idx; i++, ++it); From 278bc46511f723d016ae8e04d8ff3a66af767556 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 18 Oct 2016 14:28:39 +0200 Subject: [PATCH 41/54] Sub-module update --- lib/WinStd | 2 +- lib/wxExtend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/WinStd b/lib/WinStd index cc090e8..21ba0df 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit cc090e89eb56e99382966e8f26c609e96d33bb9a +Subproject commit 21ba0dfc5f35d551d8c613751a9ea87365744cfb diff --git a/lib/wxExtend b/lib/wxExtend index dee95d7..525f246 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit dee95d7d6c246fe521e2cd5c1f76937484f3717c +Subproject commit 525f24674e886e077ce985bd78ebcc8a95425578 From 1ccf97b6d7724054e7653ad0b0e4f93b19f20868 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 24 Oct 2016 13:33:01 +0200 Subject: [PATCH 42/54] ppResult >> pResult --- EAPMethods/src/Main.cpp | 8 ++++---- lib/EAPBase/include/Method.h | 2 +- lib/EAPBase/include/Module.h | 2 +- lib/EAPBase/src/Method.cpp | 8 ++++---- lib/TLS/include/Method.h | 2 +- lib/TLS/src/Method.cpp | 6 +++--- lib/TTLS/include/Method.h | 2 +- lib/TTLS/include/Module.h | 2 +- lib/TTLS/src/Method.cpp | 6 +++--- lib/TTLS/src/Module.cpp | 26 +++++++++++++------------- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp index a6cd90d..6f444a1 100644 --- a/EAPMethods/src/Main.cpp +++ b/EAPMethods/src/Main.cpp @@ -449,7 +449,7 @@ DWORD APIENTRY EapPeerGetResponsePacket( DWORD APIENTRY EapPeerGetResult( _In_ EAP_SESSION_HANDLE hSession, _In_ EapPeerMethodResultReason reason, - _Out_ EapPeerMethodResult *ppResult, + _Out_ EapPeerMethodResult *pResult, _Out_ EAP_ERROR **ppEapError) { DWORD dwResult = ERROR_SUCCESS; @@ -466,11 +466,11 @@ DWORD APIENTRY EapPeerGetResult( if (!hSession) g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL."))); - else if (!ppResult) - g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppResult is NULL."))); + else if (!pResult) + g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pResult is NULL."))); else { try { - g_peer.get_result(hSession, reason, ppResult); + g_peer.get_result(hSession, reason, pResult); } catch (std::exception &err) { g_peer.log_error(*ppEapError = g_peer.make_error(err)); dwResult = (*ppEapError)->dwWinError; diff --git a/lib/EAPBase/include/Method.h b/lib/EAPBase/include/Method.h index 21d1e6d..892cd50 100644 --- a/lib/EAPBase/include/Method.h +++ b/lib/EAPBase/include/Method.h @@ -126,7 +126,7 @@ namespace eap /// virtual void get_result( _In_ EapPeerMethodResultReason reason, - _Inout_ EapPeerMethodResult *ppResult); + _Inout_ EapPeerMethodResult *pResult); /// @} diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index d9dcfdf..069d1ef 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -737,7 +737,7 @@ namespace eap virtual void get_result( _In_ EAP_SESSION_HANDLE hSession, _In_ EapPeerMethodResultReason reason, - _Inout_ EapPeerMethodResult *ppResult) = 0; + _Inout_ EapPeerMethodResult *pResult) = 0; /// /// Obtains the user interface context from the EAP method. diff --git a/lib/EAPBase/src/Method.cpp b/lib/EAPBase/src/Method.cpp index dec8775..4421cf3 100644 --- a/lib/EAPBase/src/Method.cpp +++ b/lib/EAPBase/src/Method.cpp @@ -83,9 +83,9 @@ void eap::method::end_session() void eap::method::get_result( _In_ EapPeerMethodResultReason reason, - _Inout_ EapPeerMethodResult *ppResult) + _Inout_ EapPeerMethodResult *pResult) { - assert(ppResult); + assert(pResult); switch (reason) { case EapPeerMethodResultSuccess: { @@ -104,8 +104,8 @@ void eap::method::get_result( // Always ask EAP host to save the connection data. And it will save it *only* when we report "success". // Don't worry. EapHost is well aware of failed authentication condition. - ppResult->fSaveConnectionData = TRUE; - ppResult->fIsSuccess = TRUE; + pResult->fSaveConnectionData = TRUE; + pResult->fIsSuccess = TRUE; } diff --git a/lib/TLS/include/Method.h b/lib/TLS/include/Method.h index 375b73c..72627f6 100644 --- a/lib/TLS/include/Method.h +++ b/lib/TLS/include/Method.h @@ -128,7 +128,7 @@ namespace eap /// virtual void get_result( _In_ EapPeerMethodResultReason reason, - _Inout_ EapPeerMethodResult *ppResult); + _Inout_ EapPeerMethodResult *pResult); /// @} diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index a2feb1c..637304a 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -492,11 +492,11 @@ void eap::method_tls::get_response_packet( void eap::method_tls::get_result( _In_ EapPeerMethodResultReason reason, - _Inout_ EapPeerMethodResult *ppResult) + _Inout_ EapPeerMethodResult *pResult) { - assert(ppResult); + assert(pResult); - method::get_result(reason, ppResult); + method::get_result(reason, pResult); switch (reason) { case EapPeerMethodResultSuccess: { diff --git a/lib/TTLS/include/Method.h b/lib/TTLS/include/Method.h index db362ee..0a0b9c2 100644 --- a/lib/TTLS/include/Method.h +++ b/lib/TTLS/include/Method.h @@ -115,7 +115,7 @@ namespace eap /// virtual void get_result( _In_ EapPeerMethodResultReason reason, - _Inout_ EapPeerMethodResult *ppResult); + _Inout_ EapPeerMethodResult *pResult); /// @} diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h index d1238bb..223c085 100644 --- a/lib/TTLS/include/Module.h +++ b/lib/TTLS/include/Module.h @@ -165,7 +165,7 @@ namespace eap virtual void get_result( _In_ EAP_SESSION_HANDLE hSession, _In_ EapPeerMethodResultReason reason, - _Inout_ EapPeerMethodResult *ppResult); + _Inout_ EapPeerMethodResult *pResult); /// /// Obtains the user interface context from the EAP method. diff --git a/lib/TTLS/src/Method.cpp b/lib/TTLS/src/Method.cpp index c56acb9..faec620 100644 --- a/lib/TTLS/src/Method.cpp +++ b/lib/TTLS/src/Method.cpp @@ -116,17 +116,17 @@ void eap::method_ttls::get_response_packet( void eap::method_ttls::get_result( _In_ EapPeerMethodResultReason reason, - _Inout_ EapPeerMethodResult *ppResult) + _Inout_ EapPeerMethodResult *pResult) { // Do the TLS. - method_tls::get_result(reason, ppResult); + method_tls::get_result(reason, pResult); if (m_phase == phase_application_data) { // Get inner method result. EapPeerMethodResult result = {}; m_inner->get_result(reason, &result); if (result.fSaveConnectionData) - ppResult->fSaveConnectionData = TRUE; + pResult->fSaveConnectionData = TRUE; if (m_inner->m_cfg.m_last_status != config_method::status_success) { // Inner method admitted problems, so autentication must have proceeded to inner authentication already. diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index 8abff68..856c087 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -261,35 +261,35 @@ void eap::peer_ttls::get_response_packet( void eap::peer_ttls::get_result( _In_ EAP_SESSION_HANDLE hSession, _In_ EapPeerMethodResultReason reason, - _Inout_ EapPeerMethodResult *ppResult) + _Inout_ EapPeerMethodResult *pResult) { session *s = static_cast(hSession); - s->m_method->get_result(reason, ppResult); + s->m_method->get_result(reason, pResult); s->m_eap_attr_desc.dwNumberOfAttributes = (DWORD)s->m_method->m_eap_attr.size(); s->m_eap_attr_desc.pAttribs = s->m_method->m_eap_attr.data(); - ppResult->pAttribArray = &s->m_eap_attr_desc; + pResult->pAttribArray = &s->m_eap_attr_desc; // Do not report failure to EapHost, as it will not save updated configuration then. But we need it to save it, to alert user on next connection attempt. // EapHost is well aware of the failed condition. - //ppResult->fIsSuccess = FALSE; - //ppResult->dwFailureReasonCode = EAP_E_AUTHENTICATION_FAILED; - ppResult->fIsSuccess = TRUE; - ppResult->dwFailureReasonCode = ERROR_SUCCESS; + //pResult->fIsSuccess = FALSE; + //pResult->dwFailureReasonCode = EAP_E_AUTHENTICATION_FAILED; + pResult->fIsSuccess = TRUE; + pResult->dwFailureReasonCode = ERROR_SUCCESS; - if (ppResult->fSaveConnectionData) { - pack(s->m_cfg, &ppResult->pConnectionData, &ppResult->dwSizeofConnectionData); + if (pResult->fSaveConnectionData) { + pack(s->m_cfg, &pResult->pConnectionData, &pResult->dwSizeofConnectionData); if (s->m_blob_cfg) free_memory(s->m_blob_cfg); - s->m_blob_cfg = ppResult->pConnectionData; + s->m_blob_cfg = pResult->pConnectionData; } #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE - ppResult->fSaveUserData = TRUE; - pack(s->m_cred, &ppResult->pUserData, &ppResult->dwSizeofUserData); + pResult->fSaveUserData = TRUE; + pack(s->m_cred, &pResult->pUserData, &pResult->dwSizeofUserData); if (s->m_blob_cred) free_memory(s->m_blob_cred); - s->m_blob_cred = ppResult->pUserData; + s->m_blob_cred = pResult->pUserData; #endif } From 4722c42903ab3bc4cdd3d0b1959bce53c2da8491 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 24 Oct 2016 14:11:15 +0200 Subject: [PATCH 43/54] Incorrect pEapOutput in method::set_ui_context() methods fixed # Conflicts: # lib/EAPBase/include/Method.h # lib/EAPBase/src/Method.cpp # lib/TTLS/include/Method.h # lib/TTLS/src/Method.cpp --- EAPMethods/src/Main.cpp | 10 +++++----- lib/EAPBase/include/Module.h | 2 +- lib/TTLS/include/Module.h | 2 +- lib/TTLS/src/Module.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp index 6f444a1..e070b1f 100644 --- a/EAPMethods/src/Main.cpp +++ b/EAPMethods/src/Main.cpp @@ -537,11 +537,11 @@ DWORD APIENTRY EapPeerGetUIContext( /// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx) /// DWORD APIENTRY EapPeerSetUIContext( - _In_ EAP_SESSION_HANDLE hSession, - _In_ DWORD dwUIContextDataSize, - _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, - _In_ /*const*/ EapPeerMethodOutput *pEapOutput, - _Out_ EAP_ERROR **ppEapError) + _In_ EAP_SESSION_HANDLE hSession, + _In_ DWORD dwUIContextDataSize, + _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, + _Out_ EapPeerMethodOutput *pEapOutput, + _Out_ EAP_ERROR **ppEapError) { DWORD dwResult = ERROR_SUCCESS; event_fn_auto_ret event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult)); diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index 069d1ef..eaf4d47 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -762,7 +762,7 @@ namespace eap _In_ EAP_SESSION_HANDLE hSession, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput) = 0; + _Out_ EapPeerMethodOutput *pEapOutput) = 0; /// /// Obtains an array of EAP response attributes from the EAP method. diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h index 223c085..edcc02a 100644 --- a/lib/TTLS/include/Module.h +++ b/lib/TTLS/include/Module.h @@ -190,7 +190,7 @@ namespace eap _In_ EAP_SESSION_HANDLE hSession, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// /// Obtains an array of EAP response attributes from the EAP method. diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index 856c087..206eab5 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -311,7 +311,7 @@ void eap::peer_ttls::set_ui_context( _In_ EAP_SESSION_HANDLE hSession, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput) + _Out_ EapPeerMethodOutput *pEapOutput) { UNREFERENCED_PARAMETER(hSession); UNREFERENCED_PARAMETER(pUIContextData); From f71ff1fb8cf2b0d9a71df03a5fd497ee5f340004 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 24 Oct 2016 14:12:24 +0200 Subject: [PATCH 44/54] new wxExtend library version --- lib/wxExtend | 2 +- output/locale/.gitignore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/wxExtend b/lib/wxExtend index 525f246..a7ea95b 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit 525f24674e886e077ce985bd78ebcc8a95425578 +Subproject commit a7ea95bc9bf10ef6bd53796ebff89f33dc30fb85 diff --git a/output/locale/.gitignore b/output/locale/.gitignore index f17e7e7..a9f0038 100644 --- a/output/locale/.gitignore +++ b/output/locale/.gitignore @@ -1,4 +1,4 @@ */EAPTTLSUI.mo */EventMonitor.mo -*/wxExtend14.mo +*/wxExtend*.mo */wxstd.mo From d08488d9165a66bcbd9b2a8086025fcb252aaabe Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 24 Oct 2016 14:42:56 +0200 Subject: [PATCH 45/54] pEapOutput Prefast specifier for set_response_attributes() methods changed # Conflicts: # lib/EAPBase/include/Method.h # lib/EAPBase/src/Method.cpp # lib/TTLS/include/Method.h # lib/TTLS/src/Method.cpp --- lib/EAPBase/include/Module.h | 2 +- lib/TTLS/include/Module.h | 2 +- lib/TTLS/src/Module.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index eaf4d47..a20132d 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -781,7 +781,7 @@ namespace eap virtual void set_response_attributes( _In_ EAP_SESSION_HANDLE hSession, _In_ const EapAttributes *pAttribs, - _Inout_ EapPeerMethodOutput *pEapOutput) = 0; + _Out_ EapPeerMethodOutput *pEapOutput) = 0; /// @} }; diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h index edcc02a..5689f9e 100644 --- a/lib/TTLS/include/Module.h +++ b/lib/TTLS/include/Module.h @@ -209,7 +209,7 @@ namespace eap virtual void set_response_attributes( _In_ EAP_SESSION_HANDLE hSession, _In_ const EapAttributes *pAttribs, - _Inout_ EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// @} diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index 206eab5..df65d3f 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -334,9 +334,9 @@ void eap::peer_ttls::get_response_attributes( void eap::peer_ttls::set_response_attributes( - _In_ EAP_SESSION_HANDLE hSession, - _In_ const EapAttributes *pAttribs, - _Inout_ EapPeerMethodOutput *pEapOutput) + _In_ EAP_SESSION_HANDLE hSession, + _In_ const EapAttributes *pAttribs, + _Out_ EapPeerMethodOutput *pEapOutput) { UNREFERENCED_PARAMETER(hSession); UNREFERENCED_PARAMETER(pAttribs); From 26a7b7dab767c0cf7df8e8170d2c6dd867e817e3 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 24 Oct 2016 14:55:31 +0200 Subject: [PATCH 46/54] pEapOutput Prefast specifier for process_request_packet() methods changed # Conflicts: # lib/EAPMsg/include/Method.h # lib/EAPMsg/src/Method.cpp --- lib/EAPBase/include/Method.h | 2 +- lib/EAPBase/include/Module.h | 2 +- lib/MSCHAPv2/include/Method.h | 2 +- lib/MSCHAPv2/src/Method.cpp | 2 +- lib/PAP/include/Method.h | 2 +- lib/PAP/src/Method.cpp | 2 +- lib/TLS/include/Method.h | 2 +- lib/TLS/src/Method.cpp | 2 +- lib/TTLS/include/Method.h | 2 +- lib/TTLS/include/Module.h | 2 +- lib/TTLS/src/Method.cpp | 2 +- lib/TTLS/src/Module.cpp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/EAPBase/include/Method.h b/lib/EAPBase/include/Method.h index 892cd50..b8ea146 100644 --- a/lib/EAPBase/include/Method.h +++ b/lib/EAPBase/include/Method.h @@ -108,7 +108,7 @@ namespace eap virtual void process_request_packet( _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput) = 0; + _Out_ EapPeerMethodOutput *pEapOutput) = 0; /// /// Obtains a response packet from the EAP method. diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index a20132d..7bc529e 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -717,7 +717,7 @@ namespace eap _In_ EAP_SESSION_HANDLE hSession, _In_bytecount_(dwReceivedPacketSize) const EapPacket *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput) = 0; + _Out_ EapPeerMethodOutput *pEapOutput) = 0; /// /// Obtains a response packet from the EAP method. diff --git a/lib/MSCHAPv2/include/Method.h b/lib/MSCHAPv2/include/Method.h index 8f32553..239daf4 100644 --- a/lib/MSCHAPv2/include/Method.h +++ b/lib/MSCHAPv2/include/Method.h @@ -90,7 +90,7 @@ namespace eap virtual void process_request_packet( _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// @} diff --git a/lib/MSCHAPv2/src/Method.cpp b/lib/MSCHAPv2/src/Method.cpp index 7bb229e..15005f7 100644 --- a/lib/MSCHAPv2/src/Method.cpp +++ b/lib/MSCHAPv2/src/Method.cpp @@ -90,7 +90,7 @@ void eap::method_mschapv2::begin_session( void eap::method_mschapv2::process_request_packet( _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput) + _Out_ EapPeerMethodOutput *pEapOutput) { assert(pReceivedPacket || dwReceivedPacketSize == 0); assert(pEapOutput); diff --git a/lib/PAP/include/Method.h b/lib/PAP/include/Method.h index 8a9bf11..0f47c1c 100644 --- a/lib/PAP/include/Method.h +++ b/lib/PAP/include/Method.h @@ -88,7 +88,7 @@ namespace eap virtual void process_request_packet( _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// @} diff --git a/lib/PAP/src/Method.cpp b/lib/PAP/src/Method.cpp index 8d197d6..1a602f7 100644 --- a/lib/PAP/src/Method.cpp +++ b/lib/PAP/src/Method.cpp @@ -72,7 +72,7 @@ void eap::method_pap::begin_session( void eap::method_pap::process_request_packet( _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput) + _Out_ EapPeerMethodOutput *pEapOutput) { UNREFERENCED_PARAMETER(pReceivedPacket); assert(pReceivedPacket || dwReceivedPacketSize == 0); diff --git a/lib/TLS/include/Method.h b/lib/TLS/include/Method.h index 72627f6..d473e9c 100644 --- a/lib/TLS/include/Method.h +++ b/lib/TLS/include/Method.h @@ -110,7 +110,7 @@ namespace eap virtual void process_request_packet( _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// /// Obtains a response packet from the EAP method. diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index 637304a..683da01 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -249,7 +249,7 @@ void eap::method_tls::begin_session( void eap::method_tls::process_request_packet( _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput) + _Out_ EapPeerMethodOutput *pEapOutput) { assert(pReceivedPacket && dwReceivedPacketSize >= 4); assert(pEapOutput); diff --git a/lib/TTLS/include/Method.h b/lib/TTLS/include/Method.h index 0a0b9c2..8aedd73 100644 --- a/lib/TTLS/include/Method.h +++ b/lib/TTLS/include/Method.h @@ -97,7 +97,7 @@ namespace eap virtual void process_request_packet( _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// /// Obtains a response packet from the EAP method. diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h index 5689f9e..64d950a 100644 --- a/lib/TTLS/include/Module.h +++ b/lib/TTLS/include/Module.h @@ -145,7 +145,7 @@ namespace eap _In_ EAP_SESSION_HANDLE hSession, _In_bytecount_(dwReceivedPacketSize) const EapPacket *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// /// Obtains a response packet from the EAP method. diff --git a/lib/TTLS/src/Method.cpp b/lib/TTLS/src/Method.cpp index faec620..b532d1c 100644 --- a/lib/TTLS/src/Method.cpp +++ b/lib/TTLS/src/Method.cpp @@ -85,7 +85,7 @@ void eap::method_ttls::end_session() void eap::method_ttls::process_request_packet( _In_bytecount_(dwReceivedPacketSize) const void *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput) + _Out_ EapPeerMethodOutput *pEapOutput) { if (((const EapPacket*)pReceivedPacket)->Code == EapCodeRequest && (((const EapPacket*)pReceivedPacket)->Data[1] & packet_ttls::flags_start)) { // This is a start EAP-TTLS packet. diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index df65d3f..3c74a17 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -242,7 +242,7 @@ void eap::peer_ttls::process_request_packet( _In_ EAP_SESSION_HANDLE hSession, _In_bytecount_(dwReceivedPacketSize) const EapPacket *pReceivedPacket, _In_ DWORD dwReceivedPacketSize, - _Inout_ EapPeerMethodOutput *pEapOutput) + _Out_ EapPeerMethodOutput *pEapOutput) { assert(dwReceivedPacketSize == ntohs(*(WORD*)pReceivedPacket->Length)); static_cast(hSession)->m_method->process_request_packet(pReceivedPacket, dwReceivedPacketSize, pEapOutput); From 094fce2b2fe00a103f132cbd84326f454066873e Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 25 Oct 2016 13:05:36 +0200 Subject: [PATCH 47/54] event_data::blank redefined to prevent confusion with NULL values causing premature varadic argument termination leading to incomplete event data --- lib/WinStd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/WinStd b/lib/WinStd index 21ba0df..ce1bc59 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 21ba0dfc5f35d551d8c613751a9ea87365744cfb +Subproject commit ce1bc5951efad4d9203a24083619fa8069c30323 From d5870f12521bf57cc4ebafaf00b85c81bbf8dfe1 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 25 Oct 2016 13:04:12 +0200 Subject: [PATCH 48/54] Configuration value logging replaced with array variant instead of varadic event_provider::write() method for performance reasons --- lib/EAPBase/include/Module.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index 7bc529e..c5ba7c4 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -147,7 +147,12 @@ namespace eap /// inline void log_config(_In_z_ LPCWSTR name, _In_z_ LPCWSTR value) const { - m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_UNICODE_STRING, winstd::event_data(name), winstd::event_data(value), winstd::event_data::blank); + EVENT_DATA_DESCRIPTOR desc[] = { + winstd::event_data(name ), + winstd::event_data(value) + }; + + m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_UNICODE_STRING, _countof(desc), desc); } /// @@ -191,7 +196,12 @@ namespace eap /// inline void log_config(_In_z_ LPCWSTR name, _In_ bool value) const { - m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_BOOL, winstd::event_data(name), winstd::event_data((int)value), winstd::event_data::blank); + EVENT_DATA_DESCRIPTOR desc[] = { + winstd::event_data( name ), + winstd::event_data((int)value) + }; + + m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_BOOL, _countof(desc), desc); } /// From 64c38379080123c7182b0b4246abace23f53d711 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 25 Oct 2016 13:33:13 +0200 Subject: [PATCH 49/54] Zero-length event property data retrieval fixed --- lib/WinStd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/WinStd b/lib/WinStd index ce1bc59..3872ddb 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit ce1bc5951efad4d9203a24083619fa8069c30323 +Subproject commit 3872ddb4655d5925b0890da3f80b2f847f3236ed From 4bbc752995c58205ac27e242cbb113ae7b6daffc Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 25 Oct 2016 13:37:39 +0200 Subject: [PATCH 50/54] Discrete output of credentials to event log centralized # Conflicts: # lib/EapHost/src/Credentials.cpp # lib/EapHost/src/StdAfx.h # lib/Events/res/EventsETW.man --- lib/EAPBase/include/Module.h | 46 ++++++++++++++++++++++++++++++-- lib/EAPBase/src/Credentials.cpp | 16 ++--------- lib/Events/res/EventsETW.man | Bin 103654 -> 105862 bytes lib/TLS/src/Credentials.cpp | 11 ++++++-- lib/WinStd | 2 +- 5 files changed, 56 insertions(+), 19 deletions(-) diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index c5ba7c4..5378cd4 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -159,7 +159,7 @@ namespace eap /// Logs string list config value /// template - inline void log_config(_In_z_ LPCWSTR name, _In_z_ const std::list, _Ax_list> &value) const + inline void log_config(_In_z_ LPCWSTR name, _In_ const std::list, _Ax_list> &value) const { // Prepare a table of event data descriptors. std::vector desc; @@ -177,7 +177,7 @@ namespace eap /// Logs Unicode string list config value /// template - inline void log_config(_In_z_ LPCWSTR name, _In_z_ const std::list, _Ax_list> &value) const + inline void log_config(_In_z_ LPCWSTR name, _In_ const std::list, _Ax_list> &value) const { // Prepare a table of event data descriptors. std::vector desc; @@ -204,6 +204,48 @@ namespace eap m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_BOOL, _countof(desc), desc); } + /// + /// Logs binary config value + /// + inline void log_config(_In_z_ LPCWSTR name, _In_bytecount_(size) const void *data, _In_ ULONG size) const + { + EVENT_DATA_DESCRIPTOR desc[] = { + winstd::event_data( name), + winstd::event_data( size), + winstd::event_data(data, size) + }; + + m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_BINARY, _countof(desc), desc); + } + + /// + /// Discretely logs Unicode string config value + /// + /// If \c _DEBUG is set the value is masked. + /// + inline void log_config_discrete(_In_z_ LPCWSTR name, _In_z_ LPCWSTR value) const + { +#ifdef _DEBUG + log_config(name, value); +#else + log_config(name, value ? value[0] ? L"********" : L"" : NULL); +#endif + } + + /// + /// Discretely logs binary config value + /// + /// If \c _DEBUG is set the value is masked. + /// + inline void log_config_discrete(_In_z_ LPCWSTR name, _In_bytecount_(size) const void *data, _In_ ULONG size) const + { +#ifdef _DEBUG + log_config(name, data, size); +#else + log_config(name, data ? size ? L"********" : L"" : NULL); +#endif + } + /// /// Logs event /// diff --git a/lib/EAPBase/src/Credentials.cpp b/lib/EAPBase/src/Credentials.cpp index 0f36497..2e8bd5c 100644 --- a/lib/EAPBase/src/Credentials.cpp +++ b/lib/EAPBase/src/Credentials.cpp @@ -319,13 +319,7 @@ void eap::credentials_pass::load(_In_ IXMLDOMNode *pConfigRoot) SecureZeroMemory((BSTR)password, sizeof(OLECHAR)*password.length()); } - m_module.log_config((xpath + L"/Password").c_str(), -#ifdef _DEBUG - m_password.c_str() -#else - L"********" -#endif - ); + m_module.log_config_discrete((xpath + L"/Password").c_str(), m_password.c_str()); } @@ -420,13 +414,7 @@ void eap::credentials_pass::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned wstring xpath(pszTargetName); m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str()); - m_module.log_config((xpath + L"/Password").c_str(), -#ifdef _DEBUG - m_password.c_str() -#else - L"********" -#endif - ); + m_module.log_config_discrete((xpath + L"/Password").c_str(), m_password.c_str()); } diff --git a/lib/Events/res/EventsETW.man b/lib/Events/res/EventsETW.man index 2e586a0062936175ad85cb8cd3caf49946797ed6..3f5fc8ba81dcc3c2249bac7a0ab68c067225a1bd 100644 GIT binary patch delta 383 zcmaF1lC5nw+lIa()^LVQhP=t~d6y?AG_kN3GZZrDFCX-pKSQWceBHxDNgKW40<3q z*^o7Nah^6@vnUDudB1sFOxzz`{8NS)4Dz*xAQubA=4$vtxJR^pE)D6`OV1` ZCq|R)fjo?sY0G~VF>-8QSIu}s5dd}l9{~UW diff --git a/lib/TLS/src/Credentials.cpp b/lib/TLS/src/Credentials.cpp index 7b76cb8..db4afac 100644 --- a/lib/TLS/src/Credentials.cpp +++ b/lib/TLS/src/Credentials.cpp @@ -140,7 +140,11 @@ void eap::credentials_tls::load(_In_ IXMLDOMNode *pConfigRoot) m_cert.create(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, aData.data(), (DWORD)aData.size()); } } - m_module.log_config((xpath + L"/ClientCertificate").c_str(), get_name().c_str()); + + if (m_cert) + m_module.log_config_discrete((xpath + L"/ClientCertificate").c_str(), m_cert->pbCertEncoded, m_cert->cbCertEncoded); + else + m_module.log_config_discrete((xpath + L"/ClientCertificate").c_str(), NULL, 0); } @@ -234,7 +238,10 @@ void eap::credentials_tls::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned wstring xpath(pszTargetName); m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str()); - m_module.log_config((xpath + L"/Certificate").c_str(), get_name().c_str()); + if (m_cert) + m_module.log_config_discrete((xpath + L"/Certificate").c_str(), m_cert->pbCertEncoded, m_cert->cbCertEncoded); + else + m_module.log_config_discrete((xpath + L"/Certificate").c_str(), NULL, 0); } diff --git a/lib/WinStd b/lib/WinStd index 3872ddb..ce1bc59 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 3872ddb4655d5925b0890da3f80b2f847f3236ed +Subproject commit ce1bc5951efad4d9203a24083619fa8069c30323 From aaeb6415ee893f1bf10bc35eafff238ae9b50836 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 25 Oct 2016 14:13:12 +0200 Subject: [PATCH 51/54] Unable to set blank certificate credentials issue fixed # Conflicts: # lib/WinStd --- lib/WinStd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/WinStd b/lib/WinStd index ce1bc59..64d0ae5 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit ce1bc5951efad4d9203a24083619fa8069c30323 +Subproject commit 64d0ae5e6951ec973f46b5eae6a5f7f41c001881 From 2ff425713bb3351fc4bd88b7eb1bede5fb585eca Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 1 Nov 2016 05:56:10 +0100 Subject: [PATCH 52/54] EventMonitor's wxFormBuilder resources moved to res sub-folder --- Doxyfile | 1 + EventMonitor/EventMonitor.vcxproj | 6 +++--- EventMonitor/EventMonitor.vcxproj.filters | 6 +++--- EventMonitor/Frame.h | 2 -- EventMonitor/LogPanel.h | 2 +- EventMonitor/{ => res}/wxEventMonitor_UI.cpp | 2 +- EventMonitor/{ => res}/wxEventMonitor_UI.fbp | 2 +- EventMonitor/{ => res}/wxEventMonitor_UI.h | 0 8 files changed, 10 insertions(+), 11 deletions(-) rename EventMonitor/{ => res}/wxEventMonitor_UI.cpp (95%) rename EventMonitor/{ => res}/wxEventMonitor_UI.fbp (98%) rename EventMonitor/{ => res}/wxEventMonitor_UI.h (100%) diff --git a/Doxyfile b/Doxyfile index 68af585..07696cb 100644 --- a/Doxyfile +++ b/Doxyfile @@ -790,6 +790,7 @@ RECURSIVE = YES # run. EXCLUDE = \ + EventMonitor\res \ lib\EAPBase_UI\res \ lib\TLS_UI\res \ lib\TTLS_UI\res \ diff --git a/EventMonitor/EventMonitor.vcxproj b/EventMonitor/EventMonitor.vcxproj index bbcef6e..47fd917 100644 --- a/EventMonitor/EventMonitor.vcxproj +++ b/EventMonitor/EventMonitor.vcxproj @@ -91,7 +91,7 @@ - + @@ -104,7 +104,7 @@ Create Create - + @@ -120,7 +120,7 @@ - + diff --git a/EventMonitor/EventMonitor.vcxproj.filters b/EventMonitor/EventMonitor.vcxproj.filters index 31c876f..c7d73f9 100644 --- a/EventMonitor/EventMonitor.vcxproj.filters +++ b/EventMonitor/EventMonitor.vcxproj.filters @@ -30,7 +30,7 @@ Header Files - + Header Files @@ -50,7 +50,7 @@ Source Files - + Source Files @@ -64,7 +64,7 @@ - + Resource Files diff --git a/EventMonitor/Frame.h b/EventMonitor/Frame.h index 9e45563..8838639 100644 --- a/EventMonitor/Frame.h +++ b/EventMonitor/Frame.h @@ -32,8 +32,6 @@ class wxPersistentEventMonitorFrame; #include "LogPanel.h" -#include "wxEventMonitor_UI.h" - #include #include #include diff --git a/EventMonitor/LogPanel.h b/EventMonitor/LogPanel.h index 108223d..3bb1219 100644 --- a/EventMonitor/LogPanel.h +++ b/EventMonitor/LogPanel.h @@ -30,7 +30,7 @@ class wxPersistentEventMonitorLogPanel; #pragma once -#include "wxEventMonitor_UI.h" +#include "res/wxEventMonitor_UI.h" #include diff --git a/EventMonitor/wxEventMonitor_UI.cpp b/EventMonitor/res/wxEventMonitor_UI.cpp similarity index 95% rename from EventMonitor/wxEventMonitor_UI.cpp rename to EventMonitor/res/wxEventMonitor_UI.cpp index a7b2248..99a35d8 100644 --- a/EventMonitor/wxEventMonitor_UI.cpp +++ b/EventMonitor/res/wxEventMonitor_UI.cpp @@ -7,7 +7,7 @@ #include "StdAfx.h" -#include "ETWLog.h" +#include "../ETWLog.h" #include "wxEventMonitor_UI.h" diff --git a/EventMonitor/wxEventMonitor_UI.fbp b/EventMonitor/res/wxEventMonitor_UI.fbp similarity index 98% rename from EventMonitor/wxEventMonitor_UI.fbp rename to EventMonitor/res/wxEventMonitor_UI.fbp index f48cab7..1dc6762 100644 --- a/EventMonitor/wxEventMonitor_UI.fbp +++ b/EventMonitor/res/wxEventMonitor_UI.fbp @@ -133,7 +133,7 @@ 1 wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL - wxETWListCtrl; ETWLog.h + wxETWListCtrl; ../ETWLog.h 0 diff --git a/EventMonitor/wxEventMonitor_UI.h b/EventMonitor/res/wxEventMonitor_UI.h similarity index 100% rename from EventMonitor/wxEventMonitor_UI.h rename to EventMonitor/res/wxEventMonitor_UI.h From 438395062b7ff41fefd08d49597c0b25e5711037 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 1 Nov 2016 06:37:37 +0100 Subject: [PATCH 53/54] Orphaned PAP.cpp files removed --- lib/MSCHAPv2/src/PAP.cpp | 60 ---------------------------------------- lib/PAP/src/PAP.cpp | 60 ---------------------------------------- 2 files changed, 120 deletions(-) delete mode 100644 lib/MSCHAPv2/src/PAP.cpp delete mode 100644 lib/PAP/src/PAP.cpp diff --git a/lib/MSCHAPv2/src/PAP.cpp b/lib/MSCHAPv2/src/PAP.cpp deleted file mode 100644 index 0a362bf..0000000 --- a/lib/MSCHAPv2/src/PAP.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - Copyright 2015-2016 Amebis - Copyright 2016 GÉANT - - This file is part of GÉANTLink. - - GÉANTLink is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - GÉANTLink is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GÉANTLink. If not, see . -*/ - -#include "StdAfx.h" - - -////////////////////////////////////////////////////////////////////// -// eap::credentials_mschapv2 -////////////////////////////////////////////////////////////////////// - -eap::credentials_mschapv2::credentials_mschapv2(_In_ module &mod) : credentials_pass(mod) -{ -} - - -eap::credentials_mschapv2::credentials_mschapv2(_In_ const credentials_mschapv2 &other) : - credentials_pass(other) -{ -} - - -eap::credentials_mschapv2::credentials_mschapv2(_Inout_ credentials_mschapv2 &&other) : - credentials_pass(std::move(other)) -{ -} - - -eap::credentials_mschapv2& eap::credentials_mschapv2::operator=(_In_ const credentials_mschapv2 &other) -{ - if (this != &other) - (credentials_pass&)*this = other; - - return *this; -} - - -eap::credentials_mschapv2& eap::credentials_mschapv2::operator=(_Inout_ credentials_mschapv2 &&other) -{ - if (this != &other) - (credentials_pass&&)*this = std::move(other); - - return *this; -} diff --git a/lib/PAP/src/PAP.cpp b/lib/PAP/src/PAP.cpp deleted file mode 100644 index ef1337b..0000000 --- a/lib/PAP/src/PAP.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - Copyright 2015-2016 Amebis - Copyright 2016 GÉANT - - This file is part of GÉANTLink. - - GÉANTLink is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - GÉANTLink is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GÉANTLink. If not, see . -*/ - -#include "StdAfx.h" - - -////////////////////////////////////////////////////////////////////// -// eap::credentials_pap -////////////////////////////////////////////////////////////////////// - -eap::credentials_pap::credentials_pap(_In_ module &mod) : credentials_pass(mod) -{ -} - - -eap::credentials_pap::credentials_pap(_In_ const credentials_pap &other) : - credentials_pass(other) -{ -} - - -eap::credentials_pap::credentials_pap(_Inout_ credentials_pap &&other) : - credentials_pass(std::move(other)) -{ -} - - -eap::credentials_pap& eap::credentials_pap::operator=(_In_ const credentials_pap &other) -{ - if (this != &other) - (credentials_pass&)*this = other; - - return *this; -} - - -eap::credentials_pap& eap::credentials_pap::operator=(_Inout_ credentials_pap &&other) -{ - if (this != &other) - (credentials_pass&&)*this = std::move(other); - - return *this; -} From ff2871f12662c5a8153250429f73dff5c398a858 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 1 Nov 2016 07:02:45 +0100 Subject: [PATCH 54/54] WIN1250 >> UTF-8 --- EventMonitor/App.cpp | 12 ++++++------ EventMonitor/App.h | 12 ++++++------ EventMonitor/ETWLog.cpp | 12 ++++++------ EventMonitor/ETWLog.h | 12 ++++++------ EventMonitor/Frame.cpp | 12 ++++++------ EventMonitor/Frame.h | 12 ++++++------ EventMonitor/LogPanel.cpp | 12 ++++++------ EventMonitor/LogPanel.h | 12 ++++++------ lib/EAPBase/src/EAP.cpp | 12 ++++++------ lib/EAPBase/src/Method.cpp | 12 ++++++------ lib/EAPBase_UI/include/wxEAP_UIBase.h | 12 ++++++------ lib/EAPBase_UI/src/Module.cpp | 12 ++++++------ lib/MSCHAPv2/include/MSCHAPv2.h | 12 ++++++------ lib/MSCHAPv2/include/Method.h | 12 ++++++------ lib/MSCHAPv2/src/MSCHAPv2.cpp | 12 ++++++------ lib/MSCHAPv2/src/Method.cpp | 12 ++++++------ lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp | 12 ++++++------ lib/PAP/include/Method.h | 12 ++++++------ lib/PAP/src/Method.cpp | 12 ++++++------ lib/PAP_UI/src/PAP_UI.cpp | 12 ++++++------ lib/TLS/include/Method.h | 12 ++++++------ lib/TLS/include/TLS.h | 12 ++++++------ lib/TLS/src/Method.cpp | 12 ++++++------ lib/TLS/src/TLS.cpp | 12 ++++++------ lib/TTLS/include/TTLS.h | 12 ++++++------ lib/TTLS_UI/src/TTLS_UI.cpp | 12 ++++++------ lib/WinStd | 2 +- lib/wxExtend | 2 +- 28 files changed, 158 insertions(+), 158 deletions(-) diff --git a/EventMonitor/App.cpp b/EventMonitor/App.cpp index 53168fd..29460a4 100644 --- a/EventMonitor/App.cpp +++ b/EventMonitor/App.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/EventMonitor/App.h b/EventMonitor/App.h index e318603..398e213 100644 --- a/EventMonitor/App.h +++ b/EventMonitor/App.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ /// diff --git a/EventMonitor/ETWLog.cpp b/EventMonitor/ETWLog.cpp index bf1aca2..38d96b4 100644 --- a/EventMonitor/ETWLog.cpp +++ b/EventMonitor/ETWLog.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/EventMonitor/ETWLog.h b/EventMonitor/ETWLog.h index 829f862..bd62237 100644 --- a/EventMonitor/ETWLog.h +++ b/EventMonitor/ETWLog.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include diff --git a/EventMonitor/Frame.cpp b/EventMonitor/Frame.cpp index b07f305..ae38ad8 100644 --- a/EventMonitor/Frame.cpp +++ b/EventMonitor/Frame.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/EventMonitor/Frame.h b/EventMonitor/Frame.h index 8838639..bf92cba 100644 --- a/EventMonitor/Frame.h +++ b/EventMonitor/Frame.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ /// diff --git a/EventMonitor/LogPanel.cpp b/EventMonitor/LogPanel.cpp index ea94f75..ba0e049 100644 --- a/EventMonitor/LogPanel.cpp +++ b/EventMonitor/LogPanel.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/EventMonitor/LogPanel.h b/EventMonitor/LogPanel.h index 3bb1219..76cd6fa 100644 --- a/EventMonitor/LogPanel.h +++ b/EventMonitor/LogPanel.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ /// diff --git a/lib/EAPBase/src/EAP.cpp b/lib/EAPBase/src/EAP.cpp index 64e9072..419a65b 100644 --- a/lib/EAPBase/src/EAP.cpp +++ b/lib/EAPBase/src/EAP.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/EAPBase/src/Method.cpp b/lib/EAPBase/src/Method.cpp index 4421cf3..aa6d06c 100644 --- a/lib/EAPBase/src/Method.cpp +++ b/lib/EAPBase/src/Method.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/EAPBase_UI/include/wxEAP_UIBase.h b/lib/EAPBase_UI/include/wxEAP_UIBase.h index c24803d..ec561ee 100644 --- a/lib/EAPBase_UI/include/wxEAP_UIBase.h +++ b/lib/EAPBase_UI/include/wxEAP_UIBase.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ /// diff --git a/lib/EAPBase_UI/src/Module.cpp b/lib/EAPBase_UI/src/Module.cpp index a600c65..42c989f 100644 --- a/lib/EAPBase_UI/src/Module.cpp +++ b/lib/EAPBase_UI/src/Module.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/MSCHAPv2/include/MSCHAPv2.h b/lib/MSCHAPv2/include/MSCHAPv2.h index c51bf7c..ece4859 100644 --- a/lib/MSCHAPv2/include/MSCHAPv2.h +++ b/lib/MSCHAPv2/include/MSCHAPv2.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include diff --git a/lib/MSCHAPv2/include/Method.h b/lib/MSCHAPv2/include/Method.h index 239daf4..2db80d1 100644 --- a/lib/MSCHAPv2/include/Method.h +++ b/lib/MSCHAPv2/include/Method.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ namespace eap diff --git a/lib/MSCHAPv2/src/MSCHAPv2.cpp b/lib/MSCHAPv2/src/MSCHAPv2.cpp index 619ba31..be60ca7 100644 --- a/lib/MSCHAPv2/src/MSCHAPv2.cpp +++ b/lib/MSCHAPv2/src/MSCHAPv2.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/MSCHAPv2/src/Method.cpp b/lib/MSCHAPv2/src/Method.cpp index 15005f7..607a77c 100644 --- a/lib/MSCHAPv2/src/Method.cpp +++ b/lib/MSCHAPv2/src/Method.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp b/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp index 127788b..8e8c667 100644 --- a/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp +++ b/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/PAP/include/Method.h b/lib/PAP/include/Method.h index 0f47c1c..1b5ad73 100644 --- a/lib/PAP/include/Method.h +++ b/lib/PAP/include/Method.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ namespace eap diff --git a/lib/PAP/src/Method.cpp b/lib/PAP/src/Method.cpp index 1a602f7..116b623 100644 --- a/lib/PAP/src/Method.cpp +++ b/lib/PAP/src/Method.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/PAP_UI/src/PAP_UI.cpp b/lib/PAP_UI/src/PAP_UI.cpp index dde9520..407465a 100644 --- a/lib/PAP_UI/src/PAP_UI.cpp +++ b/lib/PAP_UI/src/PAP_UI.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/TLS/include/Method.h b/lib/TLS/include/Method.h index d473e9c..997992d 100644 --- a/lib/TLS/include/Method.h +++ b/lib/TLS/include/Method.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ namespace eap diff --git a/lib/TLS/include/TLS.h b/lib/TLS/include/TLS.h index 88cce47..6503bd3 100644 --- a/lib/TLS/include/TLS.h +++ b/lib/TLS/include/TLS.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "../../EAPBase/include/EAP.h" diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index 683da01..6868129 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/TLS/src/TLS.cpp b/lib/TLS/src/TLS.cpp index c511951..b2b4124 100644 --- a/lib/TLS/src/TLS.cpp +++ b/lib/TLS/src/TLS.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/TTLS/include/TTLS.h b/lib/TTLS/include/TTLS.h index 7f22386..7c8494d 100644 --- a/lib/TTLS/include/TTLS.h +++ b/lib/TTLS/include/TTLS.h @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ namespace eap diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index ba5cffc..141ef8a 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -1,21 +1,21 @@ -/* +/* Copyright 2015-2016 Amebis - Copyright 2016 GANT + Copyright 2016 GÉANT - This file is part of GANTLink. + This file is part of GÉANTLink. - GANTLink is free software: you can redistribute it and/or modify it + 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. - GANTLink is distributed in the hope that it will be useful, but + 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 GANTLink. If not, see . + along with GÉANTLink. If not, see . */ #include "StdAfx.h" diff --git a/lib/WinStd b/lib/WinStd index 64d0ae5..b2d27e9 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 64d0ae5e6951ec973f46b5eae6a5f7f41c001881 +Subproject commit b2d27e993a7a871dcf9346d2aae3c61458f3e7f2 diff --git a/lib/wxExtend b/lib/wxExtend index a7ea95b..7f31e51 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit a7ea95bc9bf10ef6bd53796ebff89f33dc30fb85 +Subproject commit 7f31e51fb07edba1fbf7862899174c19d6c04e4d