diff -Nur -X orig/diff_ignore orig/client/cityrepdata.c p1/client/cityrepdata.c --- orig/client/cityrepdata.c Mon Jan 22 10:54:51 2001 +++ p1/client/cityrepdata.c Tue Jun 26 09:36:39 2001 @@ -192,13 +192,13 @@ #define FUNC_TAG(var) cr_entry_##var, #var struct city_report_spec city_report_specs[] = { - { 1,-15, 0, "", N_("Name"), N_("City Name"), + { 1,-15, 0, NULL, N_("Name"), N_("City Name"), FUNC_TAG(cityname) }, - { 0, 2, 1, "", N_("Sz"), N_("Size"), + { 0, 2, 1, NULL, N_("Sz"), N_("Size"), FUNC_TAG(size) }, - { 1, -8, 1, "", N_("State"), N_("Rapture/Peace/Disorder"), + { 1, -8, 1, NULL, N_("State"), N_("Rapture/Peace/Disorder"), FUNC_TAG(hstate_verbose) }, - { 0, 1, 1, "", "", N_("Concise *=Rapture, X=Disorder"), + { 0, 1, 1, NULL, NULL, N_("Concise *=Rapture, X=Disorder"), FUNC_TAG(hstate_concise) }, { 1, 8, 1, N_("Workers"), N_("H/C/U"), N_("Workers: Happy, Content, Unhappy"), @@ -216,9 +216,9 @@ FUNC_TAG(num_trade) }, { 1, 7, 1, N_("Food"), N_("Stock"), N_("Food Stock"), FUNC_TAG(food) }, - { 0, 3, 1, "", N_("Pol"), N_("Pollution"), + { 0, 3, 1, NULL, N_("Pol"), N_("Pollution"), FUNC_TAG(pollution) }, - { 0, 3, 1, "", N_("Cor"), N_("Corruption"), + { 0, 3, 1, NULL, N_("Cor"), N_("Corruption"), FUNC_TAG(corruption) }, { 1, 0, 1, N_("Currently Building"), N_("(Stock,Target,Turns,Buy)"), N_("Currently Building"), diff -Nur -X orig/diff_ignore orig/client/gui-gtk/cityrep.c p1/client/gui-gtk/cityrep.c --- orig/client/gui-gtk/cityrep.c Sat Jun 23 16:44:20 2001 +++ p1/client/gui-gtk/cityrep.c Tue Jun 26 09:36:53 2001 @@ -132,8 +132,8 @@ for(i=0, spec=city_report_specs; iwidth), _(spec->title1), - NEG_VAL(spec->width), _(spec->title2)); + NEG_VAL(spec->width), spec->title1 ? _(spec->title1) : "", + NEG_VAL(spec->width), spec->title2 ? _(spec->title2) : ""); } } diff -Nur -X orig/diff_ignore orig/client/gui-xaw/cityrep.c p1/client/gui-xaw/cityrep.c --- orig/client/gui-xaw/cityrep.c Wed Jan 31 10:55:35 2001 +++ p1/client/gui-xaw/cityrep.c Tue Jun 26 09:43:58 2001 @@ -147,7 +147,8 @@ cat_snprintf(text, sizeof(text), "%*s", spec->space, " "); cat_snprintf(text, sizeof(text), "%*s", spec->width, - (j ? _(spec->title2) : _(spec->title1))); + (j ? (spec->title2 ? _(spec->title2) : "") + : (spec->title1 ? _(spec->title1) : ""))); } if (j==0) sz_strlcat(text, "\n"); }