Index: popt.h
===================================================================
RCS file: /v/rpm/cvs/popt/popt.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- popt.h	25 May 2007 17:36:23 -0000	1.59
+++ popt.h	14 Aug 2007 14:42:33 -0000	1.60
@@ -157,10 +157,6 @@
  */
 /*@{*/
 
-#if !defined(N_)
-#define	N_(foo)	foo
-#endif
-
 /**
  * Empty table marker to enable displaying popt alias/exec options.
  */
@@ -169,7 +165,7 @@
 extern struct poptOption poptAliasOptions[];
 /*@=exportvar@*/
 #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
-			0, N_("Options implemented via popt alias/exec:"), NULL },
+			0, "Options implemented via popt alias/exec:", NULL },
 
 /**
  * Auto help table options.
@@ -185,7 +181,7 @@
 /*@=exportvar@*/
 
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
-			0, N_("Help options:"), NULL },
+			0, "Help options:", NULL },
 
 #define POPT_TABLEEND { NULL, '\0', 0, NULL, 0, NULL, NULL }
 /*@}*/