Changeset 1458 in MondoRescue for branches/stable/mondo/src

Timestamp:

May 22, 2007, 10:10:30 AM (18 years ago)

Author:

Bruno Cornec

Message:

gettext reviewed + french messages updated (half done)

Location:

branches/stable/mondo/src

Files:

• include/mr_gettext.h (modified) (1 diff)
• include/my-stuff.h (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (2 diffs)
• mondorestore/mondorestore.c (modified) (1 diff)

branches/stable/mondo/src/include/mr_gettext.h

@@ -1 +1 @@
 #ifdef ENABLE_NLS
 # include <libintl.h>
+# include <locale.h>
 # undef _
 # define _(String) dgettext (PACKAGE, String)

branches/stable/mondo/src/include/my-stuff.h

@@ -349 +349 @@
 #define DEFAULT_MR_LOGLEVEL 4
 
-#ifdef ENABLE_NLS  
-# include <libintl.h>  
-# undef _  
-# define _(String) dgettext (PACKAGE, String)
-# ifdef gettext_noop  
-#  define N_(String) gettext_noop (String)  
-# else  
-#  define N_(String) (String)  
-# endif  
-#else  
-# define textdomain(String) (String)  
-# define gettext(String) (String)  
-# define dgettext(Domain,Message) (Message)  
-# define dcgettext(Domain,Message,Type) (Message)  
-# define bindtextdomain(Domain,Directory) (Domain)  
-# define _(String) (String)  
-# define N_(String) (String)  
-
-#endif 
-
-
 #endif                          /* _MY_STUFF_H_ */

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -17 +17 @@
 #include <unistd.h>
 
-#include "my-stuff.h"
-#include "mondostructures.h"
-#include "libmondo.h"
-#include "mondo-cli-EXT.h"
-
+#include "mr_gettext.h"
 #include "mondoarchive.h"
 #include "mr_mem.h"
@@ -29 +25 @@
 #include "mr_err.h"
 #include "mr_conf.h"
+
+#include "my-stuff.h"
+#include "mondostructures.h"
+#include "libmondo.h"
+#include "mondo-cli-EXT.h"
 
 // for CVS

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -15 +15 @@
 #include <utime.h>
 
+#include "mr_gettext.h"
 #include "my-stuff.h"
 #include "mr_mem.h"