diff --git a/CodeFormatter/codeformatterdlg.cpp b/CodeFormatter/codeformatterdlg.cpp
index 27b6a190ba..6454fb6ef0 100644
--- a/CodeFormatter/codeformatterdlg.cpp
+++ b/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;
diff --git a/DebugAdapterClient/DapDebuggerSettingsDlg.cpp b/DebugAdapterClient/DapDebuggerSettingsDlg.cpp
index 64ac9332a2..55811d5d03 100644
--- a/DebugAdapterClient/DapDebuggerSettingsDlg.cpp
+++ b/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;
     }
 
diff --git a/EOSWiki/eoswiki.cpp b/EOSWiki/eoswiki.cpp
index a85f78b662..bcadda5175 100644
--- a/EOSWiki/eoswiki.cpp
+++ b/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;
diff --git a/HelpPlugin/helpplugin.cpp b/HelpPlugin/helpplugin.cpp
index 45d219f2d5..e2f805599f 100644
--- a/HelpPlugin/helpplugin.cpp
+++ b/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();
 }
diff --git a/LiteEditor/BuildOrderDialog.cpp b/LiteEditor/BuildOrderDialog.cpp
index 2875a888f9..b3d59faca8 100644
--- a/LiteEditor/BuildOrderDialog.cpp
+++ b/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; });
diff --git a/LiteEditor/CompilerMainPage.cpp b/LiteEditor/CompilerMainPage.cpp
index 77f7a6b8da..2ef01ddcb2 100644
--- a/LiteEditor/CompilerMainPage.cpp
+++ b/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);
diff --git a/LiteEditor/edit_configuration.cpp b/LiteEditor/edit_configuration.cpp
index 6d822c5deb..840778d4f6 100644
--- a/LiteEditor/edit_configuration.cpp
+++ b/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) {
diff --git a/LiteEditor/edit_workspace_conf_dlg.cpp b/LiteEditor/edit_workspace_conf_dlg.cpp
index 6f0e70e77d..3c7a9bcd1b 100644
--- a/LiteEditor/edit_workspace_conf_dlg.cpp
+++ b/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
diff --git a/LiteEditor/mainbook.cpp b/LiteEditor/mainbook.cpp
index f213baadf5..6134e5b7ea 100644
--- a/LiteEditor/mainbook.cpp
+++ b/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;
diff --git a/Plugin/LSP/LanguageServerSettingsDlg.cpp b/Plugin/LSP/LanguageServerSettingsDlg.cpp
index f74e245e6b..215b352cc5 100644
--- a/Plugin/LSP/LanguageServerSettingsDlg.cpp
+++ b/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);
diff --git a/Plugin/clEditorBar.cpp b/Plugin/clEditorBar.cpp
index a1d8b30340..3ca70499c0 100644
--- a/Plugin/clEditorBar.cpp
+++ b/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);
     }
 }
 
diff --git a/abbreviation/abbreviationssettingsdlg.cpp b/abbreviation/abbreviationssettingsdlg.cpp
index ec4c525a19..578d657211 100644
--- a/abbreviation/abbreviationssettingsdlg.cpp
+++ b/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)
diff --git a/translations/codelite.pot b/translations/codelite.pot
index 7aeec26b1d..53a9bf5cc4 100644
--- a/translations/codelite.pot
+++ b/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,11 +23559,8 @@ 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
@@ -23579,7 +23568,8 @@ 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
diff --git a/translations/cs/codelite.po b/translations/cs/codelite.po
index 4192901dc2..dab27897e5 100644
--- a/translations/cs/codelite.po
+++ b/translations/cs/codelite.po
@@ -556,8 +556,9 @@ msgstr "Překladač s tímto jménem již existuje"
 
 #: CodeFormatter/codeformatterdlg.cpp:120
 #, fuzzy
-msgid "Delete formatter '"
-msgstr "Vymazat kompilátor"
+#, c-format
+msgid "Delete formatter '%s'?"
+msgstr "Vymazat kompilátor '%s'?"
 
 #: CodeFormatter/codeformatterdlg.cpp:121
 #, fuzzy
@@ -1814,10 +1815,11 @@ msgstr ""
 msgid "Help"
 msgstr "Nápověda"
 
-#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:66
+#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:65
+#, c-format
 #, fuzzy
-msgid "Delete '"
-msgstr "Smazat"
+msgid "Delete '%s'?"
+msgstr "Smazat '%s'?"
 
 #: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:77
 #, fuzzy
@@ -2289,7 +2291,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
@@ -2953,10 +2956,11 @@ msgstr "&Pluginy"
 msgid "Help Plugin"
 msgstr "&Pluginy"
 
-#: HelpPlugin/helpplugin.cpp:86
+#: HelpPlugin/helpplugin.cpp:85
+#, c-format
 #, fuzzy
-msgid "Search the docs for '"
-msgstr "Hledat v těchto typech souborů"
+msgid "Search the docs for '%s'"
+msgstr "Hledat v těchto typech souborů '%s'"
 
 #: LanguageServer/languageserver.cpp:35 LanguageServer/languageserver.cpp:45
 msgid "Support for Language Server Protocol (LSP)"
@@ -3075,9 +3079,10 @@ msgid "Delete Breakpoint"
 msgstr "Smazat všechny breakpointy"
 
 #: LiteEditor/BuildOrderDialog.cpp:12
+#, c-format
 #, fuzzy
-msgid "Edit build order for project '"
-msgstr "Nelze najít vytvořenou konfiguraci projektu '"
+msgid "Edit build order for project '%s'"
+msgstr "Nelze najít vytvořenou konfiguraci projektu '%s'"
 
 #: LiteEditor/BuildOrderDialog.cpp:162
 msgid "You have un-saved changes, would you like to save them before changing configuration?"
@@ -3204,9 +3209,10 @@ msgid "Are you sure you want to delete this compiler option?"
 msgstr "JJste si jisti smazáním této volby komilátoru?"
 
 #: LiteEditor/CompilerMainPage.cpp:230 Plugin/LSP/LanguageServerSettingsDlg.cpp:58
-#, fuzzy
-msgid "Are you sure you want to delete '"
-msgstr "Jste si jistí s vymazáním  '%s'"
+#: abbreviation/abbreviationssettingsdlg.cpp:98
+#, c-format
+msgid "Are you sure you want to delete '%s'?"
+msgstr "Jste si jistí s vymazáním '%s'?"
 
 #: LiteEditor/CompilerMainPage.cpp:241
 msgid "Are you sure you want to delete this linker option?"
@@ -5252,12 +5258,9 @@ msgid "Rename"
 msgstr "Přejmenovat"
 
 #: LiteEditor/edit_configuration.cpp:183
-msgid "Remove configuration '"
-msgstr "Odstranit konfiguraci '"
-
-#: LiteEditor/edit_configuration.cpp:184
-msgid "' ?"
-msgstr "' ?"
+#, c-format
+msgid "Remove configuration '%s'?"
+msgstr "Odstranit konfiguraci '%s'?"
 
 #: LiteEditor/edit_configuration.h:67
 msgid "Edit Configurations"
@@ -5267,9 +5270,10 @@ msgstr "Upravit konfigurace"
 msgid "&Close"
 msgstr "&Zavřít"
 
-#: LiteEditor/edit_workspace_conf_dlg.cpp:119
-msgid "Remove workspace configuration '"
-msgstr "Odstranit konfiguraci pracovní plochy '"
+#: LiteEditor/edit_workspace_conf_dlg.cpp:118
+#, c-format
+msgid "Remove workspace configuration '%s'?"
+msgstr "Odstranit konfiguraci pracovní plochy '%s'?"
 
 #: LiteEditor/edit_workspace_conf_dlg.cpp:132
 msgid "New Configuration Name:"
@@ -7577,9 +7581,10 @@ msgstr "Upravit výraz"
 msgid "Insert new value for '%s':"
 msgstr "Vložit novou hodnotu pro '%s':"
 
-#: LiteEditor/mainbook.cpp:384
-msgid "Save changes to '"
-msgstr "Uložit změny do '"
+#: LiteEditor/mainbook.cpp:383
+#, c-format
+msgid "Save changes to '%s'?"
+msgstr "Uložit změny do '%s'?"
 
 #: LiteEditor/mainbook.cpp:922 LiteEditor/mainbook.cpp:1079 LiteEditor/mainbook.cpp:1120 LiteEditor/replaceinfilespanel.cpp:428
 msgid "Save Modified Files"
@@ -12297,18 +12302,15 @@ msgstr ""
 msgid "Separator"
 msgstr "enumerator"
 
-#: Plugin/clEditorBar.cpp:250 Plugin/clEditorBar.cpp:254 Plugin/clEditorBar.cpp:258
+#: Plugin/clEditorBar.cpp:249
 #, fuzzy
-msgid "' to the clipboard"
-msgstr "Kopírovat příkaz SWL do schránky"
-
-#: Plugin/clEditorBar.cpp:250 Plugin/clEditorBar.cpp:254 Plugin/clEditorBar.cpp:258
-#, fuzzy
-msgid "Copy '"
-msgstr "Kopírovat"
+#, c-format
+msgid "Copy '%s' to the clipboard"
+msgstr "Kopírovat '%s' příkaz SWL do schránky"
 
-#: Plugin/clEditorBar.cpp:299
-msgid "' copied!"
+#: Plugin/clEditorBar.cpp:292
+#, c-format
+msgid "'%s' copied!"
 msgstr ""
 
 #: Plugin/clGotoAnythingManager.cpp:156
@@ -16082,21 +16084,13 @@ msgstr "Nová zkratka"
 msgid "An abbreviation with this name already exists!"
 msgstr "Zkratka s tímto jménem již existuje!"
 
-#: abbreviation/abbreviationssettingsdlg.cpp:98
-#, c-format
-msgid "Are you sure you want to delete '%s'"
-msgstr "Jste si jistí s vymazáním  '%s'"
-
 #: 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
@@ -23389,13 +23383,9 @@ msgstr "Jste si vědomi ztráty všech změn?"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:586
 #, fuzzy
-msgid "'\n"
-msgstr "'"
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:586
-#, fuzzy
-msgid "Could not find target project: '"
-msgstr "Není možné najíc cílový projekt"
+#, c-format
+msgid "Could not find target project: '%s'\n"
+msgstr "Není možné najíc cílový projekt '%s'\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:587
 msgid "Make sure that the virtual folder entry is valid (it must exist)\n"
@@ -23403,8 +23393,9 @@ msgstr ""
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:588
 #, fuzzy
-msgid "Virtual Folder provided was: '"
-msgstr "Virtuální sžka ro řidání nových souborů"
+#, c-format
+msgid "Virtual Folder provided was: '%s'"
+msgstr "Virtuální sžka ro řidání nových souborů '%s'"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:687
 msgid "wxCrafter: code generation completed successfully!"
@@ -23420,11 +23411,8 @@ msgid "Could not create virtual folder 'wxcrafter'"
 msgstr "Nelze generovat cílový soubor '%s'"
 
 #: 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
@@ -24288,10 +24276,10 @@ msgstr ""
 msgid "Can't insert this item here"
 msgstr ""
 
-#: wxcrafter/src/wxguicraft_main_view.cpp:2894
-#, fuzzy
-msgid "Rename '"
-msgstr "Přejmenovat"
+#: wxcrafter/src/wxguicraft_main_view.cpp:2893
+#, c-format
+msgid "Rename '%s'"
+msgstr "Přejmenovat '%s'"
 
 #: wxcrafter/src/wxguicraft_main_view.cpp:2895
 #, fuzzy
diff --git a/translations/fr/codelite.po b/translations/fr/codelite.po
index d5b4bdf2f1..44fd418ff7 100644
--- a/translations/fr/codelite.po
+++ b/translations/fr/codelite.po
@@ -515,8 +515,9 @@ msgid "Formatter with similar name already exists"
 msgstr "Un formatteur avec un nom similaire existe déjà"
 
 #: CodeFormatter/codeformatterdlg.cpp:120
-msgid "Delete formatter '"
-msgstr "Supprimer le formatteur '"
+#, c-format
+msgid "Delete formatter '%s'?"
+msgstr "Supprimer le formatteur '%s' ?"
 
 #: CodeFormatter/codeformatterdlg.cpp:121
 msgid "Delete formatter"
@@ -1694,9 +1695,10 @@ msgstr "Scruter"
 msgid "Help"
 msgstr "Aide"
 
-#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:66
-msgid "Delete '"
-msgstr "Supprimer '"
+#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:65
+#, c-format
+msgid "Delete '%s'?"
+msgstr "Supprimer '%s' ?"
 
 #: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:77
 msgid "Are you sure you want to scan for dap servers? (this will override your current settings)"
@@ -2139,8 +2141,9 @@ msgid "Could not find EOS CDT installation. Please install it and try again"
 msgstr "Impossible de trouver l'installation d'EOS CDT'. Veuillez l'installer et réessayer"
 
 #: EOSWiki/eoswiki.cpp:85
-msgid "A project with the same name: '"
-msgstr "Un projet portant le même nom : '"
+#, c-format
+msgid "A project with the same name: '%s'\nalready exists"
+msgstr "Un projet portant le même nom : '%s'\nexiste déjà"
 
 #: EOSWiki/eoswiki.cpp:100 LiteEditor/fileview.cpp:2369
 msgid "Failed to create workspace:\n"
@@ -2781,9 +2784,10 @@ msgstr "Aide sur les extensions"
 msgid "Help Plugin"
 msgstr "Aide sur les extensions"
 
-#: HelpPlugin/helpplugin.cpp:86
-msgid "Search the docs for '"
-msgstr "Recherchez dans la documentation '"
+#: HelpPlugin/helpplugin.cpp:85
+#, c-format
+msgid "Search the docs for '%s'"
+msgstr "Recherchez '%s' dans la documentation"
 
 #: LanguageServer/languageserver.cpp:35 LanguageServer/languageserver.cpp:45
 msgid "Support for Language Server Protocol (LSP)"
@@ -2892,8 +2896,9 @@ msgid "Delete Breakpoint"
 msgstr "Supprimer le point d'arrêt"
 
 #: LiteEditor/BuildOrderDialog.cpp:12
-msgid "Edit build order for project '"
-msgstr "Modifier l'ordre de construction du projet '"
+#, c-format
+msgid "Edit build order for project '%s'"
+msgstr "Modifier l'ordre de construction du projet '%s'"
 
 #: LiteEditor/BuildOrderDialog.cpp:162
 msgid "You have un-saved changes, would you like to save them before changing configuration?"
@@ -3008,8 +3013,10 @@ msgid "Are you sure you want to delete this compiler option?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette option du compilateur ?"
 
 #: LiteEditor/CompilerMainPage.cpp:230 Plugin/LSP/LanguageServerSettingsDlg.cpp:58
-msgid "Are you sure you want to delete '"
-msgstr "Êtes-vous sûr de vouloir supprimer '"
+#: abbreviation/abbreviationssettingsdlg.cpp:98
+#, c-format
+msgid "Are you sure you want to delete '%s'?"
+msgstr "Êtes-vous sûr de vouloir supprimer '%s' ?"
 
 #: LiteEditor/CompilerMainPage.cpp:241
 msgid "Are you sure you want to delete this linker option?"
@@ -4997,12 +5004,9 @@ msgid "Rename"
 msgstr "Renommer"
 
 #: LiteEditor/edit_configuration.cpp:183
-msgid "Remove configuration '"
-msgstr "Supprimer la configuration '"
-
-#: LiteEditor/edit_configuration.cpp:184
-msgid "' ?"
-msgstr ""
+#, c-format
+msgid "Remove configuration '%s'?"
+msgstr "Supprimer la configuration '%s' ?"
 
 #: LiteEditor/edit_configuration.h:67
 msgid "Edit Configurations"
@@ -5012,9 +5016,10 @@ msgstr "Modifier la configuration"
 msgid "&Close"
 msgstr "&Fermer"
 
-#: LiteEditor/edit_workspace_conf_dlg.cpp:119
-msgid "Remove workspace configuration '"
-msgstr "Supprimer la configuration de l'espace de travail '"
+#: LiteEditor/edit_workspace_conf_dlg.cpp:118
+#, c-format
+msgid "Remove workspace configuration '%s'?"
+msgstr "Supprimer la configuration de l'espace de travail '%s' ?"
 
 #: LiteEditor/edit_workspace_conf_dlg.cpp:132
 msgid "New Configuration Name:"
@@ -7122,9 +7127,10 @@ msgstr "Éditer l'expression"
 msgid "Insert new value for '%s':"
 msgstr "Insérer une nouvelle valeur pour '%s' :"
 
-#: LiteEditor/mainbook.cpp:384
-msgid "Save changes to '"
-msgstr "Sauvegarder les modifications dans '"
+#: LiteEditor/mainbook.cpp:383
+#, c-format
+msgid "Save changes to '%s'?"
+msgstr "Sauvegarder les modifications dans '%s' ?"
 
 #: LiteEditor/mainbook.cpp:922 LiteEditor/mainbook.cpp:1079 LiteEditor/mainbook.cpp:1120 LiteEditor/replaceinfilespanel.cpp:428
 msgid "Save Modified Files"
@@ -11625,17 +11631,15 @@ msgstr "Espaceur"
 msgid "Separator"
 msgstr "Séparateur"
 
-#: Plugin/clEditorBar.cpp:250 Plugin/clEditorBar.cpp:254 Plugin/clEditorBar.cpp:258
-msgid "' to the clipboard"
-msgstr "vers le presse-papiers"
-
-#: Plugin/clEditorBar.cpp:250 Plugin/clEditorBar.cpp:254 Plugin/clEditorBar.cpp:258
-msgid "Copy '"
-msgstr "Copier '"
+#: Plugin/clEditorBar.cpp:249
+#, c-format
+msgid "Copy '%s' to the clipboard"
+msgstr "Copier '%s' vers le presse-papiers"
 
-#: Plugin/clEditorBar.cpp:299
-msgid "' copied!"
-msgstr "copié !"
+#: Plugin/clEditorBar.cpp:292
+#, c-format
+msgid "'%s' copied!"
+msgstr "'%s' copié !"
 
 #: Plugin/clGotoAnythingManager.cpp:156
 msgid "Current Tab > Close Tabs To The Right"
@@ -15179,22 +15183,14 @@ msgstr "Nouvelle abréviation..."
 msgid "An abbreviation with this name already exists!"
 msgstr "Une abréviation de ce nom existe déjà !"
 
-#: abbreviation/abbreviationssettingsdlg.cpp:98
-#, c-format
-msgid "Are you sure you want to delete '%s'"
-msgstr "Êtes-vous sûr de vouloir supprimer « %s » ?"
-
 #: abbreviation/abbreviationssettingsdlg.cpp:244
 msgid "This folder already contains a file named 'abbreviations.conf' - would you like to overwrite it?"
 msgstr "Ce dossier contient déjà un fichier nommé 'abbreviations.conf' - souhaitez-vous l'écraser ?"
 
-#: 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 '"
-msgstr "Les abréviations ont été exportées vers '"
+#: abbreviation/abbreviationssettingsdlg.cpp:250
+#, c-format
+msgid "Abbreviations were exported to '%s'"
+msgstr "Les abréviations ont été exportées vers '%s'"
 
 #: abbreviation/abbreviationssettingsdlg.cpp:264
 msgid "The file does not seem to contain a valid abbreviations entries"
@@ -22287,20 +22283,18 @@ msgstr ""
 "Voulez-vous enregistrer vos modifications ?"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "'\n"
-msgstr ""
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "Could not find target project: '"
-msgstr "Impossible de trouver le projet cible : '"
+#, c-format
+msgid "Could not find target project: '%s'\n"
+msgstr "Impossible de trouver le projet cible : '%s'\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:587
 msgid "Make sure that the virtual folder entry is valid (it must exist)\n"
 msgstr "Assurez-vous que l'entrée du dossier virtuel est valide (elle doit exister).\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:588
-msgid "Virtual Folder provided was: '"
-msgstr "Le dossier virtuel fourni était : '"
+#, c-format
+msgid "Virtual Folder provided was: '%s'"
+msgstr "Le dossier virtuel fourni était : '%s'"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:687
 msgid "wxCrafter: code generation completed successfully!"
@@ -22315,12 +22309,9 @@ msgid "Could not create virtual folder 'wxcrafter'"
 msgstr "Impossible de créer le dossier virtuel 'wxcrafter'"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "'.\n"
-msgstr ""
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "Error while reading file content: '"
-msgstr "Erreur lors de la lecture du contenu du fichier : '"
+#, c-format
+msgid "Error while reading file content: '%s'.\n"
+msgstr "Erreur lors de la lecture du contenu du fichier : '%s'.\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:991
 msgid "Could not read file content"
@@ -23102,9 +23093,10 @@ msgstr "Un calibreur principal ne peut pas être placé dans une fenêtre géré
 msgid "Can't insert this item here"
 msgstr "Impossible d'insérer cet élément ici"
 
-#: wxcrafter/src/wxguicraft_main_view.cpp:2894
-msgid "Rename '"
-msgstr "Renommer '"
+#: wxcrafter/src/wxguicraft_main_view.cpp:2893
+#, c-format
+msgid "Rename '%s'"
+msgstr "Renommer '%s'"
 
 #: wxcrafter/src/wxguicraft_main_view.cpp:2895
 msgid "Enter the new name:"
diff --git a/translations/it/codelite.po b/translations/it/codelite.po
index 2052fc6e1c..2d29dbc205 100644
--- a/translations/it/codelite.po
+++ b/translations/it/codelite.po
@@ -525,8 +525,9 @@ msgid "Formatter with similar name already exists"
 msgstr "Esiste già un formattatore con nome simile"
 
 #: CodeFormatter/codeformatterdlg.cpp:120
-msgid "Delete formatter '"
-msgstr "Elimina formattatore '"
+#, c-format
+msgid "Delete formatter '%s'?"
+msgstr "Elimina formattatore '%s'?"
 
 #: CodeFormatter/codeformatterdlg.cpp:121
 msgid "Delete formatter"
@@ -1734,9 +1735,10 @@ msgstr "Scansione"
 msgid "Help"
 msgstr "Aiuto"
 
-#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:66
-msgid "Delete '"
-msgstr "Eliminare '"
+#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:65
+#, c-format
+msgid "Delete '%s'?"
+msgstr "Eliminare '%s'?"
 
 #: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:77
 msgid "Are you sure you want to scan for dap servers? (this will override your current settings)"
@@ -2184,8 +2186,9 @@ msgid "Could not find EOS CDT installation. Please install it and try again"
 msgstr "Impossibile trovare l'installazione di EOS CDT.Installalo e riprova"
 
 #: EOSWiki/eoswiki.cpp:85
-msgid "A project with the same name: '"
-msgstr "Un progetto con lo stesso nome: '"
+#, c-format
+msgid "A project with the same name: '%s'\nalready exists"
+msgstr "Un progetto con lo stesso nome: '%s'\nesiste già"
 
 #: EOSWiki/eoswiki.cpp:100 LiteEditor/fileview.cpp:2369
 msgid "Failed to create workspace:\n"
@@ -2830,9 +2833,10 @@ msgstr "AiutoPlugin"
 msgid "Help Plugin"
 msgstr "Aiuto Plugin"
 
-#: HelpPlugin/helpplugin.cpp:86
-msgid "Search the docs for '"
-msgstr "Cerca nei documenti '"
+#: HelpPlugin/helpplugin.cpp:85
+#, c-format
+msgid "Search the docs for '%s'"
+msgstr "Cerca nei documenti '%s'"
 
 #: LanguageServer/languageserver.cpp:35 LanguageServer/languageserver.cpp:45
 msgid "Support for Language Server Protocol (LSP)"
@@ -2940,8 +2944,9 @@ msgid "Delete Breakpoint"
 msgstr "Elimina punto di interruzione"
 
 #: LiteEditor/BuildOrderDialog.cpp:12
-msgid "Edit build order for project '"
-msgstr "Modifica l'ordine di compilazione per il progetto '"
+#, c-format
+msgid "Edit build order for project '%s'"
+msgstr "Modifica l'ordine di compilazione per il progetto '%s'"
 
 #: LiteEditor/BuildOrderDialog.cpp:162
 msgid "You have un-saved changes, would you like to save them before changing configuration?"
@@ -3056,8 +3061,10 @@ msgid "Are you sure you want to delete this compiler option?"
 msgstr "Vuoi eliminare questa opzione del compilatore?"
 
 #: LiteEditor/CompilerMainPage.cpp:230 Plugin/LSP/LanguageServerSettingsDlg.cpp:58
-msgid "Are you sure you want to delete '"
-msgstr "Vuoi eliminare '"
+#: abbreviation/abbreviationssettingsdlg.cpp:98
+#, c-format
+msgid "Are you sure you want to delete '%s'?"
+msgstr "Vuoi eliminare '%s'?"
 
 #: LiteEditor/CompilerMainPage.cpp:241
 msgid "Are you sure you want to delete this linker option?"
@@ -5063,12 +5070,9 @@ msgid "Rename"
 msgstr "Rinominare"
 
 #: LiteEditor/edit_configuration.cpp:183
-msgid "Remove configuration '"
-msgstr "Rimuovi configurazione '"
-
-#: LiteEditor/edit_configuration.cpp:184
-msgid "' ?"
-msgstr "'?"
+#, c-format
+msgid "Remove configuration '%s'?"
+msgstr "Rimuovi configurazione '%s'?"
 
 #: LiteEditor/edit_configuration.h:67
 msgid "Edit Configurations"
@@ -5078,9 +5082,10 @@ msgstr "Modifica configurazioni"
 msgid "&Close"
 msgstr "&Chiudi"
 
-#: LiteEditor/edit_workspace_conf_dlg.cpp:119
-msgid "Remove workspace configuration '"
-msgstr "Rimuovi la configurazione dell'area di lavoro '"
+#: LiteEditor/edit_workspace_conf_dlg.cpp:118
+#, c-format
+msgid "Remove workspace configuration '%s'?"
+msgstr "Rimuovi la configurazione dell'area di lavoro '%s'?"
 
 #: LiteEditor/edit_workspace_conf_dlg.cpp:132
 msgid "New Configuration Name:"
@@ -7193,9 +7198,10 @@ msgstr "Modifica espressione"
 msgid "Insert new value for '%s':"
 msgstr "Inserisci un nuovo valore per '%s':"
 
-#: LiteEditor/mainbook.cpp:384
-msgid "Save changes to '"
-msgstr "Salva le modifiche in \""
+#: LiteEditor/mainbook.cpp:383
+#, c-format
+msgid "Save changes to '%s'?"
+msgstr "Salva le modifiche in '%s'?"
 
 #: LiteEditor/mainbook.cpp:922 LiteEditor/mainbook.cpp:1079 LiteEditor/mainbook.cpp:1120 LiteEditor/replaceinfilespanel.cpp:428
 msgid "Save Modified Files"
@@ -11687,17 +11693,15 @@ msgstr "Distanziatore"
 msgid "Separator"
 msgstr "Separatore"
 
-#: Plugin/clEditorBar.cpp:250 Plugin/clEditorBar.cpp:254 Plugin/clEditorBar.cpp:258
-msgid "' to the clipboard"
-msgstr "' negli appunti"
-
-#: Plugin/clEditorBar.cpp:250 Plugin/clEditorBar.cpp:254 Plugin/clEditorBar.cpp:258
-msgid "Copy '"
-msgstr "Copia '"
+#: Plugin/clEditorBar.cpp:249
+#, c-format
+msgid "Copy '%s' to the clipboard"
+msgstr "Copia '%s' negli appunti"
 
-#: Plugin/clEditorBar.cpp:299
-msgid "' copied!"
-msgstr "' copiato!"
+#: Plugin/clEditorBar.cpp:292
+#, c-format
+msgid "'%s' copied!"
+msgstr "'%s' copiato!"
 
 #: Plugin/clGotoAnythingManager.cpp:156
 msgid "Current Tab > Close Tabs To The Right"
@@ -15244,22 +15248,14 @@ msgstr "Nuova abbreviazione..."
 msgid "An abbreviation with this name already exists!"
 msgstr "Esiste già un'abbreviazione con questo nome!"
 
-#: abbreviation/abbreviationssettingsdlg.cpp:98
-#, c-format
-msgid "Are you sure you want to delete '%s'"
-msgstr "Vuoi eliminare '%s'"
-
 #: abbreviation/abbreviationssettingsdlg.cpp:244
 msgid "This folder already contains a file named 'abbreviations.conf' - would you like to overwrite it?"
 msgstr "Questa cartella contiene già un file denominato 'abbreviations.conf': vuoi sovrascriverlo?"
 
-#: 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 '"
-msgstr "Le abbreviazioni sono state esportate in '"
+#: abbreviation/abbreviationssettingsdlg.cpp:250
+#, c-format
+msgid "Abbreviations were exported to '%s'"
+msgstr "Le abbreviazioni sono state esportate in '%s'"
 
 #: abbreviation/abbreviationssettingsdlg.cpp:264
 msgid "The file does not seem to contain a valid abbreviations entries"
@@ -22473,20 +22469,18 @@ msgstr ""
 "Vuoi salvare le modifiche?"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "'\n"
-msgstr "'\n"
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "Could not find target project: '"
-msgstr "Impossibile trovare il progetto destinazione: '"
+#, c-format
+msgid "Could not find target project: '%s'\n"
+msgstr "Impossibile trovare il progetto destinazione: '%s'\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:587
 msgid "Make sure that the virtual folder entry is valid (it must exist)\n"
 msgstr "Assicurati che la voce della cartella virtuale sia valida (deve esistere)\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:588
-msgid "Virtual Folder provided was: '"
-msgstr "La cartella virtuale fornita era: '"
+#, c-format
+msgid "Virtual Folder provided was: '%s'"
+msgstr "La cartella virtuale fornita era: '%s'"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:687
 msgid "wxCrafter: code generation completed successfully!"
@@ -22501,12 +22495,9 @@ msgid "Could not create virtual folder 'wxcrafter'"
 msgstr "Impossibile creare la cartella virtuale 'wxcrafter'"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "'.\n"
-msgstr "'.\n"
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "Error while reading file content: '"
-msgstr "Errore durante la lettura del contenuto del file: '"
+#, c-format
+msgid "Error while reading file content: '%s'.\n"
+msgstr "Errore durante la lettura del contenuto del file: '%s'.\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:991
 msgid "Could not read file content"
@@ -23288,9 +23279,10 @@ msgstr "Un Main Sizer non può essere inserito in una finestra gestita da wxAui"
 msgid "Can't insert this item here"
 msgstr "Impossibile inserire questo elemento qui"
 
-#: wxcrafter/src/wxguicraft_main_view.cpp:2894
-msgid "Rename '"
-msgstr "Rinomina '"
+#: wxcrafter/src/wxguicraft_main_view.cpp:2893
+#, c-format
+msgid "Rename '%s'"
+msgstr "Rinomina '%s'"
 
 #: wxcrafter/src/wxguicraft_main_view.cpp:2895
 msgid "Enter the new name:"
diff --git a/translations/ja_JP/codelite.po b/translations/ja_JP/codelite.po
index 438f671f60..714340a5ab 100644
--- a/translations/ja_JP/codelite.po
+++ b/translations/ja_JP/codelite.po
@@ -514,8 +514,9 @@ msgid "Formatter with similar name already exists"
 msgstr "同様の名前のフォーマッターがすでに存在します"
 
 #: CodeFormatter/codeformatterdlg.cpp:120
-msgid "Delete formatter '"
-msgstr "フォーマッターを削除 '"
+#, c-format
+msgid "Delete formatter '%s'?"
+msgstr "フォーマッターを削除 '%s'?"
 
 #: CodeFormatter/codeformatterdlg.cpp:121
 msgid "Delete formatter"
@@ -1698,9 +1699,10 @@ msgstr "スキャン"
 msgid "Help"
 msgstr "ヘルプ"
 
-#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:66
-msgid "Delete '"
-msgstr "削除しますか '"
+#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:65
+#, c-format
+msgid "Delete '%s'?"
+msgstr "削除しますか '%s'?"
 
 #: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:77
 msgid "Are you sure you want to scan for dap servers? (this will override your current settings)"
@@ -2143,8 +2145,10 @@ msgid "Could not find EOS CDT installation. Please install it and try again"
 msgstr "EOS CDT がインストールされていないか、見つかりません。インストールしてから再試行してください"
 
 #: EOSWiki/eoswiki.cpp:85
-msgid "A project with the same name: '"
-msgstr "同じ名前のプロジェクト: '"
+#, c-format
+#, fuzzy
+msgid "A project with the same name: '%s'\nalready exists"
+msgstr "同じ名前のプロジェクト: '%s'\n"
 
 #: EOSWiki/eoswiki.cpp:100 LiteEditor/fileview.cpp:2369
 msgid "Failed to create workspace:\n"
@@ -2785,9 +2789,10 @@ msgstr "ヘルププラグイン"
 msgid "Help Plugin"
 msgstr "ヘルププラグイン"
 
-#: HelpPlugin/helpplugin.cpp:86
-msgid "Search the docs for '"
-msgstr "ドキュメントを検索 '"
+#: HelpPlugin/helpplugin.cpp:85
+#, c-format
+msgid "Search the docs for '%s'"
+msgstr "ドキュメントを検索 '%s'"
 
 #: LanguageServer/languageserver.cpp:35 LanguageServer/languageserver.cpp:45
 msgid "Support for Language Server Protocol (LSP)"
@@ -2896,8 +2901,9 @@ msgid "Delete Breakpoint"
 msgstr "ブレークポイントを削除"
 
 #: LiteEditor/BuildOrderDialog.cpp:12
-msgid "Edit build order for project '"
-msgstr "プロジェクトのビルド順を編集 '"
+#, c-format
+msgid "Edit build order for project '%s'"
+msgstr "プロジェクトのビルド順を編集 '%s'"
 
 #: LiteEditor/BuildOrderDialog.cpp:162
 msgid "You have un-saved changes, would you like to save them before changing configuration?"
@@ -3012,8 +3018,10 @@ msgid "Are you sure you want to delete this compiler option?"
 msgstr "このコンパイラーのオプションを削除しますか？"
 
 #: LiteEditor/CompilerMainPage.cpp:230 Plugin/LSP/LanguageServerSettingsDlg.cpp:58
-msgid "Are you sure you want to delete '"
-msgstr "削除しますか '"
+#: abbreviation/abbreviationssettingsdlg.cpp:98
+#, c-format
+msgid "Are you sure you want to delete '%s'?"
+msgstr "'%s' を削除しますか?"
 
 #: LiteEditor/CompilerMainPage.cpp:241
 msgid "Are you sure you want to delete this linker option?"
@@ -5003,12 +5011,9 @@ msgid "Rename"
 msgstr "名前を変更"
 
 #: LiteEditor/edit_configuration.cpp:183
-msgid "Remove configuration '"
-msgstr "構成を削除しますか '"
-
-#: LiteEditor/edit_configuration.cpp:184
-msgid "' ?"
-msgstr "' ？"
+#, c-format
+msgid "Remove configuration '%s'?"
+msgstr "構成を削除しますか '%s'？"
 
 #: LiteEditor/edit_configuration.h:67
 msgid "Edit Configurations"
@@ -5018,9 +5023,10 @@ msgstr "構成を編集"
 msgid "&Close"
 msgstr "閉じる (&C)"
 
-#: LiteEditor/edit_workspace_conf_dlg.cpp:119
-msgid "Remove workspace configuration '"
-msgstr "ワークスペースの構成を削除しますか '"
+#: LiteEditor/edit_workspace_conf_dlg.cpp:118
+#, c-format
+msgid "Remove workspace configuration '%s'?"
+msgstr "ワークスペースの構成を削除しますか '%s'?"
 
 #: LiteEditor/edit_workspace_conf_dlg.cpp:132
 msgid "New Configuration Name:"
@@ -7130,9 +7136,10 @@ msgstr "式を編集"
 msgid "Insert new value for '%s':"
 msgstr "'%s' の新しい値を入力:"
 
-#: LiteEditor/mainbook.cpp:384
-msgid "Save changes to '"
-msgstr "変更を保存しますか '"
+#: LiteEditor/mainbook.cpp:383
+#, c-format
+msgid "Save changes to '%s'?"
+msgstr "変更を保存しますか '%s'?"
 
 #: LiteEditor/mainbook.cpp:922 LiteEditor/mainbook.cpp:1079 LiteEditor/mainbook.cpp:1120 LiteEditor/replaceinfilespanel.cpp:428
 msgid "Save Modified Files"
@@ -11635,17 +11642,15 @@ 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 '"
-msgstr "コピー '"
+#: Plugin/clEditorBar.cpp:249
+#, c-format
+msgid "Copy '%s' to the clipboard"
+msgstr "コピー '%s' をクリップボードにコピー"
 
-#: Plugin/clEditorBar.cpp:299
-msgid "' copied!"
-msgstr "' をコピーしました！"
+#: Plugin/clEditorBar.cpp:292
+#, c-format
+msgid "'%s' copied!"
+msgstr "'%s' をコピーしました！"
 
 #: Plugin/clGotoAnythingManager.cpp:156
 msgid "Current Tab > Close Tabs To The Right"
@@ -15198,22 +15203,14 @@ 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 "'%s' を削除しますか"
-
 #: abbreviation/abbreviationssettingsdlg.cpp:244
 msgid "This folder already contains a file named 'abbreviations.conf' - would you like to overwrite it?"
 msgstr "このフォルダーには、既に 'abbreviations.conf' という名前のファイルが含まれています - 上書きしますか？"
 
-#: 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 '"
-msgstr "短縮キーワードをエクスポートしました '"
+#: abbreviation/abbreviationssettingsdlg.cpp:250
+#, c-format
+msgid "Abbreviations were exported to '%s'"
+msgstr "短縮キーワードをエクスポートしました '%s'"
 
 #: abbreviation/abbreviationssettingsdlg.cpp:264
 msgid "The file does not seem to contain a valid abbreviations entries"
@@ -22316,20 +22313,18 @@ msgstr ""
 "変更を保存しますか？"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "'\n"
-msgstr "'\n"
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "Could not find target project: '"
-msgstr "対象のプロジェクトが見つかりませんでした: '"
+#, c-format
+msgid "Could not find target project: '%s'\n"
+msgstr "対象のプロジェクトが見つかりませんでした: '%s'\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:587
 msgid "Make sure that the virtual folder entry is valid (it must exist)\n"
 msgstr "仮想フォルダーの項目が有効 (存在している) であることを確認してください\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:588
-msgid "Virtual Folder provided was: '"
-msgstr "指定された仮想フォルダーは: '"
+#, c-format
+msgid "Virtual Folder provided was: '%s'"
+msgstr "指定された仮想フォルダーは: '%s'"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:687
 msgid "wxCrafter: code generation completed successfully!"
@@ -22344,12 +22339,9 @@ msgid "Could not create virtual folder 'wxcrafter'"
 msgstr "仮想フォルダー 'wxcrafter' を作成できませんでした"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "'.\n"
-msgstr "'。\n"
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "Error while reading file content: '"
-msgstr "ファイルの内容を読み取り中にエラーが発生しました: '"
+#, c-format
+msgid "Error while reading file content: '%s'.\n"
+msgstr "ファイルの内容を読み取り中にエラーが発生しました: '%s'。\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:991
 msgid "Could not read file content"
@@ -23131,9 +23123,10 @@ msgstr "メインサイザーを wxAui 管理下のウィンドウに置くこ
 msgid "Can't insert this item here"
 msgstr "ここには挿入できない項目です"
 
-#: wxcrafter/src/wxguicraft_main_view.cpp:2894
-msgid "Rename '"
-msgstr "名前を変更 '"
+#: wxcrafter/src/wxguicraft_main_view.cpp:2893
+#, c-format
+msgid "Rename '%s'"
+msgstr "名前を変更 '%s'"
 
 #: wxcrafter/src/wxguicraft_main_view.cpp:2895
 msgid "Enter the new name:"
diff --git a/translations/ru_RU/codelite.po b/translations/ru_RU/codelite.po
index 2971d9b0fe..e2c5249f27 100644
--- a/translations/ru_RU/codelite.po
+++ b/translations/ru_RU/codelite.po
@@ -522,8 +522,9 @@ msgstr "Компилятор с этим именем уже существуе
 
 #: CodeFormatter/codeformatterdlg.cpp:120
 #, fuzzy
-msgid "Delete formatter '"
-msgstr "Модуль форматирования XML"
+#, c-format
+msgid "Delete formatter '%s'?"
+msgstr "Модуль форматирования XML '%s'?"
 
 #: CodeFormatter/codeformatterdlg.cpp:121
 #, fuzzy
@@ -1711,9 +1712,10 @@ msgstr "Найти"
 msgid "Help"
 msgstr "Справка"
 
-#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:66
-msgid "Delete '"
-msgstr "Удалить '"
+#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:65
+#, c-format
+msgid "Delete '%s'?"
+msgstr "Удалить '%s'?"
 
 #: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:77
 msgid "Are you sure you want to scan for dap servers? (this will override your current settings)"
@@ -2157,8 +2159,10 @@ msgid "Could not find EOS CDT installation. Please install it and try again"
 msgstr "Не удалось найти набор инструментов для разработки контракта EOS. Установите его и повторите попытку"
 
 #: EOSWiki/eoswiki.cpp:85
-msgid "A project with the same name: '"
-msgstr "Проект с таким именем: '"
+#, c-format
+#, fuzzy
+msgid "A project with the same name: '%s'\nalready exists"
+msgstr "Проект с таким именем: '%s'\n"
 
 #: EOSWiki/eoswiki.cpp:100 LiteEditor/fileview.cpp:2369
 msgid "Failed to create workspace:\n"
@@ -2799,9 +2803,10 @@ msgstr "Модуль справки"
 msgid "Help Plugin"
 msgstr "Модуль справки"
 
-#: HelpPlugin/helpplugin.cpp:86
-msgid "Search the docs for '"
-msgstr "Найти в документации сведения о '"
+#: HelpPlugin/helpplugin.cpp:85
+#, c-format
+msgid "Search the docs for '%s'"
+msgstr "Найти в документации сведения о '%s'"
 
 #: LanguageServer/languageserver.cpp:35 LanguageServer/languageserver.cpp:45
 msgid "Support for Language Server Protocol (LSP)"
@@ -2910,8 +2915,9 @@ msgid "Delete Breakpoint"
 msgstr "Удалить точку останова"
 
 #: LiteEditor/BuildOrderDialog.cpp:12
-msgid "Edit build order for project '"
-msgstr "Изменить порядок сборки для проекта '"
+#, c-format
+msgid "Edit build order for project '%s'"
+msgstr "Изменить порядок сборки для проекта '%s'"
 
 #: LiteEditor/BuildOrderDialog.cpp:162
 msgid "You have un-saved changes, would you like to save them before changing configuration?"
@@ -3026,8 +3032,10 @@ msgid "Are you sure you want to delete this compiler option?"
 msgstr "Вы уверены, что хотите удалить этот параметр компилятора?"
 
 #: LiteEditor/CompilerMainPage.cpp:230 Plugin/LSP/LanguageServerSettingsDlg.cpp:58
-msgid "Are you sure you want to delete '"
-msgstr "Вы уверены, что хотите удалить '"
+#: abbreviation/abbreviationssettingsdlg.cpp:98
+#, c-format
+msgid "Are you sure you want to delete '%s'?"
+msgstr "Вы уверены, что хотите удалить «%s»?"
 
 #: LiteEditor/CompilerMainPage.cpp:241
 msgid "Are you sure you want to delete this linker option?"
@@ -5022,12 +5030,9 @@ msgid "Rename"
 msgstr "Переименовать"
 
 #: LiteEditor/edit_configuration.cpp:183
-msgid "Remove configuration '"
-msgstr "Удалить конфигурацию '"
-
-#: LiteEditor/edit_configuration.cpp:184
-msgid "' ?"
-msgstr "' ?"
+#, c-format
+msgid "Remove configuration '%s'?"
+msgstr "Удалить конфигурацию '%s'?"
 
 #: LiteEditor/edit_configuration.h:67
 msgid "Edit Configurations"
@@ -5037,9 +5042,10 @@ msgstr "Изменить конфигурации"
 msgid "&Close"
 msgstr "&Закрыть"
 
-#: LiteEditor/edit_workspace_conf_dlg.cpp:119
-msgid "Remove workspace configuration '"
-msgstr "Удалить конфигурацию рабочего пространства '"
+#: LiteEditor/edit_workspace_conf_dlg.cpp:118
+#, c-format
+msgid "Remove workspace configuration '%s'?"
+msgstr "Удалить конфигурацию рабочего пространства '%s'?"
 
 #: LiteEditor/edit_workspace_conf_dlg.cpp:132
 msgid "New Configuration Name:"
@@ -7159,9 +7165,10 @@ msgstr "Редактировать выражение"
 msgid "Insert new value for '%s':"
 msgstr "Добавить новое значение для «%s»:"
 
-#: LiteEditor/mainbook.cpp:384
-msgid "Save changes to '"
-msgstr "Сохранить изменения в '"
+#: LiteEditor/mainbook.cpp:383
+#, c-format
+msgid "Save changes to '%s'?"
+msgstr "Сохранить изменения в '%s'?"
 
 #: LiteEditor/mainbook.cpp:922 LiteEditor/mainbook.cpp:1079 LiteEditor/mainbook.cpp:1120 LiteEditor/replaceinfilespanel.cpp:428
 msgid "Save Modified Files"
@@ -11697,17 +11704,15 @@ 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 '"
-msgstr "Копировать '"
+#: Plugin/clEditorBar.cpp:249
+#, c-format
+msgid "Copy '%s' to the clipboard"
+msgstr "Копировать '%s' в буфер обмена"
 
-#: Plugin/clEditorBar.cpp:299
-msgid "' copied!"
-msgstr "' скопирован!"
+#: Plugin/clEditorBar.cpp:292
+#, c-format
+msgid "'%s' copied!"
+msgstr "'%s' скопирован!"
 
 #: Plugin/clGotoAnythingManager.cpp:156
 msgid "Current Tab > Close Tabs To The Right"
@@ -15279,22 +15284,14 @@ 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 "Вы уверены, что хотите удалить «%s»?"
-
 #: abbreviation/abbreviationssettingsdlg.cpp:244
 msgid "This folder already contains a file named 'abbreviations.conf' - would you like to overwrite it?"
 msgstr "Эта папка уже содержит файл с именем «abbreviations.conf». Перезаписать его?"
 
-#: 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 '"
-msgstr "Сокращения экспортированы в '"
+#: abbreviation/abbreviationssettingsdlg.cpp:250
+#, c-format
+msgid "Abbreviations were exported to '%s'"
+msgstr "Сокращения экспортированы в '%s'"
 
 #: abbreviation/abbreviationssettingsdlg.cpp:264
 msgid "The file does not seem to contain a valid abbreviations entries"
@@ -22408,20 +22405,18 @@ msgstr ""
 "Сохранить изменения?"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "'\n"
-msgstr "'\n"
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "Could not find target project: '"
-msgstr "Не удалось найти целевой проект: '"
+#, c-format
+msgid "Could not find target project: '%s'\n"
+msgstr "Не удалось найти целевой проект: '%s'\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:587
 msgid "Make sure that the virtual folder entry is valid (it must exist)\n"
 msgstr "Убедитесь, что запись виртуальной папки является допустимой (она должна существовать)\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:588
-msgid "Virtual Folder provided was: '"
-msgstr "Указанная виртуальная папка: '"
+#, c-format
+msgid "Virtual Folder provided was: '%s'"
+msgstr "Указанная виртуальная папка: '%s'"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:687
 msgid "wxCrafter: code generation completed successfully!"
@@ -22436,12 +22431,9 @@ msgid "Could not create virtual folder 'wxcrafter'"
 msgstr "Не удалось создать виртуальную папку «wxcrafter»"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "'.\n"
-msgstr "'.\n"
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "Error while reading file content: '"
-msgstr "Ошибка при чтении содержимого файла: '"
+#, c-format
+msgid "Error while reading file content: '%s'.\n"
+msgstr "Ошибка при чтении содержимого файла: '%s'.\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:991
 msgid "Could not read file content"
@@ -23223,9 +23215,10 @@ msgstr "Главный сайзер не может быть помещён в 
 msgid "Can't insert this item here"
 msgstr "Не удалось вставить этот элемент сюда"
 
-#: wxcrafter/src/wxguicraft_main_view.cpp:2894
-msgid "Rename '"
-msgstr "Переименовать '"
+#: wxcrafter/src/wxguicraft_main_view.cpp:2893
+#, c-format
+msgid "Rename '%s'"
+msgstr "Переименовать '%s'"
 
 #: wxcrafter/src/wxguicraft_main_view.cpp:2895
 msgid "Enter the new name:"
diff --git a/translations/zh_CN/codelite.po b/translations/zh_CN/codelite.po
index ad13f57c7d..088b610aa7 100644
--- a/translations/zh_CN/codelite.po
+++ b/translations/zh_CN/codelite.po
@@ -520,8 +520,9 @@ msgid "Formatter with similar name already exists"
 msgstr "同名的格式化器已存在"
 
 #: CodeFormatter/codeformatterdlg.cpp:120
-msgid "Delete formatter '"
-msgstr "删除格式化器“"
+#, c-format
+msgid "Delete formatter '%s'?"
+msgstr "删除格式化器“%s”？"
 
 #: CodeFormatter/codeformatterdlg.cpp:121
 msgid "Delete formatter"
@@ -1701,9 +1702,10 @@ msgstr "扫描"
 msgid "Help"
 msgstr "帮助"
 
-#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:66
-msgid "Delete '"
-msgstr "删除 ‘"
+#: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:65
+#, c-format
+msgid "Delete '%s'?"
+msgstr "删除 “%s”?"
 
 #: DebugAdapterClient/DapDebuggerSettingsDlg.cpp:77
 msgid "Are you sure you want to scan for dap servers? (this will override your current settings)"
@@ -2144,8 +2146,10 @@ msgid "Could not find EOS CDT installation. Please install it and try again"
 msgstr "未发现安装 EOS CDT。请安装然后再重试"
 
 #: EOSWiki/eoswiki.cpp:85
-msgid "A project with the same name: '"
-msgstr "存在同名项目：“"
+#, c-format
+#, fuzzy
+msgid "A project with the same name: '%s'\nalready exists"
+msgstr "存在同名项目：“%s”\n"
 
 #: EOSWiki/eoswiki.cpp:100 LiteEditor/fileview.cpp:2369
 msgid "Failed to create workspace:\n"
@@ -2786,9 +2790,10 @@ msgstr "帮助插件"
 msgid "Help Plugin"
 msgstr "帮助插件"
 
-#: HelpPlugin/helpplugin.cpp:86
-msgid "Search the docs for '"
-msgstr "从文档搜索“"
+#: HelpPlugin/helpplugin.cpp:85
+#, c-format
+msgid "Search the docs for '%s'"
+msgstr "从文档搜索“%s”"
 
 #: LanguageServer/languageserver.cpp:35 LanguageServer/languageserver.cpp:45
 msgid "Support for Language Server Protocol (LSP)"
@@ -2897,8 +2902,9 @@ msgid "Delete Breakpoint"
 msgstr "删除断点"
 
 #: LiteEditor/BuildOrderDialog.cpp:12
-msgid "Edit build order for project '"
-msgstr "编辑该项目构建顺序”"
+#, c-format
+msgid "Edit build order for project '%s'"
+msgstr "编辑该项目构建顺序“%s”"
 
 #: LiteEditor/BuildOrderDialog.cpp:162
 msgid "You have un-saved changes, would you like to save them before changing configuration?"
@@ -3013,8 +3019,10 @@ msgid "Are you sure you want to delete this compiler option?"
 msgstr "你确定要删除这个编译器选项吗？"
 
 #: LiteEditor/CompilerMainPage.cpp:230 Plugin/LSP/LanguageServerSettingsDlg.cpp:58
-msgid "Are you sure you want to delete '"
-msgstr "你确定要删除“"
+#: abbreviation/abbreviationssettingsdlg.cpp:98
+#, c-format
+msgid "Are you sure you want to delete '%s'?"
+msgstr "你确定要删除“%s”?"
 
 #: LiteEditor/CompilerMainPage.cpp:241
 msgid "Are you sure you want to delete this linker option?"
@@ -4998,12 +5006,9 @@ msgid "Rename"
 msgstr "重命名"
 
 #: LiteEditor/edit_configuration.cpp:183
-msgid "Remove configuration '"
-msgstr "移除配置”"
-
-#: LiteEditor/edit_configuration.cpp:184
-msgid "' ?"
-msgstr "“？"
+#, c-format
+msgid "Remove configuration '%s'?"
+msgstr "移除配置“%s”？"
 
 #: LiteEditor/edit_configuration.h:67
 msgid "Edit Configurations"
@@ -5013,9 +5018,10 @@ msgstr "编辑配置"
 msgid "&Close"
 msgstr "关闭(&C)"
 
-#: LiteEditor/edit_workspace_conf_dlg.cpp:119
-msgid "Remove workspace configuration '"
-msgstr "移除工作区配置“"
+#: LiteEditor/edit_workspace_conf_dlg.cpp:118
+#, c-format
+msgid "Remove workspace configuration '%s'?"
+msgstr "移除工作区配置“%s”?"
 
 #: LiteEditor/edit_workspace_conf_dlg.cpp:132
 msgid "New Configuration Name:"
@@ -7123,9 +7129,10 @@ msgstr "编辑表达式"
 msgid "Insert new value for '%s':"
 msgstr "插入“%s”的新值："
 
-#: LiteEditor/mainbook.cpp:384
-msgid "Save changes to '"
-msgstr "保存变更到“"
+#: LiteEditor/mainbook.cpp:383
+#, c-format
+msgid "Save changes to '%s'?"
+msgstr "保存变更到“%s”?"
 
 #: LiteEditor/mainbook.cpp:922 LiteEditor/mainbook.cpp:1079 LiteEditor/mainbook.cpp:1120 LiteEditor/replaceinfilespanel.cpp:428
 msgid "Save Modified Files"
@@ -11615,17 +11622,15 @@ 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 '"
-msgstr "复制”"
+#: Plugin/clEditorBar.cpp:249
+#, c-format
+msgid "Copy '%s' to the clipboard"
+msgstr "复制“%s”到粘贴板"
 
-#: Plugin/clEditorBar.cpp:299
-msgid "' copied!"
-msgstr "“已复制！"
+#: Plugin/clEditorBar.cpp:292
+#, c-format
+msgid "'%s' copied!"
+msgstr "“%s”已复制！"
 
 #: Plugin/clGotoAnythingManager.cpp:156
 msgid "Current Tab > Close Tabs To The Right"
@@ -15175,22 +15180,14 @@ 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 "你确定要删除“%s”"
-
 #: abbreviation/abbreviationssettingsdlg.cpp:244
 msgid "This folder already contains a file named 'abbreviations.conf' - would you like to overwrite it?"
 msgstr "该文件夹已包含一个名为“abbreviations.conf”的文件 - 你想要覆盖它吗？"
 
-#: 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 '"
-msgstr "缩略语表导出到 ”"
+#: abbreviation/abbreviationssettingsdlg.cpp:250
+#, c-format
+msgid "Abbreviations were exported to '%s'"
+msgstr "缩略语表导出到 “%s”"
 
 #: abbreviation/abbreviationssettingsdlg.cpp:264
 msgid "The file does not seem to contain a valid abbreviations entries"
@@ -22280,20 +22277,18 @@ msgstr ""
 "要保存更改吗？"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "'\n"
-msgstr "\"\n"
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:586
-msgid "Could not find target project: '"
-msgstr "找不到目标项目：“"
+#, c-format
+msgid "Could not find target project: '%s'\n"
+msgstr "找不到目标项目：“%s”\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:587
 msgid "Make sure that the virtual folder entry is valid (it must exist)\n"
 msgstr "确保虚拟文件夹条目有效（必须存在）\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:588
-msgid "Virtual Folder provided was: '"
-msgstr "提供的虚拟文件夹是：”"
+#, c-format
+msgid "Virtual Folder provided was: '%s'"
+msgstr "提供的虚拟文件夹是：“%s”"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:687
 msgid "wxCrafter: code generation completed successfully!"
@@ -22308,12 +22303,9 @@ msgid "Could not create virtual folder 'wxcrafter'"
 msgstr "无法创建虚拟文件夹”wxcrafter“"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "'.\n"
-msgstr "”。\n"
-
-#: wxcrafter/src/wxcrafter_plugin.cpp:990
-msgid "Error while reading file content: '"
-msgstr "读取文件内容时出错：“"
+#, c-format
+msgid "Error while reading file content: '%s'.\n"
+msgstr "读取文件内容时出错：“%s”。\n"
 
 #: wxcrafter/src/wxcrafter_plugin.cpp:991
 msgid "Could not read file content"
@@ -23095,9 +23087,10 @@ msgstr "无法在 wxAui 托管窗口中放置主调整器"
 msgid "Can't insert this item here"
 msgstr "无法在此处插入此项目"
 
-#: wxcrafter/src/wxguicraft_main_view.cpp:2894
-msgid "Rename '"
-msgstr "重命名”"
+#: wxcrafter/src/wxguicraft_main_view.cpp:2893
+#, c-format
+msgid "Rename '%s'"
+msgstr "重命名“%s”"
 
 #: wxcrafter/src/wxguicraft_main_view.cpp:2895
 msgid "Enter the new name:"
diff --git a/wxcrafter/src/wxcrafter_plugin.cpp b/wxcrafter/src/wxcrafter_plugin.cpp
index 92fb6edbb9..1cd0f5c885 100644
--- a/wxcrafter/src/wxcrafter_plugin.cpp
+++ b/wxcrafter/src/wxcrafter_plugin.cpp
@@ -583,9 +583,9 @@ void wxCrafterPlugin::OnBitmapCodeGenerationCompleted(wxCommandEvent& e)
 
             if (!project) {
                 wxString msg;
-                msg << _("Could not find target project: '") << projectName << _("'\n");
+                msg << wxString::Format(_("Could not find target project: '%s'\n"), projectName);
                 msg << _("Make sure that the virtual folder entry is valid (it must exist)\n");
-                msg << _("Virtual Folder provided was: '") << vd << _("'");
+                msg << wxString::Format(_("Virtual Folder provided was: '%s'"), vd);
                 ::wxMessageBox(msg, _("wxCrafter"), wxOK | wxICON_ERROR);
                 return;
             }
@@ -982,7 +982,7 @@ bool wxCrafterPlugin::DoReadFileContentAndPrompt(const wxFileName& fn, wxString&
     // Read the header file content from the disk
     if (!wxCrafter::ReadFileContent(fn.GetFullPath(), content)) {
         wxString msg;
-        msg << _("Error while reading file content: '") << fn.GetFullPath() << _("'.\n")
+        msg << wxString::Format(_("Error while reading file content: '%s'.\n"), fn.GetFullPath())
             << _("Could not read file content");
         ::wxMessageBox(msg, _("wxCrafter"), wxICON_WARNING | wxOK | wxCENTER, EventNotifier::Get()->TopFrame());
         return false;
diff --git a/wxcrafter/src/wxguicraft_main_view.cpp b/wxcrafter/src/wxguicraft_main_view.cpp
index b7cd00c9a2..e14cd250e3 100644
--- a/wxcrafter/src/wxguicraft_main_view.cpp
+++ b/wxcrafter/src/wxguicraft_main_view.cpp
@@ -2890,8 +2890,7 @@ void GUICraftMainPanel::OnRename(wxCommandEvent& event)
         CHECK_POINTER(itemData);
         CHECK_POINTER(itemData->m_wxcWidget);
 
-        wxString msg;
-        msg << _("Rename '") << itemData->m_wxcWidget->GetName() << _("'");
+        wxString msg = wxString::Format(_("Rename '%s'"), itemData->m_wxcWidget->GetName());
         wxString new_name = ::wxGetTextFromUser(_("Enter the new name:"), msg, itemData->m_wxcWidget->GetName(), this);
         if (new_name.empty()) {
             return;