diff --git a/EAPMethods/locale/EAPMethods.pot b/EAPMethods/locale/EAPMethods.pot index 3d7fc91..1319cfb 100644 --- a/EAPMethods/locale/EAPMethods.pot +++ b/EAPMethods/locale/EAPMethods.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2020-02-06 16:51+0100\n" +"POT-Creation-Date: 2020-04-17 06:54+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -220,26 +220,14 @@ msgstr "" msgid "Helpdesk contact &information:" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:520 -msgid "¶" -msgstr "" - #: lib/EAPBase_UI/res/wxEAP_UI.cpp:527 msgid "Your helpdesk website address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:531 -msgid "*" -msgstr "" - #: lib/EAPBase_UI/res/wxEAP_UI.cpp:538 msgid "Your helpdesk e-mail address" msgstr "" -#: lib/EAPBase_UI/res/wxEAP_UI.cpp:542 -msgid ")" -msgstr "" - #: lib/EAPBase_UI/res/wxEAP_UI.cpp:549 msgid "Your helpdesk phone number" msgstr "" diff --git a/lib/EAPBase_UI/res/wxEAP_UI.cpp b/lib/EAPBase_UI/res/wxEAP_UI.cpp index fe793f7..0168b1e 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.cpp +++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp @@ -517,7 +517,7 @@ wxEAPProviderContactInfoPanelBase::wxEAPProviderContactInfoPanelBase( wxWindow* sb_provider_helpdesk_inner->SetFlexibleDirection( wxBOTH ); sb_provider_helpdesk_inner->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_provider_web_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("¶"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_web_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, L"\u00b6", wxDefaultPosition, wxDefaultSize, 0 ); m_provider_web_icon->Wrap( -1 ); m_provider_web_icon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Wingdings") ) ); @@ -528,7 +528,7 @@ wxEAPProviderContactInfoPanelBase::wxEAPProviderContactInfoPanelBase( wxWindow* sb_provider_helpdesk_inner->Add( m_provider_web, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, FromDIP(5) ); - m_provider_email_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("*"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_email_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, L"\u002a", wxDefaultPosition, wxDefaultSize, 0 ); m_provider_email_icon->Wrap( -1 ); m_provider_email_icon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Wingdings") ) ); @@ -539,7 +539,7 @@ wxEAPProviderContactInfoPanelBase::wxEAPProviderContactInfoPanelBase( wxWindow* sb_provider_helpdesk_inner->Add( m_provider_email, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, FromDIP(5) ); - m_provider_phone_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_phone_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, L"\u0029", wxDefaultPosition, wxDefaultSize, 0 ); m_provider_phone_icon->Wrap( -1 ); m_provider_phone_icon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Wingdings") ) ); diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp index 004dca1..8413315 100644 --- a/lib/EAPBase_UI/src/EAP_UI.cpp +++ b/lib/EAPBase_UI/src/EAP_UI.cpp @@ -150,7 +150,7 @@ void wxEAPNotePanel::CreateContactFields(const eap::config_provider &prov) wxFont font_wingdings(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Wingdings")); if (!prov.m_help_web.empty()) { - m_help_web_label = new wxStaticText(this, wxID_ANY, wxT("\xb6"), wxDefaultPosition, wxDefaultSize, 0); + m_help_web_label = new wxStaticText(this, wxID_ANY, L"\u00b6", wxDefaultPosition, wxDefaultSize, 0); m_help_web_label->Wrap(-1); m_help_web_label->SetFont(font_wingdings); sb_contact_tbl->Add(m_help_web_label, 0, wxEXPAND|wxALIGN_TOP, FromDIP(5)); @@ -161,7 +161,7 @@ void wxEAPNotePanel::CreateContactFields(const eap::config_provider &prov) } if (!prov.m_help_email.empty()) { - m_help_email_label = new wxStaticText(this, wxID_ANY, wxT("\x2a"), wxDefaultPosition, wxDefaultSize, 0); + m_help_email_label = new wxStaticText(this, wxID_ANY, L"\u002a", wxDefaultPosition, wxDefaultSize, 0); m_help_email_label->Wrap(-1); m_help_email_label->SetFont(font_wingdings); sb_contact_tbl->Add(m_help_email_label, 0, wxEXPAND|wxALIGN_TOP, FromDIP(5)); @@ -172,7 +172,7 @@ void wxEAPNotePanel::CreateContactFields(const eap::config_provider &prov) } if (!prov.m_help_phone.empty()) { - m_help_phone_label = new wxStaticText(this, wxID_ANY, wxT("\x29"), wxDefaultPosition, wxDefaultSize, 0); + m_help_phone_label = new wxStaticText(this, wxID_ANY, L"\u0029", wxDefaultPosition, wxDefaultSize, 0); m_help_phone_label->Wrap(-1); m_help_phone_label->SetFont(font_wingdings); sb_contact_tbl->Add(m_help_phone_label, 0, wxEXPAND|wxALIGN_TOP, FromDIP(5));