diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2005-02-19 13:11:51 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2005-02-19 13:11:51 +0000 |
| commit | 565585429192250c2c709337af73a38820895a8a (patch) | |
| tree | ac762182ccde13a032c9a9851520ac3d7b147317 | |
| parent | 1b927327ff96a1d6fa82ff892c6d442cdb57c02c (diff) | |
| download | xine-lib-565585429192250c2c709337af73a38820895a8a.tar.gz xine-lib-565585429192250c2c709337af73a38820895a8a.tar.bz2 | |
**BUGFIX**
Bind to right text domain. This fixes missing translations for prefixes different from /usr.
CVS patchset: 7418
CVS date: 2005/02/19 13:11:51
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/xineintl.h (renamed from src/xine-engine/xineintl.h.in) | 6 |
4 files changed, 8 insertions, 6 deletions
@@ -27,6 +27,7 @@ xine-lib (1.0.1) * fixed aborts on DVB channel switching [bug #1090707] * updated vidix to 0.9.9 * plugin description accessor functions (may load plugins) + * fixed translations, they wasn't used in some cases xine-lib (1.0) * unbreak DXR3 plugin diff --git a/configure.ac b/configure.ac index 4a0dad4fb..9f15ae14c 100644 --- a/configure.ac +++ b/configure.ac @@ -85,6 +85,8 @@ AC_SUBST(SPEC_VERSION) LIBNAME=libxine$XINE_MAJOR AC_SUBST(LIBNAME) +AC_DEFINE_UNQUOTED(XINE_TEXTDOMAIN, "$LIBNAME", [catalog message text domain]) + dnl AC_CANONICAL_TARGET @@ -2248,7 +2250,6 @@ src/video_out/vidix/Makefile src/video_out/vidix/drivers/Makefile src/xine-utils/Makefile src/xine-engine/Makefile -src/xine-engine/xineintl.h win32/Makefile win32/contrib/Makefile win32/contrib/pthreads/Makefile diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 8e7975727..0ac89b2c7 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.310 2005/02/13 22:12:50 holstsn Exp $ + * $Id: xine.c,v 1.311 2005/02/19 13:11:52 valtri Exp $ */ /* @@ -1360,7 +1360,7 @@ xine_t *xine_new (void) { * i18n */ - bindtextdomain("xine-lib", XINE_LOCALEDIR); + bindtextdomain(XINE_TEXTDOMAIN, XINE_LOCALEDIR); #endif /* diff --git a/src/xine-engine/xineintl.h.in b/src/xine-engine/xineintl.h index 4586b3045..614195193 100644 --- a/src/xine-engine/xineintl.h.in +++ b/src/xine-engine/xineintl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2002 the xine project + * Copyright (C) 2000-2005 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xineintl.h.in,v 1.1 2002/12/11 01:04:01 siggi Exp $ + * $Id: xineintl.h,v 1.9 2005/02/19 13:11:53 valtri Exp $ * */ @@ -32,7 +32,7 @@ extern "C" { #ifdef ENABLE_NLS # include <libintl.h> -# define _(String) dgettext ("@LIBNAME@", String) +# define _(String) dgettext (XINE_TEXTDOMAIN, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else |