4 files changed, 41 insertions, 0 deletions
diff --git a/include/distfiles b/include/distfiles
index 342530c4e..d847316f2 100644
--- a/include/distfiles
+++ b/include/distfiles
@@ -6,3 +6,5 @@ mpi.h
 ttyio.h
 types.h
 util.h
+i18n.h
+
diff --git a/include/errors.h b/include/errors.h
index 305a147e8..fcae69ec4 100644
--- a/include/errors.h
+++ b/include/errors.h
@@ -54,5 +54,6 @@
 #define G10ERR_INV_KEYRING    32
 #define G10ERR_TRUSTDB	      33 /* a problem with the trustdb */
 #define G10ERR_BAD_CERT       34 /* bad certicate */
+#define G10ERR_INV_USER_ID    35
 
 #endif /*G10_ERRORS_H*/
diff --git a/include/i18n.h b/include/i18n.h
new file mode 100644
index 000000000..a75f3c40f
--- /dev/null
+++ b/include/i18n.h
@@ -0,0 +1,37 @@
+/* i18n.h
+ *	Copyright (c) 1998 by Werner Koch (dd9jn)
+ *
+ * This file is part of G10.
+ *
+ * G10 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.
+ *
+ * G10 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
+ */
+
+#ifndef G10_I18N_H
+#define G10_I18N_H
+
+#ifdef HAVE_LIBINTL
+  #include <libintl.h>
+  #define _(a) gettext (a)
+  #ifdef gettext_noop
+    #define N_(a) gettext_noop (a)
+  #else
+    #define N_(a) (a)
+  #endif
+#else
+  #define _(a) (a)
+  #define N_(a) (a)
+#endif
+
+#endif /*G10_I18N_H*/
diff --git a/include/util.h b/include/util.h
index fe834e1a2..962efa503 100644
--- a/include/util.h
+++ b/include/util.h
@@ -111,6 +111,7 @@ void free_strlist( STRLIST sl );
 #define FREE_STRLIST(a) do { free_strlist((a)); (a) = NULL ; } while(0)
 void add_to_strlist( STRLIST *list, const char *string );
 char *memistr( char *buf, size_t buflen, const char *sub );
+char *mem2str( char *, const void *, size_t);
 char *trim_spaces( char *string );
 int string_count_chr( const char *string, int c );