Index: glib/Makefile.am
===================================================================
RCS file: /cvs/gnome/glib/glib/Makefile.am,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile.am
--- glib/Makefile.am	19 Aug 2003 02:16:00 -0000	1.109
+++ glib/Makefile.am	14 Sep 2003 22:55:39 -0000
@@ -122,6 +122,8 @@ glibsubinclude_HEADERS =   \
 	gfileutils.h	\
 	ghash.h		\
 	ghook.h		\
+	gi18n.h		\
+	gi18n-lib.h	\
 	giochannel.h	\
 	glist.h		\
 	gmacros.h	\
Index: glib/gstrfuncs.c
===================================================================
RCS file: /cvs/gnome/glib/glib/gstrfuncs.c,v
retrieving revision 1.100
diff -u -p -r1.100 gstrfuncs.c
--- glib/gstrfuncs.c	1 Jul 2003 22:15:33 -0000	1.100
+++ glib/gstrfuncs.c	14 Sep 2003 22:55:40 -0000
@@ -2545,3 +2545,30 @@ g_str_has_prefix (const gchar  *str,
   return strncmp (str, prefix, prefix_len) == 0;
 }
 
+
+/**
+ * g_strip_context:
+ * @msgid: a string
+ * @msgval: another string
+ * 
+ * An auxiliary function for gettext() support (see Q_()).
+ * 
+ * Return value: @msgval, unless @msgval is identical to @msgid and contains
+ *   a '|' character, in which case a pointer to the substring of msgid after
+ *   the first '|' character is returned. 
+ *
+ * Since: 2.4
+ **/
+G_CONST_RETURN gchar *
+g_strip_context  (const gchar *msgid, 
+		  const gchar *msgval);
+{
+  if (msgval == msgid)
+    {
+      const char *c = strchr (msgid, '|');
+      if (c != NULL)
+	return c + 1;
+    }
+  
+  return msgval;
+}
Index: glib/gstrfuncs.h
===================================================================
RCS file: /cvs/gnome/glib/glib/gstrfuncs.h,v
retrieving revision 1.19
diff -u -p -r1.19 gstrfuncs.h
--- glib/gstrfuncs.h	12 Oct 2002 19:37:48 -0000	1.19
+++ glib/gstrfuncs.h	14 Sep 2003 22:55:40 -0000
@@ -231,6 +231,9 @@ gchar**               g_strdupv        (
 gchar*                g_stpcpy         (gchar        *dest,
                                         const char   *src);
 
+G_CONST_RETURN gchar *g_strip_context  (const gchar *msgid, 
+					const gchar *msgval);
+
 G_END_DECLS
 
 #endif /* __G_STRFUNCS_H__ */
