Fix bugs 819 and 837

[bacula/bacula] / bacula / src / wx-console / console_thread.h

diff --git a/bacula/src/wx-console/console_thread.h b/bacula/src/wx-console/console_thread.h
index bf363f3c539291480e246f10e39dc5778c0f1a23..689bfc80883c2dc23c38d4a908494896567b1c16 100644 (file)
--- a/bacula/src/wx-console/console_thread.h
+++ b/bacula/src/wx-console/console_thread.h
@@ -7,30 +7,48 @@
  *    Version $Id$
  */
 /*
-   Copyright (C) 2004 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
 
-   This program 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 2
-   of the License, or (at your option) any later version.
+   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
 
-   This program 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.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
 #ifndef CONSOLE_THREAD_H
 #define CONSOLE_THREAD_H
 
+#ifndef ENABLE_NLS
+#undef setlocale
+#undef textdomain
+#undef bindtextdomain
+#endif
+
+
 #include <wx/wxprec.h>
 
 #include <wx/string.h>
 #include <wx/thread.h> // inheriting class's header file
+#include <wx/intl.h> /* We need to have _ and N_ defined by wxWidgets before Bacula tries to redefine them */
 #include "bacula.h"
 #include "jcr.h"