X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=opcodes%2Fopintl.h;h=3d811bdeae87fab87ff1487197fa8956dc4e16e9;hb=e23eba971dd409b999dd83d8df0f842680c1c642;hp=c46ddbd65f46589d1caae47c7077af6fa2dbdbda;hpb=c1485d85e0bae60bf321baa007dd44bcc56b534b;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/opintl.h b/opcodes/opintl.h
index c46ddbd65f..3d811bdeae 100644
--- a/opcodes/opintl.h
+++ b/opcodes/opintl.h
@@ -1,18 +1,41 @@
 /* opintl.h - opcodes specific header for gettext code.
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998-2016 Free Software Foundation, Inc.
 
    Written by Tom Tromey <tromey@cygnus.com>
 
-   This file is part of the opcodes library used by GAS and the GNU binutils.
+   This file is part of the GNU opcodes library.
+
+   This library is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GAS; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   along with this file; see the file COPYING.  If not, write to the
+   Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
 #ifdef ENABLE_NLS
 # include <libintl.h>
-# define _(String) gettext (String)
+/* Note the use of dgetext() and PACKAGE here, rather than gettext().
+
+   This is because the code in this directory is used to build a library which
+   will be linked with code in other directories to form programs.  We want to
+   maintain a seperate translation file for this directory however, rather
+   than being forced to merge it with that of any program linked to
+   libopcodes.  This is a library, so it cannot depend on the catalog
+   currently loaded.
+
+   In order to do this, we have to make sure that when we extract messages we
+   use the OPCODES domain rather than the domain of the program that included
+   the opcodes library, (eg OBJDUMP).  Hence we use dgettext (PACKAGE, String)
+   and define PACKAGE to be 'opcodes'.  (See the code in configure).  */
+# define _(String) dgettext (PACKAGE, String)
 # ifdef gettext_noop
 #  define N_(String) gettext_noop (String)
 # else