From d10a489a146ea032d27ec843fede0f45b7452096 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 27 May 2006 08:51:24 +0300
Subject: [PATCH] BFU: Mark format strings in struct listbox_ops_messages.

With regular comments in the definition of the structure itself,
and with xgettext:c-format comments in constants of that type,
if xgettext would otherwise guess wrong; so that translators
will know they'll have to double any percent signs they add.
I didn't regenerate PO files, though.
---
 src/bfu/listbox.h           | 24 ++++++++++++------------
 src/bookmarks/dialogs.c     |  2 +-
 src/cache/dialogs.c         |  2 +-
 src/cookies/dialogs.c       |  2 +-
 src/dialogs/download.c      |  2 +-
 src/formhist/dialogs.c      |  2 +-
 src/globhist/dialogs.c      |  2 +-
 src/protocol/auth/dialogs.c |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/bfu/listbox.h b/src/bfu/listbox.h
index 3edfd358..c32ac144 100644
--- a/src/bfu/listbox.h
+++ b/src/bfu/listbox.h
@@ -45,18 +45,18 @@ struct listbox_context {
 };
 
 struct listbox_ops_messages {
-	unsigned char *cant_delete_item;
-	unsigned char *cant_delete_used_item;
-	unsigned char *cant_delete_folder;
-	unsigned char *cant_delete_used_folder;
-	unsigned char *delete_marked_items_title;
-	unsigned char *delete_marked_items;
-	unsigned char *delete_folder_title;
-	unsigned char *delete_folder;
-	unsigned char *delete_item_title;
-	unsigned char *delete_item;
-	unsigned char *clear_all_items_title;
-	unsigned char *clear_all_items;
+	unsigned char *cant_delete_item;          /* %s = text of item */
+	unsigned char *cant_delete_used_item;     /* %s = text of item */
+	unsigned char *cant_delete_folder;        /* %s = text of item */
+	unsigned char *cant_delete_used_folder;   /* %s = text of item */
+	unsigned char *delete_marked_items_title; /* not a format string */
+	unsigned char *delete_marked_items;	  /* not a format string */
+	unsigned char *delete_folder_title;	  /* not a format string */
+	unsigned char *delete_folder;		  /* %s = text of item */
+	unsigned char *delete_item_title;	  /* not a format string */
+	unsigned char *delete_item;		  /* %s = text of item */
+	unsigned char *clear_all_items_title;	  /* not a format string */
+	unsigned char *clear_all_items;		  /* not a format string */
 };
 
 /* TODO: We can maybe find a better way of figuring out whether a user of a
diff --git a/src/bookmarks/dialogs.c b/src/bookmarks/dialogs.c
index 729c301c..5cf3ff59 100644
--- a/src/bookmarks/dialogs.c
+++ b/src/bookmarks/dialogs.c
@@ -129,7 +129,7 @@ static struct listbox_ops_messages bookmarks_messages = {
 	N_("Delete the folder \"%s\" and all bookmarks in it?"),
 	/* delete_item_title */
 	N_("Delete bookmark"),
-	/* delete_item */
+	/* delete_item; xgettext:c-format */
 	N_("Delete this bookmark?"),
 	/* clear_all_items_title */
 	N_("Clear all bookmarks"),
diff --git a/src/cache/dialogs.c b/src/cache/dialogs.c
index 0abb13d3..b1a5f0e5 100644
--- a/src/cache/dialogs.c
+++ b/src/cache/dialogs.c
@@ -201,7 +201,7 @@ static struct listbox_ops_messages cache_messages = {
 	NULL,
 	/* delete_item_title */
 	N_("Delete cache entry"),
-	/* delete_item */
+	/* delete_item; xgettext:c-format */
 	N_("Delete this cache entry?"),
 	/* clear_all_items_title */
 	NULL,
diff --git a/src/cookies/dialogs.c b/src/cookies/dialogs.c
index fba2c2f3..d6a8c80b 100644
--- a/src/cookies/dialogs.c
+++ b/src/cookies/dialogs.c
@@ -215,7 +215,7 @@ static struct listbox_ops_messages cookies_messages = {
 	N_("Delete all cookies from domain \"%s\"?"),
 	/* delete_item_title */
 	N_("Delete cookie"),
-	/* delete_item */
+	/* delete_item; xgettext:c-format */
 	N_("Delete this cookie?"),
 	/* clear_all_items_title */
 	N_("Clear all cookies"),
diff --git a/src/dialogs/download.c b/src/dialogs/download.c
index 8a0d1ffd..dddeb694 100644
--- a/src/dialogs/download.c
+++ b/src/dialogs/download.c
@@ -425,7 +425,7 @@ static struct listbox_ops_messages download_messages = {
 	NULL,
 	/* delete_item_title */
 	N_("Interrupt download"),
-	/* delete_item */
+	/* delete_item; xgettext:c-format */
 	N_("Interrupt this download?"),
 	/* clear_all_items_title */
 	N_("Interrupt all downloads"),
diff --git a/src/formhist/dialogs.c b/src/formhist/dialogs.c
index c9d9beb3..9eb5fec5 100644
--- a/src/formhist/dialogs.c
+++ b/src/formhist/dialogs.c
@@ -134,7 +134,7 @@ static struct listbox_ops_messages formhist_messages = {
 	NULL,
 	/* delete_item_title */
 	N_("Delete form"),
-	/* delete_item */
+	/* delete_item; xgettext:c-format */
 	N_("Delete this form?"),
 	/* clear_all_items_title */
 	N_("Clear all forms"),
diff --git a/src/globhist/dialogs.c b/src/globhist/dialogs.c
index f52af932..9d93f5d5 100644
--- a/src/globhist/dialogs.c
+++ b/src/globhist/dialogs.c
@@ -119,7 +119,7 @@ static struct listbox_ops_messages globhist_messages = {
 	NULL,
 	/* delete_item_title */
 	N_("Delete history entry"),
-	/* delete_item */
+	/* delete_item; xgettext:c-format */
 	N_("Delete this history entry?"),
 	/* clear_all_items_title */
 	N_("Clear all history entries"),
diff --git a/src/protocol/auth/dialogs.c b/src/protocol/auth/dialogs.c
index 6d6f6e03..6c885788 100644
--- a/src/protocol/auth/dialogs.c
+++ b/src/protocol/auth/dialogs.c
@@ -229,7 +229,7 @@ static struct listbox_ops_messages http_auth_messages = {
 	NULL,
 	/* delete_item_title */
 	N_("Delete auth entry"),
-	/* delete_item */
+	/* delete_item; xgettext:c-format */
 	N_("Delete this auth entry?"),
 	/* clear_all_items_title */
 	N_("Clear all auth entries"),