Index: client/climisc.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/climisc.c,v retrieving revision 1.46 diff -u -r1.46 climisc.c --- climisc.c 2000/07/27 16:43:39 1.46 +++ climisc.c 2000/09/03 12:52:40 @@ -48,6 +48,8 @@ #include "climisc.h" +const char freeciv_motto[] = N_("'Cause civilization should be free!"); + extern struct connection aconnection; /************************************************************************** Index: client/gui-gtk/graphics.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/graphics.c,v retrieving revision 1.26 diff -u -r1.26 graphics.c --- graphics.c 2000/06/18 19:12:27 1.26 +++ graphics.c 2000/09/03 12:52:41 @@ -52,6 +52,8 @@ SPRITE * intro_gfx_sprite; SPRITE * radar_gfx_sprite; +extern const char freeciv_motto[]; /* From climisc.c */ + GdkCursor * goto_cursor; GdkCursor * drop_cursor; GdkCursor * nuke_cursor; @@ -81,7 +83,6 @@ char s[64]; GdkColor face; GdkGC *face_gc; - char *motto = freeciv_motto(); /* metrics */ @@ -104,10 +105,10 @@ y=intro_gfx_sprite->height-(2*lin); - w = gdk_string_width(main_font, motto); + w = gdk_string_width(main_font, _(freeciv_motto)); gdk_gc_set_foreground (face_gc, &face); gdk_draw_string(intro_gfx_sprite->pixmap, main_font, - face_gc, tot/2-w/2, y, motto); + face_gc, tot/2-w/2, y, _(freeciv_motto)); gdk_gc_destroy (face_gc); Index: client/gui-xaw/graphics.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/graphics.c,v retrieving revision 1.29 diff -u -r1.29 graphics.c --- graphics.c 2000/06/18 19:12:29 1.29 +++ graphics.c 2000/09/03 12:52:42 @@ -60,6 +60,8 @@ extern XFontStruct *main_font_struct; extern int solid_color_behind_units; +extern const char freeciv_motto[]; /* From climisc.c */ + struct Sprite *intro_gfx_sprite; struct Sprite *radar_gfx_sprite; @@ -81,7 +83,6 @@ char s[64]; XColor face; int have_face; - char *motto = freeciv_motto(); /* metrics */ @@ -104,11 +105,11 @@ y=intro_gfx_sprite->height-(2*lin); - w=XTextWidth(main_font_struct, motto, strlen(motto)); + w=XTextWidth(main_font_struct, _(freeciv_motto), strlen(_(freeciv_motto))); XSetForeground(display, font_gc, face.pixel); XDrawString(display, intro_gfx_sprite->pixmap, font_gc, tot/2-w/2, y, - motto, strlen(motto)); + _(freeciv_motto), strlen(_(freeciv_motto))); /* Minimap graphic */ Index: common/shared.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/shared.c,v retrieving revision 1.59 diff -u -r1.59 shared.c --- shared.c 2000/09/02 01:58:34 1.59 +++ shared.c 2000/09/03 12:52:49 @@ -816,14 +816,3 @@ return M_PRE_FAIL; } } - -/*************************************************************************** - Return the Freeciv motto. - (The motto is common code: - only one instance of the string in the source; - only one time gettext needs to translate it. --jjm) -***************************************************************************/ -char *freeciv_motto(void) -{ - return _("'Cause civilization should be free!"); -} Index: common/shared.h =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/shared.h,v retrieving revision 1.84 diff -u -r1.84 shared.h --- shared.h 2000/09/02 01:58:35 1.84 +++ shared.h 2000/09/03 12:52:49 @@ -113,6 +113,4 @@ const char *prefix, int *ind_result); -char *freeciv_motto(void); - #endif /* FC__SHARED_H */