[Freeciv-Dev] (PR#9454) server option texts are too long

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=9454 >

Server options have a short help and a long help.  The short help is 
short, and for all options except a few new ones it fits on one line.

But for some of the newer (?) options, it runs over onto multiple lines.

Surely this can be fixed.  The attached patch does so (it also fixes the 
happyborder help which is logically inverted).

jason

Index: server/stdinhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/stdinhand.c,v
retrieving revision 1.329
diff -u -r1.329 stdinhand.c
--- server/stdinhand.c  20 Jul 2004 11:51:33 -0000      1.329
+++ server/stdinhand.c  21 Jul 2004 03:45:25 -0000
@@ -313,7 +313,7 @@
 
   GEN_BOOL("alltemperate", map.alltemperate, SSET_MAP_GEN, SSET_GEOLOGY,
            SSET_TO_CLIENT,
-          N_("All the map is temperate (no poles or equatorial regions)"),
+          N_("All the map is temperate"),
           N_("0 = normal Earth-like planet; 1 = all-temperate planet "),
           NULL, MAP_DEFAULT_ALLTEMPERATE)
 
@@ -558,7 +558,7 @@
 
   GEN_INT("citymindist", game.citymindist, SSET_RULES, SSET_SOCIOLOGY,
           SSET_TO_CLIENT,
-         N_("Minimum distance between cities (move distance)"),
+         N_("Minimum distance between cities"),
          N_("When a player founds a new city, it is checked if there is "
             "no other city in citymindist distance. For example, if "
             "citymindist is 3, there have to be at least two empty "
@@ -650,14 +650,14 @@
 
   GEN_BOOL("happyborders", game.happyborders, SSET_RULES, SSET_MILITARY, 
           SSET_TO_CLIENT,
-         N_("Do units cause unhappiness inside our own borders?"),
+          N_("Units inside borders cause no unhappiness"),
          N_("If this is set, units will not cause unhappiness when "
             "inside your own borders."), NULL,
             GAME_DEFAULT_HAPPYBORDERS)
 
   GEN_INT("diplomacy", game.diplomacy, SSET_RULES, SSET_MILITARY,
           SSET_TO_CLIENT,
-         N_("The ability to do diplomacy with other players"),
+         N_("Ability to do diplomacy with other players"),
          N_("If set to 0 (default), diplomacy is enabled for all.\n"
             "If set to 1, diplomacy is only allowed between human players.\n"
             "If set to 2, diplomacy is only allowed between AI players.\n"
@@ -764,7 +764,7 @@
 
   GEN_INT("contactturns", game.contactturns, SSET_RULES_FLEXIBLE,
          SSET_MILITARY, SSET_TO_CLIENT,
-         N_("Number of turns players may meet after contact"),
+         N_("Turns until player contact is lost"),
          N_("Players may meet for diplomacy this number of turns "
             "after their units have last met. Set this to zero "
             "to turn this feature off entirely."), NULL,