diff --git a/gnucash/gnome-search/dialog-search.c b/gnucash/gnome-search/dialog-search.c
index a77099dfea..1d90e74f67 100644
--- a/gnucash/gnome-search/dialog-search.c
+++ b/gnucash/gnome-search/dialog-search.c
@@ -1094,8 +1094,7 @@ type_label_to_new_button(const gchar* type_label)
     else
     {
         PWARN("No translatable new-button label found for search type \"%s\", please add one into dialog-search.c!", type_label);
-        /* Translators: This string has a disambiguation prefix. Translate only the part behind '|' */
-        return Q_("Item represents an unknown object type (in the sense of bill, customer, invoice, transaction, split,...)|New item");
+        return C_("Item represents an unknown object type (in the sense of bill, customer, invoice, transaction, split,...)!", "New item");
     }
 }
 
diff --git a/gnucash/gnome-utils/gnc-tree-model-split-reg.c b/gnucash/gnome-utils/gnc-tree-model-split-reg.c
index 3b224e1bef..de50205756 100644
--- a/gnucash/gnome-utils/gnc-tree-model-split-reg.c
+++ b/gnucash/gnome-utils/gnc-tree-model-split-reg.c
@@ -2851,9 +2851,7 @@ gnc_tree_model_split_reg_update_action_list (GncTreeModelSplitReg *model)
         /* broken ! FIXME bg ????????? What is broken */
     case SEARCH_LEDGER2:
 
-        /* Translators: This string has a context prefix; the translation
-        	must only contain the part after the | character. */
-        gtk_list_store_insert_with_values (store, &iter, 100, 0, Q_("Action Column|Deposit"), -1);
+        gtk_list_store_insert_with_values (store, &iter, 100, 0, C_("Action Column", "Deposit"), -1);
         gtk_list_store_insert_with_values (store, &iter, 100, 0, _("Withdraw"), -1);
         gtk_list_store_insert_with_values (store, &iter, 100, 0, _("Check"), -1);
         gtk_list_store_insert_with_values (store, &iter, 100, 0, _("Interest"), -1);
@@ -2952,8 +2950,7 @@ gnc_tree_model_split_reg_update_action_list (GncTreeModelSplitReg *model)
         gtk_list_store_insert_with_values (store, &iter, 100, 0, _("Income"), -1);
         /* Action: Distribution */
         gtk_list_store_insert_with_values (store, &iter, 100, 0, _("Dist"), -1);
-        /* Translators: This string has a disambiguation prefix */
-        gtk_list_store_insert_with_values (store, &iter, 100, 0, Q_("Action Column|Split"), -1);
+        gtk_list_store_insert_with_values (store, &iter, 100, 0, C_("Action Column", "Split"), -1);
         break;
 
     default:
diff --git a/gnucash/gnome-utils/gnc-tree-view-commodity.c b/gnucash/gnome-utils/gnc-tree-view-commodity.c
index 9b34f43cac..46dc23fa68 100644
--- a/gnucash/gnome-utils/gnc-tree-view-commodity.c
+++ b/gnucash/gnome-utils/gnc-tree-view-commodity.c
@@ -404,9 +404,7 @@ gnc_tree_view_commodity_new (QofBook *book,
     g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
     gnc_tree_view_add_toggle_column(
               view, _("Get Quotes"),
-              /* Translators: This string has a context prefix; the translation
-                 must only contain the part after the | character. */
-              Q_("Column letter for 'Get Quotes'|Q"), "quote_flag",
+              C_("Column letter for 'Get Quotes'", "Q"), "quote_flag",
               GNC_TREE_MODEL_COMMODITY_COL_QUOTE_FLAG,
               GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
               sort_by_quote_flag,
diff --git a/gnucash/gnome-utils/gnc-tree-view-owner.c b/gnucash/gnome-utils/gnc-tree-view-owner.c
index 8d6e802aec..8c5c6e8bb5 100644
--- a/gnucash/gnome-utils/gnc-tree-view-owner.c
+++ b/gnucash/gnome-utils/gnc-tree-view-owner.c
@@ -476,9 +476,7 @@ gnc_tree_view_owner_new (GncOwnerType owner_type)
                                         GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                         sort_by_string);
     gnc_tree_view_add_toggle_column (view, _("Active"),
-                                     /* Translators: This string has a context prefix; the translation
-                                        must only contain the part after the | character. */
-                                     Q_("Column letter for 'Active'|A"),
+                                     C_("Column letter for 'Active'", "A"),
                                      GNC_OWNER_TREE_ACTIVE_COL,
                                      GNC_TREE_MODEL_OWNER_COL_ACTIVE,
                                      GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
diff --git a/gnucash/gnome-utils/gnc-tree-view-sx-list.c b/gnucash/gnome-utils/gnc-tree-view-sx-list.c
index c48a5325db..32dc45ee4f 100644
--- a/gnucash/gnome-utils/gnc-tree-view-sx-list.c
+++ b/gnucash/gnome-utils/gnc-tree-view-sx-list.c
@@ -138,9 +138,7 @@ gnc_tree_view_sx_list_new(GncSxInstanceModel *sx_instances)
     g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
 
     col = gnc_tree_view_add_toggle_column(view, _("Enabled"),
-                                          /* Translators: This string has a context prefix; the translation
-                                             must only contain the part after the | character. */
-                                          Q_("Single-character short column-title form of 'Enabled'|E"),
+                                          C_("Single-character short column-title form of 'Enabled'", "E"),
                                           "enabled", SXLTMA_COL_ENABLED,
                                           GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
                                           NULL, NULL);
diff --git a/gnucash/gnome/assistant-stock-split.c b/gnucash/gnome/assistant-stock-split.c
index 77fb8b3334..d02089f942 100644
--- a/gnucash/gnome/assistant-stock-split.c
+++ b/gnucash/gnome/assistant-stock-split.c
@@ -378,8 +378,8 @@ gnc_stock_split_assistant_finish (GtkAssistant *assistant,
     xaccSplitMakeStockSplit (split);
     /* Set split-action with gnc_set_num_action which is the same as
      * xaccSplitSetAction with these arguments */
-    /* Translators: This string has a disambiguation prefix */
-    gnc_set_num_action (NULL, split, NULL, Q_("Action Column|Split"));
+
+    gnc_set_num_action (NULL, split, NULL, C_("Action Column", "Split"));
 
     amount = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (info->price_edit));
     if (gnc_numeric_positive_p (amount))
diff --git a/gnucash/register/ledger-core/split-register.c b/gnucash/register/ledger-core/split-register.c
index a73ac93827..d65c09fa64 100644
--- a/gnucash/register/ledger-core/split-register.c
+++ b/gnucash/register/ledger-core/split-register.c
@@ -2574,9 +2574,7 @@ gnc_split_register_config_action (SplitRegister *reg)
     case BANK_REGISTER:
         /* broken ! FIXME bg */
     case SEARCH_LEDGER:
-        /* Translators: This string has a context prefix; the translation
-        	must only contain the part after the | character. */
-        gnc_combo_cell_add_menu_item (cell, Q_("Action Column|Deposit"));
+        gnc_combo_cell_add_menu_item (cell, C_("Action Column", "Deposit"));
         gnc_combo_cell_add_menu_item (cell, _("Withdraw"));
         gnc_combo_cell_add_menu_item (cell, _("Check"));
         gnc_combo_cell_add_menu_item (cell, _("Interest"));
@@ -2675,8 +2673,7 @@ gnc_split_register_config_action (SplitRegister *reg)
         gnc_combo_cell_add_menu_item (cell, _("Income"));
         /* Action: Distribution */
         gnc_combo_cell_add_menu_item (cell, _("Dist"));
-        /* Translators: This string has a disambiguation prefix */
-        gnc_combo_cell_add_menu_item (cell, Q_("Action Column|Split"));
+        gnc_combo_cell_add_menu_item (cell, C_("Action Column", "Split"));
         break;
 
     default:
diff --git a/libgnucash/engine/Split.c b/libgnucash/engine/Split.c
index ddafd25745..335db848cc 100644
--- a/libgnucash/engine/Split.c
+++ b/libgnucash/engine/Split.c
@@ -1609,8 +1609,7 @@ xaccSplitGetCorrAccountCode(const Split *sa)
     if (!get_corr_account_split(sa, &other_split))
     {
         if (!split_const)
-            /* Translators: This string has a disambiguation prefix */
-            split_const = Q_("Displayed account code of the other account in a multi-split transaction|Split");
+            split_const = C_("Displayed account code of the other account in a multi-split transaction", "Split");
 
         return split_const;
     }