Author: jtn
Date: Thu Jul 7 02:25:41 2016
New Revision: 33179
URL: http://svn.gna.org/viewcvs/freeciv?rev=33179&view=rev
Log:
A few string tweaks, TRANS comments, doc fixes, etc.
See gna bug #24828.
Modified:
branches/S2_5/client/gui-gtk-3.0/gui_main.c
branches/S2_5/doc/man/freeciv-client.6.in
branches/S2_5/server/cityturn.c
branches/S2_5/server/civserver.c
branches/S2_5/server/settings.c
branches/S2_5/tools/civmanual.c
Modified: branches/S2_5/client/gui-gtk-3.0/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gui_main.c?rev=33179&r1=33178&r2=33179&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-3.0/gui_main.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/gui_main.c Thu Jul 7 02:25:41 2016
@@ -282,7 +282,8 @@
_("Other gui-specific options are:\n"));
fc_fprintf(stderr,
- _("-g, --gtk-warnings\tLet gtk+ to print warnings\n\n"));
+ _("-g, --gtk-warnings\tAllow Gtk+ to print warnings "
+ "to console\n\n"));
/* TRANS: No full stop after the URL, could cause confusion. */
fc_fprintf(stderr, _("Report bugs at %s\n"), BUG_URL);
Modified: branches/S2_5/doc/man/freeciv-client.6.in
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/man/freeciv-client.6.in?rev=33179&r1=33178&r2=33179&view=diff
==============================================================================
--- branches/S2_5/doc/man/freeciv-client.6.in (original)
+++ branches/S2_5/doc/man/freeciv-client.6.in Thu Jul 7 02:25:41 2016
@@ -34,18 +34,18 @@
[ \-\- \fIclient-specific-parameters\fP ]
.B freeciv-gtk2
-accept the standard Gtk parameters following \fB\-\-\fP; see the Gtk
+accepts the standard Gtk parameters following \fB\-\-\fP; see the Gtk
documentation. It also accepts
.B [ \-h|\-\-help ]
.B freeciv-gtk3
-accept the standard Gtk parameters following \fB\-\-\fP; see the Gtk
+accepts the standard Gtk parameters following \fB\-\-\fP; see the Gtk
documentation. It also accepts
.B [ \-g|\-\-gtk-warnings ] \
[ \-h|\-\-help ]
.B freeciv-qt
-accept the standard Qt parameters following \fB\-\-\fP; see the Qt
+accepts the standard Qt parameters following \fB\-\-\fP; see the Qt
documentation. It also accepts
.B [ \-h|\-\-help ]
Modified: branches/S2_5/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/cityturn.c?rev=33179&r1=33178&r2=33179&view=diff
==============================================================================
--- branches/S2_5/server/cityturn.c (original)
+++ branches/S2_5/server/cityturn.c Thu Jul 7 02:25:41 2016
@@ -1322,6 +1322,7 @@
* since we'll never be able to meet this req... */
notify_player(pplayer, city_tile(pcity),
E_CITY_CANTBUILD, ftc_server,
+ /* TRANS: last %s is a date */
_("%s can't build %s from the worklist; "
"only available from %s. Postponing..."),
city_link(pcity),
Modified: branches/S2_5/server/civserver.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/civserver.c?rev=33179&r1=33178&r2=33179&view=diff
==============================================================================
--- branches/S2_5/server/civserver.c (original)
+++ branches/S2_5/server/civserver.c Thu Jul 7 02:25:41 2016
@@ -400,7 +400,8 @@
_("Metaserver ADDR"),
_("Set ADDR as metaserver address"));
cmdhelp_add(help, "k", "keep",
- _("Keep updating game information on metaserver even if has
failed in the past")),
+ _("Keep updating game information on metaserver even after "
+ "failure")),
cmdhelp_add(help, "p",
/* TRANS: "port" is exactly what user must type, do not
translate. */
_("port PORT"),
Modified: branches/S2_5/server/settings.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/settings.c?rev=33179&r1=33178&r2=33179&view=diff
==============================================================================
--- branches/S2_5/server/settings.c (original)
+++ branches/S2_5/server/settings.c Thu Jul 7 02:25:41 2016
@@ -1848,8 +1848,8 @@
SSET_RULES, SSET_MILITARY, SSET_SITUATIONAL, SSET_TO_CLIENT,
N_("National borders"),
N_("If this is not disabled, then any land tiles around a "
- "city or border claiming Extra (like the classic ruleset's "
- "Fortress base) will be owned by that nation."),
+ "city or border-claiming base (like the classic ruleset's "
+ "Fortress) will be owned by that nation."),
NULL, NULL, NULL, borders_name, GAME_DEFAULT_BORDERS)
GEN_BOOL("happyborders", game.info.happyborders,
Modified: branches/S2_5/tools/civmanual.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/tools/civmanual.c?rev=33179&r1=33178&r2=33179&view=diff
==============================================================================
--- branches/S2_5/tools/civmanual.c (original)
+++ branches/S2_5/tools/civmanual.c Thu Jul 7 02:25:41 2016
@@ -511,7 +511,8 @@
while (inx < argc) {
if ((option = get_option_malloc("--ruleset", argv, &inx, argc))) {
if (ruleset != NULL) {
- fc_fprintf(stderr, _("Multiple rulesets requested. Only one ruleset at
time supported.\n"));
+ fc_fprintf(stderr, _("Multiple rulesets requested. Only one "
+ "ruleset at a time is supported.\n"));
free(option);
} else {
ruleset = option;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
