diff -ruN -Xcvs/diff_ignore cvs/client/gui-gtk/citydlg.c test/client/gui-gtk/citydlg.c --- cvs/client/gui-gtk/citydlg.c Sat Oct 27 00:54:56 2001 +++ test/client/gui-gtk/citydlg.c Sat Oct 27 01:40:38 2001 @@ -595,7 +595,7 @@ N_("Upkeep") }; - char *tab_title = N_("City _Overview"); + char *tab_title = _("City _Overview"); char **improvement_clist_title = NULL; @@ -791,7 +791,7 @@ /* stuff that's being currently built */ pdialog->overview.currently_building_frame = - gtk_frame_new(_("Currently building")); + gtk_frame_new(""); /* Label written in city_dialog_update_building */ gtk_box_pack_start(GTK_BOX(vbox), pdialog->overview.currently_building_frame, FALSE, FALSE, 0); @@ -892,7 +892,7 @@ int i, num; GtkWidget *hbox, **hbox_row, *vbox, *page; GtkWidget *label; - char *tab_title = N_("_Units"); + char *tab_title = _("_Units"); page = gtk_vbox_new(FALSE, 0); @@ -1105,7 +1105,7 @@ *****************************************************************/ static void create_and_append_worklist_page(struct city_dialog *pdialog) { - char *tab_title = N_("_Worklist"); + char *tab_title = _("_Worklist"); GtkWidget *label = gtk_label_new(tab_title); notebook_tab_accels[WORKLIST_PAGE] = @@ -1129,7 +1129,7 @@ static void create_and_append_happiness_page(struct city_dialog *pdialog) { GtkWidget *page, *vbox, *label, *table, *align; - char *tab_title = N_("_Happiness"); + char *tab_title = _("_Happiness"); page = gtk_hbox_new(FALSE, 0); @@ -1183,7 +1183,7 @@ static void create_and_append_trade_page(struct city_dialog *pdialog) { GtkWidget *page, *frame, *label; - char *tab_title = N_("_Trade Routes"); + char *tab_title = _("_Trade Routes"); page = gtk_hbox_new(TRUE, 0); @@ -1214,7 +1214,7 @@ GtkWidget *hbox, *vbox, *page, *table, *frame, *label; GSList *group = NULL; - char *tab_title = N_("_Misc. Settings"); + char *tab_title = _("_Misc. Settings"); char *new_citizens_label[] = { N_("Entertainers"), N_("Scientists"), @@ -1861,11 +1861,14 @@ int turns; struct city *pcity = pdialog->pcity; gfloat pct; + char *label; gtk_widget_set_sensitive(pdialog->overview.buy_command, !pcity->did_buy); gtk_widget_set_sensitive(pdialog->overview.sell_command, !pcity->did_sell); + label = _("Currently building"); + if (pcity->is_building_unit) { turns = city_turns_to_build(pcity, pcity->currently_building, TRUE, TRUE); @@ -1875,7 +1878,7 @@ pcity->shield_stock, get_unit_type(pcity->currently_building)->build_cost, turns); - my_snprintf(buf2, sizeof(buf2), "Currently building: %s", + my_snprintf(buf2, sizeof(buf2), "%s: %s", label, get_unit_type(pcity->currently_building)->name); pct = (gfloat) pcity->shield_stock / @@ -1906,7 +1909,7 @@ 0.1); pct = CLAMP(pct, 0.0, 1.0); } - my_snprintf(buf2, sizeof(buf2), "Currently building: %s", + my_snprintf(buf2, sizeof(buf2), "%s: %s", label, get_impr_name_ex(pcity, pcity->currently_building)); }