diff --git a/moo/mooapp/glade/mooappabout-credits.glade b/moo/mooapp/glade/mooappabout-credits.glade
index b6444392..95e19a86 100644
--- a/moo/mooapp/glade/mooappabout-credits.glade
+++ b/moo/mooapp/glade/mooappabout-credits.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <glade-interface>
 <widget class="GtkDialog" id="CreditsDialog">
-<property name="title" translatable="yes" context="yes" comments="Translators: do not translate the part before |">Dialog title|Credits</property>
+<property name="title" translatable="yes" context="yes" comments="Translators: remove the part before and including |">Dialog title|Credits</property>
 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
 <property name="default_width">360</property>
 <property name="default_height">260</property>
diff --git a/moo/mooapp/glade/mooappabout-dialog.glade b/moo/mooapp/glade/mooappabout-dialog.glade
index 0c0f00f7..a96a238e 100644
--- a/moo/mooapp/glade/mooappabout-dialog.glade
+++ b/moo/mooapp/glade/mooappabout-dialog.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <glade-interface>
 <widget class="GtkDialog" id="AboutDialog">
-<property name="title" translatable="yes" context="yes" comments="Translators: do not translate the part before |">Dialog title|About</property>
+<property name="title" translatable="yes" context="yes" comments="Translators: remove the part before and including |">Dialog title|About</property>
 <property name="resizable">False</property>
 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
 <property name="destroy_with_parent">True</property>
diff --git a/moo/mooapp/glade/mooappabout-license.glade b/moo/mooapp/glade/mooappabout-license.glade
index e12ddf5a..feef06f9 100644
--- a/moo/mooapp/glade/mooappabout-license.glade
+++ b/moo/mooapp/glade/mooappabout-license.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <glade-interface>
 <widget class="GtkDialog" id="LicenseDialog">
-<property name="title" translatable="yes" context="yes" comments="Translators: do not translate the part before |">Dialog title|License</property>
+<property name="title" translatable="yes" context="yes" comments="Translators: remove the part before and including |">Dialog title|License</property>
 <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
 <property name="default_width">420</property>
 <property name="default_height">320</property>
diff --git a/moo/mooedit/mooeditor.c b/moo/mooedit/mooeditor.c
index dc34d7b5..c63e2c8e 100644
--- a/moo/mooedit/mooeditor.c
+++ b/moo/mooedit/mooeditor.c
@@ -328,6 +328,7 @@ moo_editor_class_init (MooEditorClass *klass)
                                         NULL, NULL);
     moo_window_class_new_action (edit_window_class, RECENT_DIALOG_ACTION_ID, NULL,
                                  "display-name", _("Open Recent Files Dialog"),
+                                 /* Translators: remove the part before and including | */
                                  "label", Q_("Open Recent|_More..."),
                                  "default-accel", MOO_EDIT_ACCEL_OPEN_RECENT_DIALOG,
                                  "closure-callback", action_recent_dialog,
diff --git a/moo/mooedit/mooeditprefspage.c b/moo/mooedit/mooeditprefspage.c
index c8f74c18..188f16b1 100644
--- a/moo/mooedit/mooeditprefspage.c
+++ b/moo/mooedit/mooeditprefspage.c
@@ -164,6 +164,7 @@ GtkWidget *
 moo_edit_prefs_page_new_1 (MooEditor *editor)
 {
     return prefs_page_new (editor,
+                           /* Label of a Preferences dialog page, remove the part before and including | */
                            Q_("PreferencesPage|General"),
                            GTK_STOCK_EDIT,
                            page_general_init_ui,
@@ -199,6 +200,7 @@ GtkWidget *
 moo_edit_prefs_page_new_5 (MooEditor *editor)
 {
     return prefs_page_new (editor,
+                           /* Label of a Preferences dialog page, remove the part before and including | */
                            Q_("PreferencesPage|File Filters"),
                            GTK_STOCK_EDIT,
                            page_filters_init_ui,
@@ -251,6 +253,7 @@ GtkWidget *
 moo_edit_prefs_page_new_2 (MooEditor *editor)
 {
     return prefs_page_new (editor,
+                           /* Label of a Preferences dialog page, remove the part before and including | */
                            Q_("PreferencesPage|View"),
                            GTK_STOCK_EDIT,
                            page_view_init_ui,
@@ -297,6 +300,7 @@ GtkWidget *
 moo_edit_prefs_page_new_3 (MooEditor *editor)
 {
     return prefs_page_new (editor,
+                           /* Label of a Preferences dialog page, remove the part before and including | */
                            Q_("PreferencesPage|File"),
                            GTK_STOCK_EDIT,
                            page_file_init_ui,
@@ -336,6 +340,7 @@ GtkWidget *
 moo_edit_prefs_page_new_4 (MooEditor *editor)
 {
     return prefs_page_new (editor,
+                           /* Label of a Preferences dialog page, remove the part before and including | */
                            Q_("PreferencesPage|Languages"),
                            GTK_STOCK_EDIT,
                            page_langs_init_ui,
@@ -551,6 +556,8 @@ create_lang_model (void)
     mime = list_to_string (_moo_lang_mgr_get_mime_types (mgr, NULL), TRUE);
     gtk_tree_store_set (store, &iter,
                         COLUMN_ID, MOO_LANG_NONE,
+                        /* Label in the Language combo box on Languages preferences page,
+                           remove the part before and including | */
                         COLUMN_NAME, Q_("Language|None"),
                         COLUMN_CONFIG, config,
                         COLUMN_MIMETYPES, mime,
diff --git a/moo/mooedit/mooplugin-loader.c b/moo/mooedit/mooplugin-loader.c
index 9b4656b3..b054f675 100644
--- a/moo/mooedit/mooplugin-loader.c
+++ b/moo/mooedit/mooplugin-loader.c
@@ -223,6 +223,7 @@ check_version (const char *version,
     {
         guint current_major, current_minor;
         _moo_module_version (&current_major, &current_minor);
+        /* Translators: remove the part before and including | */
         moo_message_noloc (Q_("console message|ignoring file '%s', module version '%s' is not "
                            "compatible with current version %u.%u"),
                      ini_file_path, version, current_major, current_minor);
@@ -232,6 +233,7 @@ check_version (const char *version,
     return TRUE;
 
 invalid:
+    /* Translators: remove the part before and including | */
     moo_warning_noloc (Q_("console message|invalid module version '%s' in file '%s'"),
                        version, ini_file_path);
     return FALSE;
diff --git a/moo/moofileview/moofileview-tools.c b/moo/moofileview/moofileview-tools.c
index e7455ab3..52e371fd 100644
--- a/moo/moofileview/moofileview-tools.c
+++ b/moo/moofileview/moofileview-tools.c
@@ -331,6 +331,7 @@ _moo_file_view_tools_load (MooFileView *fileview)
     }
 
     {
+        /* Translators: this is a context menu item label in the file selector, remove the part before and including | */
         GtkAction *action = tool_action_new (fileview, Q_("Open with|Default Application"), "*", NULL,
 #ifndef __WIN32__
                                              "xdg-open %f"
diff --git a/moo/mooutils/glade/mooaccelprefs.glade b/moo/mooutils/glade/mooaccelprefs.glade
index 893d3bd3..86d1ca11 100644
--- a/moo/mooutils/glade/mooaccelprefs.glade
+++ b/moo/mooutils/glade/mooaccelprefs.glade
@@ -73,7 +73,7 @@
 <child>
 <widget class="GtkRadioButton" id="shortcut_none">
 <property name="visible">True</property>
-<property name="label" translatable="yes" context="yes" comments="Translators: do not translate the part before |">Shortcut|None</property>
+<property name="label" translatable="yes" context="yes" comments="Translators: remove the part before and including |">Shortcut|None</property>
 <property name="use_underline">True</property>
 <property name="focus_on_click">False</property>
 <property name="response_id">0</property>
@@ -87,7 +87,7 @@
 <child>
 <widget class="GtkRadioButton" id="shortcut_default">
 <property name="visible">True</property>
-<property name="label" translatable="yes" context="yes" comments="Translators: do not translate the part before |">Shortcut|Default</property>
+<property name="label" translatable="yes" context="yes" comments="Translators: remove the part before and including |">Shortcut|Default</property>
 <property name="use_underline">True</property>
 <property name="focus_on_click">False</property>
 <property name="response_id">0</property>
@@ -104,7 +104,7 @@
 <child>
 <widget class="GtkRadioButton" id="shortcut_custom">
 <property name="visible">True</property>
-<property name="label" translatable="yes" context="yes" comments="Translators: do not translate the part before |">Shortcut|Custom</property>
+<property name="label" translatable="yes" context="yes" comments="Translators: remove the part before and including |">Shortcut|Custom</property>
 <property name="use_underline">True</property>
 <property name="focus_on_click">False</property>
 <property name="response_id">0</property>
diff --git a/moo/mooutils/mooencodings-data.h b/moo/mooutils/mooencodings-data.h
index 574913ab..836380eb 100644
--- a/moo/mooutils/mooencodings-data.h
+++ b/moo/mooutils/mooencodings-data.h
@@ -68,31 +68,31 @@ static const struct {
     { "ISO-8859-15",    N_("Western"),             "ISO-8859-15",      ENCODING_GROUP_WEST_EUROPEAN },
     { "ISO-8859-16",    N_("Romanian"),            "ISO-8859-16",      ENCODING_GROUP_EAST_EUROPEAN },
 
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-7",          NULL, N_("encoding label|UTF-7"),                                 ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-32BE-BOM",   NULL, N_("encoding label|UTF-32BE-BOM (big-endian, with BOM)"),   ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-32LE-BOM",   NULL, N_("encoding label|UTF-32LE-BOM (little-endian, with BOM)"),ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-32BE",       NULL, N_("encoding label|UTF-32BE (big-endian, no BOM)"),         ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-32LE",       NULL, N_("encoding label|UTF-32LE (little-endian, no BOM)"),      ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-16BE-BOM",   NULL, N_("encoding label|UTF-16BE-BOM (big-endian, with BOM)"),   ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-16LE-BOM",   NULL, N_("encoding label|UTF-16LE-BOM (little-endian, with BOM)"),ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-16BE",       NULL, N_("encoding label|UTF-16BE (big-endian, no BOM)"),         ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-16LE",       NULL, N_("encoding label|UTF-16LE (little-endian, no BOM)"),      ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-8-BOM",      NULL, N_("encoding label|UTF-8-BOM"),                             ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-32",         NULL, N_("encoding label|UTF-32"),                                ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-16",         NULL, N_("encoding label|UTF-16"),                                ENCODING_GROUP_UNICODE },
-    // Label of an encoding menu item, do not translate the part before |
+    // Label of an encoding menu item, remove the part before and including |
     { "UTF-8",          NULL, N_("encoding label|UTF-8"),                                 ENCODING_GROUP_UNICODE },
 
     { "ARMSCII-8",      N_("Armenian"),            "ARMSCII-8",        ENCODING_GROUP_SE_SW_ASIAN },
diff --git a/moo/mooutils/mooencodings.c b/moo/mooutils/mooencodings.c
index 09554c43..3a521ee1 100644
--- a/moo/mooutils/mooencodings.c
+++ b/moo/mooutils/mooencodings.c
@@ -728,7 +728,7 @@ setup_combo (GtkComboBox      *combo,
         gtk_tree_store_append (store, &iter, NULL);
 
     gtk_tree_store_append (store, &iter, NULL);
-    /* Translators: do not translate the part before | */
+    /* Translators: remove the part before and including | */
     gtk_tree_store_set (store, &iter, COLUMN_DISPLAY, Q_("Encodings combo submenu|Other"), -1);
 
     for (i = 0; i < enc_mgr->n_groups; ++i)
diff --git a/moo/mooutils/mooutils-misc.c b/moo/mooutils/mooutils-misc.c
index c109af60..646c12c9 100644
--- a/moo/mooutils/mooutils-misc.c
+++ b/moo/mooutils/mooutils-misc.c
@@ -1799,6 +1799,7 @@ void _moo_logv (MooCodeLoc loc, GLogLevelFlags flags, const char *format, va_lis
     message = g_strdup_vprintf (format, args);
 
     g_log (G_LOG_DOMAIN, flags,
+           /* Translators: remove the part before and including | */
            Q_("console message|in file %s, line %d, function %s: %s"),
            loc.file, loc.line, loc.func, message);
 
diff --git a/moo/plugins/usertools/filters.xml b/moo/plugins/usertools/filters.xml
index ea2b4d83..8191d5ed 100644
--- a/moo/plugins/usertools/filters.xml
+++ b/moo/plugins/usertools/filters.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <medit-filters version="1.0">
-  <!-- Output filter for shell commands -->
+  <!-- Output filter for shell commands. Translators: remove the part before and including |. -->
   <filter id="default" _name="Filter|Default">
     <match what="stdout" pattern="^(?P&lt;file&gt;[^:]+):(?P&lt;line&gt;\d+)?"/>
     <match what="stderr" pattern="^(?P&lt;file&gt;[^:]+):(?P&lt;line&gt;\d+)?"/>
   </filter>
 
-  <!-- Output filter for shell commands -->
+  <!-- Output filter for shell commands. Translators: remove the part before and including |. -->
   <filter id="none" _name="Filter|None"/>
 
-  <!-- Output filter for shell commands -->
+  <!-- Output filter for shell commands. Translators: remove the part before and including |. -->
   <filter id="bison" _name="Filter|Bison">
     <match what="stderr" pattern="(?P&lt;file&gt;[^:]+):(?P&lt;line&gt;\d+)\.(\d+|\d+\-\d+):"/>
   </filter>
 
-  <!-- Output filter for shell commands -->
+  <!-- Output filter for shell commands. Translators: remove the part before and including |. -->
   <filter id="python" _name="Filter|Python">
     <match what="stderr" pattern='\s*File\s*\"(?P&lt;file&gt;[^"]+)\",\s*line\s*(?P&lt;line&gt;\d+).*' style="output-error"/>
     <match what="stderr" pattern='\s*(?P&lt;file&gt;[^:]+):(?P&lt;line&gt;\d+):.*' style="output-error"/>
   </filter>
 
-  <!-- Output filter for shell commands -->
+  <!-- Output filter for shell commands. Translators: remove the part before and including |. -->
   <filter id="latex" _name="Filter|LaTeX">
     <match what="stdout" pattern="^l\.(?P&lt;line&gt;\d+)" style="output-error" span="2"/>
     <match what="stdout" pattern="^LaTeX Warning: .* on input line (?P&lt;line&gt;\d+)\." style="output-error"/>
@@ -39,7 +39,7 @@
     </match>
   </filter>
 
-  <!-- Output filter for shell commands -->
+  <!-- Output filter for shell commands. Translators: remove the part before and including |. -->
   <filter id="make" _name="Filter|Make">
     <match what="stderr" pattern=".* from (?P&lt;file&gt;[^:]+):(?P&lt;line&gt;\d+)[:,].*" style="output-error"/>
     <match what="stderr" pattern="(?P&lt;file&gt;[^:]+):(?P&lt;line&gt;\d+):(\d+:)?\s*(?:error|warning)\s*:.*" style="output-error"/>
diff --git a/moo/plugins/usertools/glade/moousertools.glade b/moo/plugins/usertools/glade/moousertools.glade
index 300b4f9b..697faaf8 100644
--- a/moo/plugins/usertools/glade/moousertools.glade
+++ b/moo/plugins/usertools/glade/moousertools.glade
@@ -318,7 +318,7 @@
 <child>
 <widget class="GtkLabel" id="label12">
 <property name="visible">True</property>
-<property name="label" translatable="yes" context="yes" comments="Label of notebook tab on User Tools prefs page, do not translate the part before |">user-tools-prefs|Tools menu</property>
+<property name="label" translatable="yes" context="yes" comments="Label of notebook tab on User Tools prefs page, remove the part before and including |">user-tools-prefs|Tools menu</property>
 </widget>
 <packing>
 <property name="tab_fill">False</property>
@@ -339,7 +339,7 @@
 <child>
 <widget class="GtkLabel" id="label13">
 <property name="visible">True</property>
-<property name="label" translatable="yes" context="yes" comments="Label of notebook tab on User Tools prefs page, do not translate the part before |">user-tools-prefs|Context menu</property>
+<property name="label" translatable="yes" context="yes" comments="Label of notebook tab on User Tools prefs page, remove the part before and including |">user-tools-prefs|Context menu</property>
 </widget>
 <packing>
 <property name="position">1</property>
diff --git a/moo/plugins/usertools/moocommand-exe.c b/moo/plugins/usertools/moocommand-exe.c
index 4d3c2c6f..8e7a7b40 100644
--- a/moo/plugins/usertools/moocommand-exe.c
+++ b/moo/plugins/usertools/moocommand-exe.c
@@ -84,15 +84,20 @@ static const char *output_strings[] = {
     "new-doc"
 };
 
-/* Translators: these are actions for output of a shell command, do not translate the part before | */
 static const char *output_names[] = {
+    /* Translators: this is an action for output of a shell command, remove the part before and including | */
     N_("Output|None"),
+    /* Translators: this is an action for output of a shell command, remove the part before and including | */
     N_("Output|None, asynchronous"),
 #ifdef __WIN32__
+    /* Translators: this is an action for output of a shell command, remove the part before and including | */
     N_("Output|Console"),
 #endif
+    /* Translators: this is an action for output of a shell command, remove the part before and including | */
     N_("Output|Output pane"),
+    /* Translators: this is an action for output of a shell command, remove the part before and including | */
     N_("Output|Insert into the document"),
+    /* Translators: this is an action for output of a shell command, remove the part before and including | */
     N_("Output|New document")
 };
 
@@ -1053,12 +1058,16 @@ unx_factory_create_widget (G_GNUC_UNUSED MooCommandFactory *factory)
 {
     ExePageXml *xml;
 
-    /* Translators: these are kinds of input for a shell command, do not translate the part before | */
     const char *input_names[] = {
+        /* Translators: this is a kind of input for a shell command, remove the part before and including | */
         N_("Input|None"),
+        /* Translators: this is a kind of input for a shell command, remove the part before and including | */
         N_("Input|Selected lines"),
+        /* Translators: this is a kind of input for a shell command, remove the part before and including | */
         N_("Input|Selection"),
+        /* Translators: this is a kind of input for a shell command, remove the part before and including | */
         N_("Input|Whole document"),
+        /* Translators: this is a kind of input for a shell command, remove the part before and including | */
         N_("Input|Document copy")
     };