[Translation] no splits

CodeFormatter/codeformatterdlg.cpp

@@ -117,7 +117,7 @@ void CodeFormatterDlg::OnDelete(wxCommandEvent& event)
     }
 
     wxString formatter_name = m_dvListCtrl->GetItemText(item);
-    if (::wxMessageBox(_("Delete formatter '") + formatter_name + "'",
+    if (::wxMessageBox(wxString::Format(_("Delete formatter '%s'?"), formatter_name),
                        _("Delete formatter"),
                        wxYES_NO | wxCANCEL | wxCANCEL_DEFAULT | wxICON_QUESTION) != wxYES) {
         return;

DebugAdapterClient/DapDebuggerSettingsDlg.cpp

@@ -62,9 +62,10 @@ void DapDebuggerSettingsDlg::OnDelete(wxCommandEvent& event)
     }
 
     wxString name = m_notebook->GetPageText(sel);
-    if (::wxMessageBox(
-            _("Delete '") + name + "'", "CodeLite", wxYES_NO | wxCANCEL | wxCANCEL_DEFAULT | wxICON_WARNING, this) !=
-        wxYES) {
+    if (::wxMessageBox(wxString::Format(_("Delete '%s'"), name),
+                       "CodeLite",
+                       wxYES_NO | wxCANCEL | wxCANCEL_DEFAULT | wxICON_WARNING,
+                       this) != wxYES) {
         return;
     }
 

EOSWiki/eoswiki.cpp

@@ -82,7 +82,7 @@ void EOSWiki::CreateProject(const EOSProjectData& data)
     if (clCxxWorkspaceST::Get()->IsOpen()) {
         ProjectPtr proj = clCxxWorkspaceST::Get()->GetProject(data.GetName());
         if (proj) {
-            ::wxMessageBox(wxString() << _("A project with the same name: '") << data.GetName() << "'\nalready exists",
+            ::wxMessageBox(wxString::Format(_("A project with the same name: '%s'\nalready exists"), data.GetName()),
                            "CodeLite",
                            wxICON_ERROR | wxOK | wxOK_DEFAULT);
             return;

HelpPlugin/helpplugin.cpp

@@ -82,8 +82,7 @@ void HelpPlugin::OnEditorContextMenu(clContextMenuEvent& event)
     wxMenu* menu = event.GetMenu();
     wxBitmap helpBitmap = wxXmlResource::Get()->LoadBitmap("svn_info");
     menu->AppendSeparator();
-    wxString label;
-    label << _("Search the docs for '") << modSelection << "'";
+    wxString label = wxString::Format(_("Search the docs for '%s'"), modSelection);
     menu->Append(XRCID("ID_ZEAL_HELP"), label)->SetBitmap(helpBitmap);
     menu->AppendSeparator();
 }

LiteEditor/BuildOrderDialog.cpp

@@ -9,7 +9,7 @@ BuildOrderDialog::BuildOrderDialog(wxWindow* parent, const wxString& projectName
     : BuildOrderDialogBase(parent)
     , m_projectName(projectName)
 {
-    SetLabel(_("Edit build order for project '") + projectName + "'");
+    SetLabel(wxString::Format(_("Edit build order for project '%s'"), projectName));
 
     m_dvListCtrlProjects->SetSortFunction(
         [](clRowEntry* a, clRowEntry* b) { return a->GetLabel(0).CmpNoCase(b->GetLabel(0)) < 0; });

LiteEditor/CompilerMainPage.cpp

@@ -227,7 +227,7 @@ void CompilerMainPage::OnDeleteFileType(wxCommandEvent& event)
     wxDataViewItem item = m_dvListCtrlFileTemplates->RowToItem(sel);
     wxString filetype = m_dvListCtrlFileTemplates->GetItemText(item);
 
-    if (wxMessageBox(wxString() << _("Are you sure you want to delete '") << filetype << "'?",
+    if (wxMessageBox(wxString::Format(_("Are you sure you want to delete '%s'?"), filetype),
                      wxT("CodeLite"),
                      wxYES_NO | wxCANCEL) == wxYES) {
         m_dvListCtrlFileTemplates->DeleteItem(sel);

LiteEditor/edit_configuration.cpp

@@ -180,8 +180,7 @@ void EditConfigurationDialog::OnButtonDelete(wxCommandEvent& event)
     if(selection.IsEmpty()) {
         return;
     }
-    wxString msg(_("Remove configuration '"));
-    msg << selection << _("' ?");
+    wxString msg = wxString::Format(_("Remove configuration '%s'?"), selection);
     if(wxMessageBox(msg, _("Confirm"), wxYES_NO | wxCANCEL | wxICON_WARNING) == wxYES) {
         ProjectSettingsPtr settings = ManagerST::Get()->GetProjectSettings(m_projectName);
         if(settings) {

LiteEditor/edit_workspace_conf_dlg.cpp

@@ -115,8 +115,7 @@ void EditWorkspaceConfDlg::OnDelete(wxCommandEvent& event)
 
     // remove the requested workspace build configuration
     BuildMatrixPtr matrix = ManagerST::Get()->GetWorkspaceBuildMatrix();
-    wxString msg;
-    msg << _("Remove workspace configuration '") << delMe << wxT("' ?");
+    wxString msg = wxString::Format(_("Remove workspace configuration '%s'?"), delMe);
     if (wxMessageBox(msg, wxT("CodeLite"), wxICON_QUESTION | wxYES_NO | wxCANCEL) == wxYES) {
         matrix->RemoveConfiguration(delMe);
         // apply changes

LiteEditor/mainbook.cpp

@@ -380,8 +380,7 @@ bool MainBook::AskUserToSave(clEditor* editor)
         return true;
 
     // unsaved changes
-    wxString msg;
-    msg << _("Save changes to '") << editor->GetFileName().GetFullName() << wxT("' ?");
+    wxString msg = wxString::Format(_("Save changes to '%s'?"), editor->GetFileName().GetFullName());
     long style = wxYES_NO | wxICON_WARNING;
     if (!ManagerST::Get()->IsShutdownInProgress()) {
         style |= wxCANCEL;

Plugin/LSP/LanguageServerSettingsDlg.cpp

@@ -55,8 +55,10 @@ void LanguageServerSettingsDlg::OnDeleteLSP(wxCommandEvent& event)
     }
     wxString serverName = m_notebook->GetPageText(sel);
 
-    if (::wxMessageBox(wxString() << _("Are you sure you want to delete '") << serverName << "' ?", "CodeLite",
-                       wxICON_QUESTION | wxCENTRE | wxYES_NO | wxCANCEL | wxCANCEL_DEFAULT, this) != wxYES) {
+    if (::wxMessageBox(wxString::Format(_("Are you sure you want to delete '%s'?"), serverName),
+                       "CodeLite",
+                       wxICON_QUESTION | wxCENTRE | wxYES_NO | wxCANCEL | wxCANCEL_DEFAULT,
+                       this) != wxYES) {
         return;
     }
     LanguageServerConfig::Get().RemoveServer(serverName);

Plugin/clEditorBar.cpp

@@ -245,18 +245,11 @@ void clEditorBar::OnButtonActions(wxCommandEvent& event)
     wxUnusedVar(event);
 
     wxMenu menu;
-    wxString text;
-
-    text << _("Copy '") << m_filename << _("' to the clipboard");
-    wxMenuItem* idCopyFullPath = menu.Append(wxID_ANY, text);
 
-    text.Clear();
-    text << _("Copy '") << wxFileName(m_filename).GetFullName() << _("' to the clipboard");
-    wxMenuItem* idCopyName = menu.Append(wxID_ANY, text);
-
-    text.Clear();
-    text << _("Copy '") << wxFileName(m_filename).GetPath() << _("' to the clipboard");
-    wxMenuItem* idCopyPath = menu.Append(wxID_ANY, text);
+    const auto& formatStr = _("Copy '%s' to the clipboard");
+    wxMenuItem* idCopyFullPath = menu.Append(wxID_ANY, wxString::Format(formatStr, m_filename));
+    wxMenuItem* idCopyName = menu.Append(wxID_ANY, wxString::Format(formatStr, wxFileName(m_filename).GetFullName()));
+    wxMenuItem* idCopyPath = menu.Append(wxID_ANY, wxString::Format(formatStr, wxFileName(m_filename).GetPath()));
 
     menu.AppendSeparator();
     wxMenuItem *idOpenExplorer, *idOpenShell;
@@ -280,7 +273,7 @@ void clEditorBar::OnButtonActions(wxCommandEvent& event)
     if (selection == wxID_NONE)
         return;
 
-    text.Clear();
+    wxString text;
     if (selection == idCopyFullPath->GetId()) {
         text = m_filename;
     } else if (selection == idCopyName->GetId()) {
@@ -296,7 +289,7 @@ void clEditorBar::OnButtonActions(wxCommandEvent& event)
     // Clipboard action?
     if (!text.IsEmpty()) {
         ::CopyToClipboard(text);
-        clGetManager()->SetStatusMessage((wxString() << "'" << text << _("' copied!")), 2);
+        clGetManager()->SetStatusMessage(wxString::Format(_("'%s' copied!"), text), 2);
     }
 }
 

abbreviation/abbreviationssettingsdlg.cpp

@@ -95,7 +95,7 @@ void AbbreviationsSettingsDlg::OnDelete(wxCommandEvent& event)
         return;
     }
 
-    if (wxMessageBox(wxString::Format(_("Are you sure you want to delete '%s'"), m_activeItemName.c_str()),
+    if (wxMessageBox(wxString::Format(_("Are you sure you want to delete '%s'?"), m_activeItemName),
                      wxT("CodeLite"),
                      wxYES_NO | wxCANCEL | wxCENTER | wxICON_QUESTION,
                      this) != wxYES) {
@@ -247,8 +247,9 @@ void AbbreviationsSettingsDlg::OnExport(wxCommandEvent& event)
             return;
     }
     m_config.Save(fn);
-    ::wxMessageBox(
-        _("Abbreviations were exported to '") + fn.GetFullPath() + _("'"), "wxCrafter", wxICON_INFORMATION | wxOK);
+    ::wxMessageBox(wxString::Format(_("Abbreviations were exported to '%s'"), fn.GetFullPath()),
+                   "wxCrafter",
+                   wxICON_INFORMATION | wxOK);
 }
 
 void AbbreviationsSettingsDlg::OnImport(wxCommandEvent& event)

translations/codelite.pot

@@ -596,7 +596,8 @@ msgid "Formatter with similar name already exists"
 msgstr ""
 
 #: CodeFormatter/codeformatterdlg.cpp:120
-msgid "Delete formatter '"
+#, c-format
+msgid "Delete formatter '%s'?"
 msgstr ""
 
 #: CodeFormatter/codeformatterdlg.cpp:121
@@ -2018,8 +2019,9 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:66
-msgid "Delete '"
+#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:65
+#, c-format
+msgid "Delete '%s'?"
 msgstr ""
 
 #: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:77
@@ -2503,7 +2505,8 @@ msgid "Could not find EOS CDT installation. Please install it and try again"
 msgstr ""
 
 #: EOSWiki/eoswiki.cpp:85
-msgid "A project with the same name: '"
+#, c-format
+msgid "A project with the same name: '%s'\nalready exists"
 msgstr ""
 
 #: EOSWiki/eoswiki.cpp:100 LiteEditor/fileview.cpp:2369
@@ -3196,8 +3199,9 @@ msgstr ""
 msgid "Help Plugin"
 msgstr ""
 
-#: HelpPlugin/helpplugin.cpp:86
-msgid "Search the docs for '"
+#: HelpPlugin/helpplugin.cpp:85
+#, c-format
+msgid "Search the docs for '%s'"
 msgstr ""
 
 #: LanguageServer/languageserver.cpp:35 LanguageServer/languageserver.cpp:45
@@ -3317,7 +3321,8 @@ msgid "Delete Breakpoint"
 msgstr ""
 
 #: LiteEditor/BuildOrderDialog.cpp:12
-msgid "Edit build order for project '"
+#, c-format
+msgid "Edit build order for project '%s'"
 msgstr ""
 
 #: LiteEditor/BuildOrderDialog.cpp:162
@@ -3443,7 +3448,9 @@ msgstr ""
 
 #: LiteEditor/CompilerMainPage.cpp:230
 #: Plugin/LSP/LanguageServerSettingsDlg.cpp:58
-msgid "Are you sure you want to delete '"
+#: abbreviation/abbreviationssettingsdlg.cpp:98
+#, c-format
+msgid "Are you sure you want to delete '%s'?"
 msgstr ""
 
 #: LiteEditor/CompilerMainPage.cpp:241
@@ -5553,11 +5560,8 @@ msgid "Rename"
 msgstr ""
 
 #: LiteEditor/edit_configuration.cpp:183
-msgid "Remove configuration '"
-msgstr ""
-
-#: LiteEditor/edit_configuration.cpp:184
-msgid "' ?"
+#, c-format
+msgid "Remove configuration '%s'?"
 msgstr ""
 
 #: LiteEditor/edit_configuration.h:67
@@ -5570,8 +5574,9 @@ msgstr ""
 msgid "&Close"
 msgstr ""
 
-#: LiteEditor/edit_workspace_conf_dlg.cpp:119
-msgid "Remove workspace configuration '"
+#: LiteEditor/edit_workspace_conf_dlg.cpp:118
+#, c-format
+msgid "Remove workspace configuration '%s'?"
 msgstr ""
 
 #: LiteEditor/edit_workspace_conf_dlg.cpp:132
@@ -7757,8 +7762,9 @@ msgstr ""
 msgid "Insert new value for '%s':"
 msgstr ""
 
-#: LiteEditor/mainbook.cpp:384
-msgid "Save changes to '"
+#: LiteEditor/mainbook.cpp:383
+#, c-format
+msgid "Save changes to '%s'?"
 msgstr ""
 
 #: LiteEditor/mainbook.cpp:922 LiteEditor/mainbook.cpp:1079
@@ -12351,18 +12357,14 @@ msgstr ""
 msgid "Separator"
 msgstr ""
 
-#: Plugin/clEditorBar.cpp:250 Plugin/clEditorBar.cpp:254
-#: Plugin/clEditorBar.cpp:258
-msgid "' to the clipboard"
-msgstr ""
-
-#: Plugin/clEditorBar.cpp:250 Plugin/clEditorBar.cpp:254
-#: Plugin/clEditorBar.cpp:258
-msgid "Copy '"
+#: Plugin/clEditorBar.cpp:249
+#, c-format
+msgid "Copy '%s' to the clipboard"
 msgstr ""
 
-#: Plugin/clEditorBar.cpp:299
-msgid "' copied!"
+#: Plugin/clEditorBar.cpp:292
+#, c-format
+msgid "'%s' copied!"
 msgstr ""
 
 #: Plugin/clGotoAnythingManager.cpp:156
@@ -15915,25 +15917,15 @@ msgstr ""
 msgid "An abbreviation with this name already exists!"
 msgstr ""
 
-#: abbreviation/abbreviationssettingsdlg.cpp:98
-#, c-format
-msgid "Are you sure you want to delete '%s'"
-msgstr ""
-
 #: abbreviation/abbreviationssettingsdlg.cpp:244
 msgid ""
 "This folder already contains a file named 'abbreviations.conf' - would you "
 "like to overwrite it?"
 msgstr ""
 
-#: abbreviation/abbreviationssettingsdlg.cpp:251
-#: wxcrafter/src/wxcrafter_plugin.cpp:588
-#: wxcrafter/src/wxguicraft_main_view.cpp:2894
-msgid "'"
-msgstr ""
-
-#: abbreviation/abbreviationssettingsdlg.cpp:251
-msgid "Abbreviations were exported to '"
+#: abbreviation/abbreviationssettingsdlg.cpp:250
+#, c-format
+msgid "Abbreviations were exported to '%s'"
 msgstr ""
 
 #: abbreviation/abbreviationssettingsdlg.cpp:264
@@ -23567,19 +23559,17 @@ msgid ""
 msgstr ""
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "'\n"
-msgstr ""
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "Could not find target project: '"
+#, c-format
+msgid "Could not find target project: '%s'\n"
 msgstr ""
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:587
 msgid "Make sure that the virtual folder entry is valid (it must exist)\n"
 msgstr ""
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:588
-msgid "Virtual Folder provided was: '"
+#, c-format
+msgid "Virtual Folder provided was: '%s'"
 msgstr ""
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:687
@@ -23595,11 +23585,8 @@ msgid "Could not create virtual folder 'wxcrafter'"
 msgstr ""
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "'.\n"
-msgstr ""
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "Error while reading file content: '"
+#, c-format
+msgid "Error while reading file content: '%s'.\n"
 msgstr ""
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:991
@@ -24381,7 +24368,8 @@ msgid "Can't insert this item here"
 msgstr ""
 
 #: wxcrafter/src/wxguicraft_main_view.cpp:2894
-msgid "Rename '"
+#, c-format
+msgid "Rename '%s'"
 msgstr ""
 
 #: wxcrafter/src/wxguicraft_main_view.cpp:2895