X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgen-paper-names.c;h=b4541eff01723de34e37b6522fa6fb41310d5d8d;hb=2d8b8e054a76901aa625725bac8b7610ff927a77;hp=ef9aebfb356c7939a1f8e8f00ef418fb319e30b9;hpb=27f746fbd0e56872a8d3b4bfff2588ad0b7cd7c4;p=~andy%2Fgtk

diff --git a/gtk/gen-paper-names.c b/gtk/gen-paper-names.c
index ef9aebfb3..b4541eff0 100644
--- a/gtk/gen-paper-names.c
+++ b/gtk/gen-paper-names.c
@@ -169,7 +169,10 @@ main (int argc, char *argv[])
     {
       if (names[i].suffix != -1)
 	{
-	  j = names[i].suffix;
+	  j = i;
+	  do {
+	    j = names[j].suffix;
+	  } while (names[j].suffix != -1);
 	  names[i].offset = names[j].offset + names[j].len - names[i].len;
 	}
     }
@@ -180,11 +183,12 @@ main (int argc, char *argv[])
 
   printf ("#if 0\n");
   for (i = 0; i < n_infos; i++)
-    printf ("N_(\"%s\")\n", standard_names[i].display_name);
+    printf ("/* translators, strip everything up to the first | */\n"
+	    "NC_(\"paper size\", \"%s\")\n", standard_names[i].display_name);
   printf ("#endif\n\n");
 
   /* write strings */
-  printf ("const char paper_names[] =");
+  printf ("static const char paper_names[] =");
   for (i = 0; i < n_names; i++)
     {
       if (names[i].suffix == -1)
@@ -200,7 +204,7 @@ main (int argc, char *argv[])
 	  "  int display_name;\n"
 	  "  int ppd_name;\n"
 	  "} PaperInfo;\n\n"
-          "const PaperInfo standard_names_offsets[] = {\n");
+          "static const PaperInfo standard_names_offsets[] = {\n");
 
   for (i = 0; i < n_infos; i++)
     {
@@ -220,7 +224,7 @@ main (int argc, char *argv[])
 
   /* dump extras */
 
-  printf ("const struct {\n"
+  printf ("static const struct {\n"
 	  "  int ppd_name;\n"
 	  "  int standard_name;\n"
 	  "} extra_ppd_names_offsets[] = {\n");