← Back to branch summary

~ubuntu-branches/debian/squeeze/freeciv/squeeze

« back to all changes in this revision

Viewing changes to client/text.c

  • Committer: Bazaar Package Importer
  • Author(s): Clint Adams
  • Date: 2008-11-29 22:25:59 UTC
  • mfrom: (1.2.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20081129222559-6sqqdum8qnhykm4l
Tags: 2.1.8-1
http://bugs.debian.org/495740
* New upstream release.  closes: #495740.
* Disable GGZ support (can be re-enabled when ggz 1.0 is available).
* Change maintainer to Debian Games Team.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/text.c
603
603
                  game.player_ptr->economic.science);
604
604
  }
605
605
  if (!game.info.simultaneous_phases) {
606
 
    astr_add_line(&str, _("Moving: %s"),
607
 
                  player_name(player_by_number(game.info.phase)));
 
606
    if (game.info.phase < 0 || game.info.phase >= game.info.nplayers) {
 
607
      astr_add_line(&str, _("Moving: Nobody"));
 
608
    } else {
 
609
      astr_add_line(&str, _("Moving: %s"),
 
610
                    player_name(player_by_number(game.info.phase)));
 
611
    }
608
612
  }
609
613
  astr_add_line(&str, _("(Click for more info)"));
610
614
  return str.str;
708
712
 
709
713
    if (!goto_get_turns(&min, &max)) {
710
714
      /* TRANS: Impossible to reach goto target tile */
711
 
      astr_add_line(&str, Q_("?goto:Unreachable"));
 
715
      astr_add_line(&str, "%s", Q_("?goto:Unreachable"));
712
716
    } else if (min == max) {
713
717
      astr_add_line(&str, _("Turns to target: %d"), max);
714
718
    } else {
952
956
 
953
957
  astr_add_line(&str, _("Shows your current government:"));
954
958
  if (game.player_ptr) {
955
 
    astr_add_line(&str, government_name_for_player(game.player_ptr));
 
959
    astr_add_line(&str, "%s", government_name_for_player(game.player_ptr));
956
960
  }
957
961
  return str.str;
958
962
}
1167
1171
  if (faces == 0) {
1168
1172
    astr_add(&str, _("None. "));
1169
1173
  } else {
1170
 
    astr_add(&str, Q_("?clistend:."));
 
1174
    astr_add(&str, "%s", Q_("?clistend:."));
1171
1175
  }
1172
1176
 
1173
1177
  return str.str;
1206
1210
  if (faces == 0) {
1207
1211
    astr_add(&str, _("None. "));
1208
1212
  } else {
1209
 
    astr_add(&str, Q_("?clistend:."));
 
1213
    astr_add(&str, "%s",  Q_("?clistend:."));
1210
1214
  }
1211
1215
 
1212
1216
  return str.str;