From 54be8bb71d416128c3e89471174d1897af736dd4 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 13 Nov 2016 13:31:14 +0000 Subject: [PATCH] Replaced _("") with wxT("") to stop error messages in gettext --- source/frmNewAccount-CardDAV2.cpp | 10 +++++----- source/widgets/XABContactMenu.cpp | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/frmNewAccount-CardDAV2.cpp b/source/frmNewAccount-CardDAV2.cpp index 214e84f..3798bbf 100644 --- a/source/frmNewAccount-CardDAV2.cpp +++ b/source/frmNewAccount-CardDAV2.cpp @@ -24,11 +24,11 @@ void frmNewAccount::RunCardDAV2Test( wxCommandEvent& event ){ NewAccountResult *ResultData = new NewAccountResult; lblServerConnResult->SetLabel(_("Testing...")); - lblCardDAVSupportResult->SetLabel(_("")); - lblServerResponse->SetLabel(_("")); - lblServerSSLResult->SetLabel(_("")); - lblServerSSLValid->SetLabel(_("")); - lblAbleToLoginResult->SetLabel(_("")); + lblCardDAVSupportResult->SetLabel(wxT("")); + lblServerResponse->SetLabel(wxT("")); + lblServerSSLResult->SetLabel(wxT("")); + lblServerSSLValid->SetLabel(wxT("")); + lblAbleToLoginResult->SetLabel(wxT("")); bool UsingSSLBypass = false; // Setup a CardDAV2 connection object for testing. diff --git a/source/widgets/XABContactMenu.cpp b/source/widgets/XABContactMenu.cpp index d643c06..c29149b 100644 --- a/source/widgets/XABContactMenu.cpp +++ b/source/widgets/XABContactMenu.cpp @@ -28,24 +28,24 @@ XABContactMenu::XABContactMenu(XABContactMenuType MenuTypeIn){ // Setup the menu items. - AppendMenuItem(wxT("opencontact"), _("Open Contact..."), _(""), ID_CONTACTMENU_OPEN, wxITEM_NORMAL); - AppendMenuItem(wxT("sep1"), _(""), _(""), ID_CONTACTMENU_SEPARATOR, wxITEM_SEPARATOR); + AppendMenuItem(wxT("opencontact"), _("Open Contact..."), wxT(""), ID_CONTACTMENU_OPEN, wxITEM_NORMAL); + AppendMenuItem(wxT("sep1"), wxT(""), wxT(""), ID_CONTACTMENU_SEPARATOR, wxITEM_SEPARATOR); if (MenuType == XABCONTACTMENU_MAIN){ // Setup up the add contact option if in the main window. - AppendMenuItem(wxT("newcontact"), _("New Contact..."), _(""), ID_CONTACTMENU_NEW, wxITEM_NORMAL); + AppendMenuItem(wxT("newcontact"), _("New Contact..."), wxT(""), ID_CONTACTMENU_NEW, wxITEM_NORMAL); } - AppendMenuItem(wxT("editcontact"), _("Edit Contact..."), _(""), ID_CONTACTMENU_EDIT, wxITEM_NORMAL); + AppendMenuItem(wxT("editcontact"), _("Edit Contact..."), wxT(""), ID_CONTACTMENU_EDIT, wxITEM_NORMAL); if (MenuType == XABCONTACTMENU_SEARCH){ // Setup up the reveal contact option if in the search window. - AppendMenuItem(wxT("revealcontact"), _("Reveal Contact..."), _(""), ID_CONTACTMENU_REVEAL, wxITEM_NORMAL); + AppendMenuItem(wxT("revealcontact"), _("Reveal Contact..."), wxT(""), ID_CONTACTMENU_REVEAL, wxITEM_NORMAL); } @@ -53,9 +53,9 @@ XABContactMenu::XABContactMenu(XABContactMenuType MenuTypeIn){ // Setup the delete and refresh contact options if in the main window. - AppendMenuItem(wxT("deletecontact"), _("Delete Contact..."), _(""), ID_CONTACTMENU_DELETE, wxITEM_NORMAL); - AppendMenuItem(wxT("sep2"), _(""), _(""), ID_CONTACTMENU_SEPARATOR, wxITEM_SEPARATOR); - AppendMenuItem(wxT("refreshab"), _("Refresh Address Book"), _(""), ID_CONTACTMENU_REFRESHAB, wxITEM_NORMAL); + AppendMenuItem(wxT("deletecontact"), _("Delete Contact..."), wxT(""), ID_CONTACTMENU_DELETE, wxITEM_NORMAL); + AppendMenuItem(wxT("sep2"), wxT(""), wxT(""), ID_CONTACTMENU_SEPARATOR, wxITEM_SEPARATOR); + AppendMenuItem(wxT("refreshab"), _("Refresh Address Book"), wxT(""), ID_CONTACTMENU_REFRESHAB, wxITEM_NORMAL); } -- 2.39.5