← Back to branch summary

~ubuntu-branches/debian/sid/freeciv/sid

« back to all changes in this revision

Viewing changes to client/gui-gtk-2.0/helpdlg.c

  • Committer: Package Import Robot
  • Author(s): Karl Goetz
  • Date: 2011-12-31 11:39:58 UTC
  • mfrom: (1.2.20)
  • Revision ID: package-import@ubuntu.com-20111231113958-laureotb00yk2331
Tags: 2.3.1-1
http://bugs.debian.org/642944
* Switch to short style dh with overrides
  - Update control to 7.0.50 and compat to 7
  - Various packaging cleanups, fixes various issues with our
    packaging that appears to have been broken for some time.
* Change our dependency away from ttf-sazanami-gothic per the
  request of its maintainer (Closes: #642944)
* New package freeciv-client-extras with freeciv-modpack in it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/gui-gtk-2.0/helpdlg.c
137
137
*****************************************************************/
138
138
static void set_title_topic(char *topic)
139
139
{
140
 
  if (strcmp(topic, "Freeciv") == 0 || strcmp(topic, "About") == 0
141
 
      || strcmp(topic, _("About")) == 0) {
 
140
  if (strcmp(topic, _(HELP_ABOUT_ITEM)) == 0) {
142
141
    gtk_frame_set_label(GTK_FRAME(help_frame), freeciv_name_version());
143
142
  } else {
144
143
    gtk_frame_set_label(GTK_FRAME(help_frame), topic);
1298
1297
    help_update_government(pitem, top);
1299
1298
    break;
1300
1299
  case HELP_NATIONS:
1301
 
    help_update_nation(pitem, top, nation_by_rule_name(top));
 
1300
    help_update_nation(pitem, top, nation_by_translated_name(top));
1302
1301
    break;
1303
1302
  case HELP_TEXT:
1304
1303
  default: