diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/cityrepdata.c freeciv/client/cityrepdata.c --- FreecivCVS/client/cityrepdata.c Sat Oct 21 09:27:40 2000 +++ freeciv/client/cityrepdata.c Fri Oct 27 10:12:00 2000 @@ -212,7 +212,7 @@ { 1, 10, 1, N_("Economy"), N_("G/L/S"), N_("Economy: Gold, Luxuries, Science"), FUNC_TAG(output) }, - { 0, 1, 1, "n", "T", N_("Number of Trade Routes"), + { 0, 1, 1, N_("n"), N_("T"), N_("Number of Trade Routes"), FUNC_TAG(num_trade) }, { 1, 7, 1, N_("Food"), N_("Stock"), N_("Food Stock"), FUNC_TAG(food) }, diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/common/game.c freeciv/common/game.c --- FreecivCVS/common/game.c Sun Sep 24 07:38:22 2000 +++ freeciv/common/game.c Fri Oct 27 10:05:55 2000 @@ -1029,5 +1029,7 @@ sz_strlcpy(tthis->name_orig, tthis->name); name_strlcpy(tthis->name, Q_(tthis->name_orig)); } -} + #undef name_strlcpy + +} diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/data/nation/barbarian.ruleset freeciv/data/nation/barbarian.ruleset --- FreecivCVS/data/nation/barbarian.ruleset Tue Mar 21 06:26:14 2000 +++ freeciv/data/nation/barbarian.ruleset Fri Oct 27 10:06:24 2000 @@ -1,7 +1,7 @@ [nation_barbarian] -name="Barbarian" -plural="Barbarians" +name=_("Barbarian") +plural=_("?plural:Barbarians") leader="Genseric", "Alaric", "Teodoric", "Herman" leader_sex="Male", "Male", "Male", "Male" flag="f.barbarian" @@ -20,5 +20,3 @@ cities = "Nowhere" ; nothing more needed for barbarians - -