diff --git a/ChangeLog b/ChangeLog
index 86d528020b..b787d1db26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-11  Christian Stimming  <stimming@tuhh.de>
+
+	* po/Makevars: Add --keyword=Q_ to xgettext arguments so that
+	translations with context prefix/disambiguation prefix are
+	included as well.
+
 2006-02-10  David Hampton  <hampton@employees.org>
 
 	* src/gnome/gnc-plugin-page-account-tree.c: Correctly open an
diff --git a/po/Makevars b/po/Makevars
index 0769424fba..8b63f1cf60 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=Q_
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
diff --git a/src/gnome-utils/gnc-tree-view-account.c b/src/gnome-utils/gnc-tree-view-account.c
index 46857353de..b661a61f23 100644
--- a/src/gnome-utils/gnc-tree-view-account.c
+++ b/src/gnome-utils/gnc-tree-view-account.c
@@ -564,12 +564,16 @@ gnc_tree_view_account_new_with_group (AccountGroup *group, gboolean show_root)
 				GNC_TREE_MODEL_ACCOUNT_COL_TAX_INFO,
 				GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
 				NULL);
-  gnc_tree_view_add_toggle_column(view, _("Placeholder"), Q_("Placeholder|P"),
-				  "placeholder",
-				  GNC_TREE_MODEL_ACCOUNT_COL_PLACEHOLDER,
-				  GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
-				  sort_by_placeholder,
-				  gnc_tree_view_account_placeholder_toggled);
+  gnc_tree_view_add_toggle_column
+    (view, _("Placeholder"),
+     /* Translators: This string has a context prefix; the translation
+	must only contain the part after the | character. */
+     Q_("Column letter for 'Placeholder'|P"),
+     "placeholder",
+     GNC_TREE_MODEL_ACCOUNT_COL_PLACEHOLDER,
+     GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+     sort_by_placeholder,
+     gnc_tree_view_account_placeholder_toggled);
 
   /* By default only the first column is visible. */
   gnc_tree_view_configure_columns(view, NULL);
diff --git a/src/gnome-utils/gnc-tree-view-commodity.c b/src/gnome-utils/gnc-tree-view-commodity.c
index cdd43044c1..f7d8289d5d 100644
--- a/src/gnome-utils/gnc-tree-view-commodity.c
+++ b/src/gnome-utils/gnc-tree-view-commodity.c
@@ -512,12 +512,16 @@ gnc_tree_view_commodity_new (QofBook *book,
 				    GNC_TREE_VIEW_COLUMN_COLOR_NONE,
 				    GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 				    sort_by_fraction);
-  gnc_tree_view_add_toggle_column (view, _("Get Quotes"), Q_("Get Quotes|Q"),
-				   "quote_flag",
-				   GNC_TREE_MODEL_COMMODITY_COL_QUOTE_FLAG,
-				   GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
-				   sort_by_quote_flag,
-				   NULL);
+  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",
+     GNC_TREE_MODEL_COMMODITY_COL_QUOTE_FLAG,
+     GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
+     sort_by_quote_flag,
+     NULL);
   gnc_tree_view_add_text_column (view, _("Source"), "quote_source", NULL,
 				 "yahoo",
 				 GNC_TREE_MODEL_COMMODITY_COL_QUOTE_SOURCE,