More conversion to C_()

svn path=/trunk/; revision=21717

9 files changed, 355 insertions, 510 deletions

diff --git a/ChangeLog b/ChangeLog
index 68c715622f..0dbeedc000 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2008-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+	* gdk/keyname-table.h:
+	* gtk/gen-paper-names.c:
+	* gtk/paper_names_offsets.c:
+	* gtk/gtkpapersize.c:
+	* gtk/gtkaccellabel.c:
+	* gtk/gtkprintoperation.c:
+	* gtk/gtkstock.c: More conversion to C_().
+
+2008-10-26  Matthias Clasen  <mclasen@redhat.com>
+
 	* gtk/gtkaccellabel.c:
 	* gtk/gtkcalendar.c:
 	* gtk/gtkcellrendereraccel.c:
diff --git a/gdk/keyname-table.h b/gdk/keyname-table.h
index 82c1d9570a..05c661f3db 100644
--- a/gdk/keyname-table.h
+++ b/gdk/keyname-table.h
@@ -3937,42 +3937,42 @@ static const gdk_key gdk_keys_by_name[] = {
 
 #if 0
 
-N_("keyboard label|BackSpace")
-N_("keyboard label|Tab")
-N_("keyboard label|Return")
-N_("keyboard label|Pause")
-N_("keyboard label|Scroll_Lock")
-N_("keyboard label|Sys_Req")
-N_("keyboard label|Escape")
-N_("keyboard label|Multi_key")
-N_("keyboard label|Home")
-N_("keyboard label|Left")
-N_("keyboard label|Up")
-N_("keyboard label|Right")
-N_("keyboard label|Down")
-N_("keyboard label|Page_Up")
-N_("keyboard label|Page_Down")
-N_("keyboard label|End")
-N_("keyboard label|Begin")
-N_("keyboard label|Print")
-N_("keyboard label|Insert")
-N_("keyboard label|Num_Lock")
-N_("keyboard label|KP_Space")
-N_("keyboard label|KP_Tab")
-N_("keyboard label|KP_Enter")
-N_("keyboard label|KP_Home")
-N_("keyboard label|KP_Left")
-N_("keyboard label|KP_Up")
-N_("keyboard label|KP_Right")
-N_("keyboard label|KP_Down")
-N_("keyboard label|KP_Page_Up")
-N_("keyboard label|KP_Prior")
-N_("keyboard label|KP_Page_Down")
-N_("keyboard label|KP_Next")
-N_("keyboard label|KP_End")
-N_("keyboard label|KP_Begin")
-N_("keyboard label|KP_Insert")
-N_("keyboard label|KP_Delete")
-N_("keyboard label|Delete")
+NC_("keyboard label", "BackSpace")
+NC_("keyboard labe", "Tab")
+NC_("keyboard label", "Return")
+NC_("keyboard label", "Pause")
+NC_("keyboard label", "Scroll_Lock")
+NC_("keyboard label", "Sys_Req")
+NC_("keyboard label", "Escape")
+NC_("keyboard label", "Multi_key")
+NC_("keyboard label", "Home")
+NC_("keyboard label", "Left")
+NC_("keyboard label", "Up")
+NC_("keyboard label", "Right")
+NC_("keyboard label", "Down")
+NC_("keyboard label", "Page_Up")
+NC_("keyboard label", "Page_Down")
+NC_("keyboard label", "End")
+NC_("keyboard label", "Begin")
+NC_("keyboard label", "Print")
+NC_("keyboard label", "Insert")
+NC_("keyboard label", "Num_Lock")
+NC_("keyboard label", "KP_Space")
+NC_("keyboard label", "KP_Tab")
+NC_("keyboard label", "KP_Enter")
+NC_("keyboard label", "KP_Home")
+NC_("keyboard label", "KP_Left")
+NC_("keyboard label", "KP_Up")
+NC_("keyboard label", "KP_Right")
+NC_("keyboard label", "KP_Down")
+NC_("keyboard label", "KP_Page_Up")
+NC_("keyboard label", "KP_Prior")
+NC_("keyboard label", "KP_Page_Down")
+NC_("keyboard label", "KP_Next")
+NC_("keyboard label", "KP_End")
+NC_("keyboard label", "KP_Begin")
+NC_("keyboard label", "KP_Insert")
+NC_("keyboard label", "KP_Delete")
+NC_("keyboard label", "Delete")
 
 #endif
diff --git a/gtk/gen-paper-names.c b/gtk/gen-paper-names.c
index c3e9c910c6..b4541eff01 100644
--- a/gtk/gen-paper-names.c
+++ b/gtk/gen-paper-names.c
@@ -184,7 +184,7 @@ main (int argc, char *argv[])
   printf ("#if 0\n");
   for (i = 0; i < n_infos; i++)
     printf ("/* translators, strip everything up to the first | */\n"
-	    "N_(\"paper size|%s\")\n", standard_names[i].display_name);
+	    "NC_(\"paper size\", \"%s\")\n", standard_names[i].display_name);
   printf ("#endif\n\n");
 
   /* write strings */
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index c4296055b3..1c71935708 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -733,13 +733,9 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
 	    g_string_append_c (gstring, g_ascii_toupper (tmp[0]));
 	  else
 	    {
-	      gchar msg[128];
-	      gchar *str;
-	      
-	      strcpy (msg, "keyboard label|");
-	      g_strlcat (msg, tmp, 128);
-	      str = _(msg);
-	      if (str == msg)
+	      const gchar *str;
+              str = g_dpgettext2 (GETTEXT_PACKAGE, "keyboard label", tmp);
+	      if (str == tmp)
 		{
 		  g_string_append (gstring, tmp);
 		  substitute_underscores (gstring->str);
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 44de5c9ec0..5aa64b0f9d 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -525,7 +525,7 @@ gtk_paper_size_get_display_name (GtkPaperSize *size)
   g_assert (size->info != NULL);
 
   display_name = paper_names + size->info->display_name;
-  return g_strip_context (display_name, _(display_name));
+  return g_dpgettext2 (GETTEXT_PACKAGE, "paper size", display_name);
 }
 
 /**
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 93df6caf0d..0362d58f31 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -1500,31 +1500,22 @@ _gtk_print_operation_set_status (GtkPrintOperation *op,
 {
   GtkPrintOperationPrivate *priv = op->priv;
   static const gchar *status_strs[] = {
-    /* translators, strip the prefix up to and including the first | */
-    N_("print operation status|Initial state"),
-    /* translators, strip the prefix up to and including the first | */
-    N_("print operation status|Preparing to print"),
-    /* translators, strip the prefix up to and including the first | */
-    N_("print operation status|Generating data"),
-    /* translators, strip the prefix up to and including the first | */
-    N_("print operation status|Sending data"),
-    /* translators, strip the prefix up to and including the first | */
-    N_("print operation status|Waiting"),
-    /* translators, strip the prefix up to and including the first | */
-    N_("print operation status|Blocking on issue"),
-    /* translators, strip the prefix up to and including the first | */
-    N_("print operation status|Printing"),
-    /* translators, strip the prefix up to and including the first | */
-    N_("print operation status|Finished"),
-    /* translators, strip the prefix up to and including the first | */
-    N_("print operation status|Finished with error")
+    NC_("print operation status", "Initial state"),
+    NC_("print operation status", "Preparing to print"),
+    NC_("print operation status", "Generating data"),
+    NC_("print operation status", "Sending data"),
+    NC_("print operation status", "Waiting"),
+    NC_("print operation status", "Blocking on issue"),
+    NC_("print operation status", "Printing"),
+    NC_("print operation status", "Finished"),
+    NC_("print operation status", "Finished with error")
   };
 
   if (status < 0 || status > GTK_PRINT_STATUS_FINISHED_ABORTED)
     status = GTK_PRINT_STATUS_FINISHED_ABORTED;
 
   if (string == NULL)
-    string = g_strip_context (status_strs[status], _(status_strs[status]));
+    string = g_dpgettext2 (GETTEXT_PACKAGE, "print operation status", status_strs[status]);
   
   if (priv->status == status &&
       strcmp (string, priv->status_string) == 0)
diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c
index d2d6855d61..dd3c8be802 100644
--- a/gtk/gtkstock.c
+++ b/gtk/gtkstock.c
@@ -285,124 +285,134 @@ static const GtkStockItem builtin_items [] =
 {
   /* KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate */ 
  
-  { GTK_STOCK_DIALOG_INFO, N_("Information"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_DIALOG_WARNING, N_("Warning"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_DIALOG_ERROR, N_("Error"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_DIALOG_QUESTION, N_("Question"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_DIALOG_INFO, NC_("Stock label", "Information"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_DIALOG_WARNING, NC_("Stock label", "Warning"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_DIALOG_ERROR, NC_("Stock label", "Error"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_DIALOG_QUESTION, NC_("Stock label", "Question"), 0, 0, GETTEXT_PACKAGE },
 
   /*  FIXME these need accelerators when appropriate, and
    * need the mnemonics to be rationalized
    */
-  { GTK_STOCK_ABOUT, N_("_About"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_ADD, N_("_Add"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_APPLY, N_("_Apply"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_BOLD, N_("_Bold"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_CANCEL, N_("_Cancel"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_CDROM, N_("_CD-Rom"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_CLEAR, N_("_Clear"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_CLOSE, N_("_Close"), GDK_CONTROL_MASK, 'w', GETTEXT_PACKAGE },
-  { GTK_STOCK_CONNECT, N_("C_onnect"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_CONVERT, N_("_Convert"), 0, 0, GETTEXT_PACKAGE },
-   { GTK_STOCK_COPY, N_("_Copy"), GDK_CONTROL_MASK, 'c', GETTEXT_PACKAGE },
-  { GTK_STOCK_CUT, N_("Cu_t"), GDK_CONTROL_MASK, 'x', GETTEXT_PACKAGE },
-  { GTK_STOCK_DELETE, N_("_Delete"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_DISCARD, N_("_Discard"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_DISCONNECT, N_("_Disconnect"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_EXECUTE, N_("_Execute"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_EDIT, N_("_Edit"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_FIND, N_("_Find"), GDK_CONTROL_MASK, 'f', GETTEXT_PACKAGE },
-  { GTK_STOCK_FIND_AND_REPLACE, N_("Find and _Replace"), GDK_CONTROL_MASK, 'r', GETTEXT_PACKAGE },
-  { GTK_STOCK_FLOPPY, N_("_Floppy"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_LEAVE_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_GOTO_BOTTOM, N_("Navigation|_Bottom"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_GOTO_FIRST, N_("Navigation|_First"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_GOTO_LAST, N_("Navigation|_Last"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_GOTO_TOP, N_("Navigation|_Top"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_GO_BACK, N_("Navigation|_Back"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_GO_DOWN, N_("Navigation|_Down"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_GO_FORWARD, N_("Navigation|_Forward"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_GO_UP, N_("Navigation|_Up"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_HARDDISK, N_("_Harddisk"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_HELP, N_("_Help"), GDK_CONTROL_MASK, 'h', GETTEXT_PACKAGE },
-  { GTK_STOCK_HOME, N_("_Home"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_INDENT, N_("Increase Indent"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_UNINDENT, N_("Decrease Indent"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_INDEX, N_("_Index"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_INFO, N_("_Information"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_ITALIC, N_("_Italic"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_JUMP_TO, N_("_Jump to"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_JUSTIFY_CENTER, N_("Justify|_Center"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_JUSTIFY_FILL, N_("Justify|_Fill"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_JUSTIFY_LEFT, N_("Justify|_Left"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_JUSTIFY_RIGHT, N_("Justify|_Right"), 0, 0, GETTEXT_PACKAGE },
-
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_MEDIA_FORWARD, N_("Media|_Forward"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_MEDIA_NEXT, N_("Media|_Next"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_MEDIA_PAUSE, N_("Media|P_ause"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_MEDIA_PLAY, N_("Media|_Play"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_MEDIA_PREVIOUS, N_("Media|Pre_vious"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_MEDIA_RECORD, N_("Media|_Record"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_MEDIA_REWIND, N_("Media|R_ewind"), 0, 0, GETTEXT_PACKAGE },
-  /* translators, strip the prefix up to and including the first | */
-  { GTK_STOCK_MEDIA_STOP, N_("Media|_Stop"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_NETWORK, N_("_Network"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_NEW, N_("_New"), GDK_CONTROL_MASK, 'n', GETTEXT_PACKAGE },
-  { GTK_STOCK_NO, N_("_No"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_OK, N_("_OK"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_OPEN, N_("_Open"), GDK_CONTROL_MASK, 'o', GETTEXT_PACKAGE },
-  { GTK_STOCK_ORIENTATION_LANDSCAPE, N_("Landscape"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_ORIENTATION_PORTRAIT, N_("Portrait"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, N_("Reverse landscape"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT, N_("Reverse portrait"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_PAGE_SETUP, N_("Page Set_up"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_PASTE, N_("_Paste"), GDK_CONTROL_MASK, 'v', GETTEXT_PACKAGE },
-  { GTK_STOCK_PREFERENCES, N_("_Preferences"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_PRINT, N_("_Print"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_PRINT_PREVIEW, N_("Print Pre_view"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_PROPERTIES, N_("_Properties"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_QUIT, N_("_Quit"), GDK_CONTROL_MASK, 'q', GETTEXT_PACKAGE },
-  { GTK_STOCK_REDO, N_("_Redo"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_REFRESH, N_("_Refresh"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_REMOVE, N_("_Remove"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_REVERT_TO_SAVED, N_("_Revert"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_SAVE, N_("_Save"), GDK_CONTROL_MASK, 's', GETTEXT_PACKAGE },
-  { GTK_STOCK_SAVE_AS, N_("Save _As"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_SELECT_ALL, N_("Select _All"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_SELECT_COLOR, N_("_Color"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_SELECT_FONT, N_("_Font"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_SORT_ASCENDING, N_("_Ascending"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_SORT_DESCENDING, N_("_Descending"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_SPELL_CHECK, N_("_Spell Check"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_STOP, N_("_Stop"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_STRIKETHROUGH, N_("_Strikethrough"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_UNDELETE, N_("_Undelete"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_UNDERLINE, N_("_Underline"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_UNDO, N_("_Undo"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_YES, N_("_Yes"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_ZOOM_100, N_("_Normal Size"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_ZOOM_FIT, N_("Best _Fit"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_ZOOM_IN, N_("Zoom _In"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), 0, 0, GETTEXT_PACKAGE }
+  { GTK_STOCK_ABOUT, NC_("Stock label", "_About"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_ADD, NC_("Stock label", "_Add"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_APPLY, NC_("Stock label", "_Apply"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_BOLD, NC_("Stock label", "_Bold"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_CANCEL, NC_("Stock label", "_Cancel"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_CDROM, NC_("Stock label", "_CD-Rom"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_CLEAR, NC_("Stock label", "_Clear"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_CLOSE, NC_("Stock label", "_Close"), GDK_CONTROL_MASK, 'w', GETTEXT_PACKAGE },
+  { GTK_STOCK_CONNECT, NC_("Stock label", "C_onnect"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_CONVERT, NC_("Stock label", "_Convert"), 0, 0, GETTEXT_PACKAGE },
+   { GTK_STOCK_COPY, NC_("Stock label", "_Copy"), GDK_CONTROL_MASK, 'c', GETTEXT_PACKAGE },
+  { GTK_STOCK_CUT, NC_("Stock label", "Cu_t"), GDK_CONTROL_MASK, 'x', GETTEXT_PACKAGE },
+  { GTK_STOCK_DELETE, NC_("Stock label", "_Delete"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_DISCARD, NC_("Stock label", "_Discard"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_DISCONNECT, NC_("Stock label", "_Disconnect"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_EXECUTE, NC_("Stock label", "_Execute"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_EDIT, NC_("Stock label", "_Edit"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_FIND, NC_("Stock label", "_Find"), GDK_CONTROL_MASK, 'f', GETTEXT_PACKAGE },
+  { GTK_STOCK_FIND_AND_REPLACE, NC_("Stock label", "Find and _Replace"), GDK_CONTROL_MASK, 'r', GETTEXT_PACKAGE },
+  { GTK_STOCK_FLOPPY, NC_("Stock label", "_Floppy"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_FULLSCREEN, NC_("Stock label", "_Fullscreen"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_LEAVE_FULLSCREEN, NC_("Stock label", "_Leave Fullscreen"), 0, 0, GETTEXT_PACKAGE },
+  /* This is a navigation label as in "go to the bottom of the page" */
+  { GTK_STOCK_GOTO_BOTTOM, NC_("Stock label", "_Bottom"), 0, 0, GETTEXT_PACKAGE },
+  /* This is a navigation label as in "go to the first page" */
+  { GTK_STOCK_GOTO_FIRST, NC_("Stock label", "_First"), 0, 0, GETTEXT_PACKAGE },
+  /* This is a navigation label as in "go to the last page" */
+  { GTK_STOCK_GOTO_LAST, NC_("Stock label", "_Last"), 0, 0, GETTEXT_PACKAGE },
+  /* This is a navigation label as in "go to the top of the page" */
+  { GTK_STOCK_GOTO_TOP, NC_("Stock label", "_Top"), 0, 0, GETTEXT_PACKAGE },
+  /* This is a navigation label as in "go back" */
+  { GTK_STOCK_GO_BACK, NC_("Stock label", "_Back"), 0, 0, GETTEXT_PACKAGE },
+  /* This is a navigation label as in "go down" */
+  { GTK_STOCK_GO_DOWN, NC_("Stock label", "_Down"), 0, 0, GETTEXT_PACKAGE },
+  /* This is a navigation label as in "go forward" */
+  { GTK_STOCK_GO_FORWARD, NC_("Stock label", "_Forward"), 0, 0, GETTEXT_PACKAGE },
+  /* This is a navigation label as in "go up" */
+  { GTK_STOCK_GO_UP, NC_("Stock label", "_Up"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_HARDDISK, NC_("Stock label", "_Harddisk"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_HELP, NC_("Stock label", "_Help"), GDK_CONTROL_MASK, 'h', GETTEXT_PACKAGE },
+  { GTK_STOCK_HOME, NC_("Stock label", "_Home"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_INDENT, NC_("Stock label", "Increase Indent"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_UNINDENT, NC_("Stock label", "Decrease Indent"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_INDEX, NC_("Stock label", "_Index"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_INFO, NC_("Stock label", "_Information"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_ITALIC, NC_("Stock label", "_Italic"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_JUMP_TO, NC_("Stock label", "_Jump to"), 0, 0, GETTEXT_PACKAGE },
+  /* This is about text justification, "centered text" */
+  { GTK_STOCK_JUSTIFY_CENTER, NC_("Stock label", "_Center"), 0, 0, GETTEXT_PACKAGE },
+  /* This is about text justification */
+  { GTK_STOCK_JUSTIFY_FILL, NC_("Stock label", "_Fill"), 0, 0, GETTEXT_PACKAGE },
+  /* This is about text justification, "left-justified text" */
+  { GTK_STOCK_JUSTIFY_LEFT, NC_("Stock label", "_Left"), 0, 0, GETTEXT_PACKAGE },
+  /* This is about text justification, "right-justified text" */
+  { GTK_STOCK_JUSTIFY_RIGHT, NC_("Stock label", "_Right"), 0, 0, GETTEXT_PACKAGE },
+
+  /* Media label, as in "fast forward" */
+  { GTK_STOCK_MEDIA_FORWARD, NC_("Stock label", "_Forward"), 0, 0, GETTEXT_PACKAGE },
+  /* Media label, as in "next song" */
+  { GTK_STOCK_MEDIA_NEXT, NC_("Stock label", "_Next"), 0, 0, GETTEXT_PACKAGE },
+  /* Media label, as in "pause music" */
+  { GTK_STOCK_MEDIA_PAUSE, NC_("Stock label", "P_ause"), 0, 0, GETTEXT_PACKAGE },
+  /* Media label, as in "play music" */
+  { GTK_STOCK_MEDIA_PLAY, NC_("Stock label", "_Play"), 0, 0, GETTEXT_PACKAGE },
+  /* Media label, as in  "previous song" */
+  { GTK_STOCK_MEDIA_PREVIOUS, NC_("Stock label", "Pre_vious"), 0, 0, GETTEXT_PACKAGE },
+  /* Media label */
+  { GTK_STOCK_MEDIA_RECORD, NC_("Stock label", "_Record"), 0, 0, GETTEXT_PACKAGE },
+  /* Media label */
+  { GTK_STOCK_MEDIA_REWIND, NC_("Stock label", "R_ewind"), 0, 0, GETTEXT_PACKAGE },
+  /* Media label */
+  { GTK_STOCK_MEDIA_STOP, NC_("Stock label", "_Stop"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_NETWORK, NC_("Stock label", "_Network"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_NEW, NC_("Stock label", "_New"), GDK_CONTROL_MASK, 'n', GETTEXT_PACKAGE },
+  { GTK_STOCK_NO, NC_("Stock label", "_No"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_OK, NC_("Stock label", "_OK"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_OPEN, NC_("Stock label", "_Open"), GDK_CONTROL_MASK, 'o', GETTEXT_PACKAGE },
+  /* Page orientation */
+  { GTK_STOCK_ORIENTATION_LANDSCAPE, NC_("Stock label", "Landscape"), 0, 0, GETTEXT_PACKAGE },
+  /* Page orientation */
+  { GTK_STOCK_ORIENTATION_PORTRAIT, NC_("Stock label", "Portrait"), 0, 0, GETTEXT_PACKAGE },
+  /* Page orientation */
+  { GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, NC_("Stock label", "Reverse landscape"), 0, 0, GETTEXT_PACKAGE },
+  /* Page orientation */
+  { GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT, NC_("Stock label", "Reverse portrait"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_PAGE_SETUP, NC_("Stock label", "Page Set_up"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_PASTE, NC_("Stock label", "_Paste"), GDK_CONTROL_MASK, 'v', GETTEXT_PACKAGE },
+  { GTK_STOCK_PREFERENCES, NC_("Stock label", "_Preferences"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_PRINT, NC_("Stock label", "_Print"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_PRINT_PREVIEW, NC_("Stock label", "Print Pre_view"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_PROPERTIES, NC_("Stock label", "_Properties"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_QUIT, NC_("Stock label", "_Quit"), GDK_CONTROL_MASK, 'q', GETTEXT_PACKAGE },
+  { GTK_STOCK_REDO, NC_("Stock label", "_Redo"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_REFRESH, NC_("Stock label", "_Refresh"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_REMOVE, NC_("Stock label", "_Remove"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_REVERT_TO_SAVED, NC_("Stock label", "_Revert"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_SAVE, NC_("Stock label", "_Save"), GDK_CONTROL_MASK, 's', GETTEXT_PACKAGE },
+  { GTK_STOCK_SAVE_AS, NC_("Stock label", "Save _As"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_SELECT_ALL, NC_("Stock label", "Select _All"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_SELECT_COLOR, NC_("Stock label", "_Color"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_SELECT_FONT, NC_("Stock label", "_Font"), 0, 0, GETTEXT_PACKAGE },
+  /* Sorting direction */
+  { GTK_STOCK_SORT_ASCENDING, NC_("Stock label", "_Ascending"), 0, 0, GETTEXT_PACKAGE },
+  /* Sorting direction */
+  { GTK_STOCK_SORT_DESCENDING, NC_("Stock label", "_Descending"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_SPELL_CHECK, NC_("Stock label", "_Spell Check"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_STOP, NC_("Stock label", "_Stop"), 0, 0, GETTEXT_PACKAGE },
+  /* Font variant */
+  { GTK_STOCK_STRIKETHROUGH, NC_("Stock label", "_Strikethrough"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_UNDELETE, NC_("Stock label", "_Undelete"), 0, 0, GETTEXT_PACKAGE },
+  /* Font variant */
+  { GTK_STOCK_UNDERLINE, NC_("Stock label", "_Underline"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_UNDO, NC_("Stock label", "_Undo"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_YES, NC_("Stock label", "_Yes"), 0, 0, GETTEXT_PACKAGE },
+  /* Zoom */
+  { GTK_STOCK_ZOOM_100, NC_("Stock label", "_Normal Size"), 0, 0, GETTEXT_PACKAGE },
+  /* Zoom */
+  { GTK_STOCK_ZOOM_FIT, NC_("Stock label", "Best _Fit"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_ZOOM_IN, NC_("Stock label", "Zoom _In"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_ZOOM_OUT, NC_("Stock label", "Zoom _Out"), 0, 0, GETTEXT_PACKAGE }
 };
 
 /**
@@ -455,9 +465,7 @@ static gchar *
 sgettext_swapped (const gchar *msgid, 
 		  gpointer     data)
 {
-  gchar *domainname = data;
-
-  return (gchar *)g_strip_context (msgid, g_dgettext (domainname, msgid));
+  return (gchar *)g_dpgettext2 ((const char *)data, "Stock label", msgid);
 }
 
 
diff --git a/gtk/paper_names_offsets.c b/gtk/paper_names_offsets.c
index c640c8c888..9f2e12e3b7 100644
--- a/gtk/paper_names_offsets.c
+++ b/gtk/paper_names_offsets.c
@@ -1,334 +1,170 @@
 /* Generated by gen-paper-names */
 
 #if 0
-/* translators, strip everything up to the first | */
-N_("paper size|asme_f")
-/* translators, strip everything up to the first | */
-N_("paper size|A0x2")
-/* translators, strip everything up to the first | */
-N_("paper size|A0")
-/* translators, strip everything up to the first | */
-N_("paper size|A0x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A1")
-/* translators, strip everything up to the first | */
-N_("paper size|A10")
-/* translators, strip everything up to the first | */
-N_("paper size|A1x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A1x4")
-/* translators, strip everything up to the first | */
-N_("paper size|A2")
-/* translators, strip everything up to the first | */
-N_("paper size|A2x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A2x4")
-/* translators, strip everything up to the first | */
-N_("paper size|A2x5")
-/* translators, strip everything up to the first | */
-N_("paper size|A3")
-/* translators, strip everything up to the first | */
-N_("paper size|A3 Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x4")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x5")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x6")
-/* translators, strip everything up to the first | */
-N_("paper size|A3x7")
-/* translators, strip everything up to the first | */
-N_("paper size|A4")
-/* translators, strip everything up to the first | */
-N_("paper size|A4 Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|A4 Tab")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x3")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x4")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x5")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x6")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x7")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x8")
-/* translators, strip everything up to the first | */
-N_("paper size|A4x9")
-/* translators, strip everything up to the first | */
-N_("paper size|A5")
-/* translators, strip everything up to the first | */
-N_("paper size|A5 Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|A6")
-/* translators, strip everything up to the first | */
-N_("paper size|A7")
-/* translators, strip everything up to the first | */
-N_("paper size|A8")
-/* translators, strip everything up to the first | */
-N_("paper size|A9")
-/* translators, strip everything up to the first | */
-N_("paper size|B0")
-/* translators, strip everything up to the first | */
-N_("paper size|B1")
-/* translators, strip everything up to the first | */
-N_("paper size|B10")
-/* translators, strip everything up to the first | */
-N_("paper size|B2")
-/* translators, strip everything up to the first | */
-N_("paper size|B3")
-/* translators, strip everything up to the first | */
-N_("paper size|B4")
-/* translators, strip everything up to the first | */
-N_("paper size|B5")
-/* translators, strip everything up to the first | */
-N_("paper size|B5 Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|B6")
-/* translators, strip everything up to the first | */
-N_("paper size|B6/C4")
-/* translators, strip everything up to the first | */
-N_("paper size|B7")
-/* translators, strip everything up to the first | */
-N_("paper size|B8")
-/* translators, strip everything up to the first | */
-N_("paper size|B9")
-/* translators, strip everything up to the first | */
-N_("paper size|C0")
-/* translators, strip everything up to the first | */
-N_("paper size|C1")
-/* translators, strip everything up to the first | */
-N_("paper size|C10")
-/* translators, strip everything up to the first | */
-N_("paper size|C2")
-/* translators, strip everything up to the first | */
-N_("paper size|C3")
-/* translators, strip everything up to the first | */
-N_("paper size|C4")
-/* translators, strip everything up to the first | */
-N_("paper size|C5")
-/* translators, strip everything up to the first | */
-N_("paper size|C6")
-/* translators, strip everything up to the first | */
-N_("paper size|C6/C5")
-/* translators, strip everything up to the first | */
-N_("paper size|C7")
-/* translators, strip everything up to the first | */
-N_("paper size|C7/C6")
-/* translators, strip everything up to the first | */
-N_("paper size|C8")
-/* translators, strip everything up to the first | */
-N_("paper size|C9")
-/* translators, strip everything up to the first | */
-N_("paper size|DL Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|RA0")
-/* translators, strip everything up to the first | */
-N_("paper size|RA1")
-/* translators, strip everything up to the first | */
-N_("paper size|RA2")
-/* translators, strip everything up to the first | */
-N_("paper size|SRA0")
-/* translators, strip everything up to the first | */
-N_("paper size|SRA1")
-/* translators, strip everything up to the first | */
-N_("paper size|SRA2")
-/* translators, strip everything up to the first | */
-N_("paper size|JB0")
-/* translators, strip everything up to the first | */
-N_("paper size|JB1")
-/* translators, strip everything up to the first | */
-N_("paper size|JB10")
-/* translators, strip everything up to the first | */
-N_("paper size|JB2")
-/* translators, strip everything up to the first | */
-N_("paper size|JB3")
-/* translators, strip everything up to the first | */
-N_("paper size|JB4")
-/* translators, strip everything up to the first | */
-N_("paper size|JB5")
-/* translators, strip everything up to the first | */
-N_("paper size|JB6")
-/* translators, strip everything up to the first | */
-N_("paper size|JB7")
-/* translators, strip everything up to the first | */
-N_("paper size|JB8")
-/* translators, strip everything up to the first | */
-N_("paper size|JB9")
-/* translators, strip everything up to the first | */
-N_("paper size|jis exec")
-/* translators, strip everything up to the first | */
-N_("paper size|Choukei 2 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Choukei 3 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Choukei 4 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|hagaki (postcard)")
-/* translators, strip everything up to the first | */
-N_("paper size|kahu Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|kaku2 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|oufuku (reply postcard)")
-/* translators, strip everything up to the first | */
-N_("paper size|you4 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|10x11")
-/* translators, strip everything up to the first | */
-N_("paper size|10x13")
-/* translators, strip everything up to the first | */
-N_("paper size|10x14")
-/* translators, strip everything up to the first | */
-N_("paper size|10x15")
-/* translators, strip everything up to the first | */
-N_("paper size|10x15")
-/* translators, strip everything up to the first | */
-N_("paper size|11x12")
-/* translators, strip everything up to the first | */
-N_("paper size|11x15")
-/* translators, strip everything up to the first | */
-N_("paper size|12x19")
-/* translators, strip everything up to the first | */
-N_("paper size|5x7")
-/* translators, strip everything up to the first | */
-N_("paper size|6x9 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|7x9 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|9x11 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|a2 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch A")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch B")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch C")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch D")
-/* translators, strip everything up to the first | */
-N_("paper size|Arch E")
-/* translators, strip everything up to the first | */
-N_("paper size|b-plus")
-/* translators, strip everything up to the first | */
-N_("paper size|c")
-/* translators, strip everything up to the first | */
-N_("paper size|c5 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|d")
-/* translators, strip everything up to the first | */
-N_("paper size|e")
-/* translators, strip everything up to the first | */
-N_("paper size|edp")
-/* translators, strip everything up to the first | */
-N_("paper size|European edp")
-/* translators, strip everything up to the first | */
-N_("paper size|Executive")
-/* translators, strip everything up to the first | */
-N_("paper size|f")
-/* translators, strip everything up to the first | */
-N_("paper size|FanFold European")
-/* translators, strip everything up to the first | */
-N_("paper size|FanFold US")
-/* translators, strip everything up to the first | */
-N_("paper size|FanFold German Legal")
-/* translators, strip everything up to the first | */
-N_("paper size|Government Legal")
-/* translators, strip everything up to the first | */
-N_("paper size|Government Letter")
-/* translators, strip everything up to the first | */
-N_("paper size|Index 3x5")
-/* translators, strip everything up to the first | */
-N_("paper size|Index 4x6 (postcard)")
-/* translators, strip everything up to the first | */
-N_("paper size|Index 4x6 ext")
-/* translators, strip everything up to the first | */
-N_("paper size|Index 5x8")
-/* translators, strip everything up to the first | */
-N_("paper size|Invoice")
-/* translators, strip everything up to the first | */
-N_("paper size|Tabloid")
-/* translators, strip everything up to the first | */
-N_("paper size|US Legal")
-/* translators, strip everything up to the first | */
-N_("paper size|US Legal Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|US Letter")
-/* translators, strip everything up to the first | */
-N_("paper size|US Letter Extra")
-/* translators, strip everything up to the first | */
-N_("paper size|US Letter Plus")
-/* translators, strip everything up to the first | */
-N_("paper size|Monarch Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#10 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#11 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#12 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#14 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|#9 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Personal Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Quarto")
-/* translators, strip everything up to the first | */
-N_("paper size|Super A")
-/* translators, strip everything up to the first | */
-N_("paper size|Super B")
-/* translators, strip everything up to the first | */
-N_("paper size|Wide Format")
-/* translators, strip everything up to the first | */
-N_("paper size|Dai-pa-kai")
-/* translators, strip everything up to the first | */
-N_("paper size|Folio")
-/* translators, strip everything up to the first | */
-N_("paper size|Folio sp")
-/* translators, strip everything up to the first | */
-N_("paper size|Invite Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Italian Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|juuro-ku-kai")
-/* translators, strip everything up to the first | */
-N_("paper size|pa-kai")
-/* translators, strip everything up to the first | */
-N_("paper size|Postfix Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|Small Photo")
-/* translators, strip everything up to the first | */
-N_("paper size|prc1 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc10 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc 16k")
-/* translators, strip everything up to the first | */
-N_("paper size|prc2 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc3 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc 32k")
-/* translators, strip everything up to the first | */
-N_("paper size|prc4 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc5 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc6 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc7 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|prc8 Envelope")
-/* translators, strip everything up to the first | */
-N_("paper size|ROC 16k")
-/* translators, strip everything up to the first | */
-N_("paper size|ROC 8k")
+NC_("paper size", "asme_f")
+NC_("paper size", "A0x2")
+NC_("paper size", "A0")
+NC_("paper size", "A0x3")
+NC_("paper size", "A1")
+NC_("paper size", "A10")
+NC_("paper size", "A1x3")
+NC_("paper size", "A1x4")
+NC_("paper size", "A2")
+NC_("paper size", "A2x3")
+NC_("paper size", "A2x4")
+NC_("paper size", "A2x5")
+NC_("paper size", "A3")
+NC_("paper size", "A3 Extra")
+NC_("paper size", "A3x3")
+NC_("paper size", "A3x4")
+NC_("paper size", "A3x5")
+NC_("paper size", "A3x6")
+NC_("paper size", "A3x7")
+NC_("paper size", "A4")
+NC_("paper size", "A4 Extra")
+NC_("paper size", "A4 Tab")
+NC_("paper size", "A4x3")
+NC_("paper size", "A4x4")
+NC_("paper size", "A4x5")
+NC_("paper size", "A4x6")
+NC_("paper size", "A4x7")
+NC_("paper size", "A4x8")
+NC_("paper size", "A4x9")
+NC_("paper size", "A5")
+NC_("paper size", "A5 Extra")
+NC_("paper size", "A6")
+NC_("paper size", "A7")
+NC_("paper size", "A8")
+NC_("paper size", "A9")
+NC_("paper size", "B0")
+NC_("paper size", "B1")
+NC_("paper size", "B10")
+NC_("paper size", "B2")
+NC_("paper size", "B3")
+NC_("paper size", "B4")
+NC_("paper size", "B5")
+NC_("paper size", "B5 Extra")
+NC_("paper size", "B6")
+NC_("paper size", "B6/C4")
+NC_("paper size", "B7")
+NC_("paper size", "B8")
+NC_("paper size", "B9")
+NC_("paper size", "C0")
+NC_("paper size", "C1")
+NC_("paper size", "C10")
+NC_("paper size", "C2")
+NC_("paper size", "C3")
+NC_("paper size", "C4")
+NC_("paper size", "C5")
+NC_("paper size", "C6")
+NC_("paper size", "C6/C5")
+NC_("paper size", "C7")
+NC_("paper size", "C7/C6")
+NC_("paper size", "C8")
+NC_("paper size", "C9")
+NC_("paper size", "DL Envelope")
+NC_("paper size", "RA0")
+NC_("paper size", "RA1")
+NC_("paper size", "RA2")
+NC_("paper size", "SRA0")
+NC_("paper size", "SRA1")
+NC_("paper size", "SRA2")
+NC_("paper size", "JB0")
+NC_("paper size", "JB1")
+NC_("paper size", "JB10")
+NC_("paper size", "JB2")
+NC_("paper size", "JB3")
+NC_("paper size", "JB4")
+NC_("paper size", "JB5")
+NC_("paper size", "JB6")
+NC_("paper size", "JB7")
+NC_("paper size", "JB8")
+NC_("paper size", "JB9")
+NC_("paper size", "jis exec")
+NC_("paper size", "Choukei 2 Envelope")
+NC_("paper size", "Choukei 3 Envelope")
+NC_("paper size", "Choukei 4 Envelope")
+NC_("paper size", "hagaki (postcard)")
+NC_("paper size", "kahu Envelope")
+NC_("paper size", "kaku2 Envelope")
+NC_("paper size", "oufuku (reply postcard)")
+NC_("paper size", "you4 Envelope")
+NC_("paper size", "10x11")
+NC_("paper size", "10x13")
+NC_("paper size", "10x14")
+NC_("paper size", "10x15")
+NC_("paper size", "10x15")
+NC_("paper size", "11x12")
+NC_("paper size", "11x15")
+NC_("paper size", "12x19")
+NC_("paper size", "5x7")
+NC_("paper size", "6x9 Envelope")
+NC_("paper size", "7x9 Envelope")
+NC_("paper size", "9x11 Envelope")
+NC_("paper size", "a2 Envelope")
+NC_("paper size", "Arch A")
+NC_("paper size", "Arch B")
+NC_("paper size", "Arch C")
+NC_("paper size", "Arch D")
+NC_("paper size", "Arch E")
+NC_("paper size", "b-plus")
+NC_("paper size", "c")
+NC_("paper size", "c5 Envelope")
+NC_("paper size", "d")
+NC_("paper size", "e")
+NC_("paper size", "edp")
+NC_("paper size", "European edp")
+NC_("paper size", "Executive")
+NC_("paper size", "f")
+NC_("paper size", "FanFold European")
+NC_("paper size", "FanFold US")
+NC_("paper size", "FanFold German Legal")
+NC_("paper size", "Government Legal")
+NC_("paper size", "Government Letter")
+NC_("paper size", "Index 3x5")
+NC_("paper size", "Index 4x6 (postcard)")
+NC_("paper size", "Index 4x6 ext")
+NC_("paper size", "Index 5x8")
+NC_("paper size", "Invoice")
+NC_("paper size", "Tabloid")
+NC_("paper size", "US Legal")
+NC_("paper size", "US Legal Extra")
+NC_("paper size", "US Letter")
+NC_("paper size", "US Letter Extra")
+NC_("paper size", "US Letter Plus")
+NC_("paper size", "Monarch Envelope")
+NC_("paper size", "#10 Envelope")
+NC_("paper size", "#11 Envelope")
+NC_("paper size", "#12 Envelope")
+NC_("paper size", "#14 Envelope")
+NC_("paper size", "#9 Envelope")
+NC_("paper size", "Personal Envelope")
+NC_("paper size", "Quarto")
+NC_("paper size", "Super A")
+NC_("paper size", "Super B")
+NC_("paper size", "Wide Format")
+NC_("paper size", "Dai-pa-kai")
+NC_("paper size", "Folio")
+NC_("paper size", "Folio sp")
+NC_("paper size", "Invite Envelope")
+NC_("paper size", "Italian Envelope")
+NC_("paper size", "juuro-ku-kai")
+NC_("paper size", "pa-kai")
+NC_("paper size", "Postfix Envelope")
+NC_("paper size", "Small Photo")
+NC_("paper size", "prc1 Envelope")
+NC_("paper size", "prc10 Envelope")
+NC_("paper size", "prc 16k")
+NC_("paper size", "prc2 Envelope")
+NC_("paper size", "prc3 Envelope")
+NC_("paper size", "prc 32k")
+NC_("paper size", "prc4 Envelope")
+NC_("paper size", "prc5 Envelope")
+NC_("paper size", "prc6 Envelope")
+NC_("paper size", "prc7 Envelope")
+NC_("paper size", "prc8 Envelope")
+NC_("paper size", "ROC 16k")
+NC_("paper size", "ROC 8k")
 #endif
 
 static const char paper_names[] =
diff --git a/po/ChangeLog b/po/ChangeLog
index c5125924cb..ddbc4a71c1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-26  Matthias Clasen <mclasen@redhat.com>
+
+	* Makefile.in.in: Modify xgettext call to extract C_() macros.
+
 2008-10-24  Mark Krapivner  <mark125@gmail.com>
 
 	* he.po: fix a typo.