gtk+ r19546 - in branches/gtk-2-12: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Feb 12 21:57:41 2008
New Revision: 19546
URL: http://svn.gnome.org/viewvc/gtk+?rev=19546&view=rev

Log:
2008-02-12  Matthias Clasen  <mclasne redhat com>

        * gtk/gtkpapersize.c:
        * gtk/gtkprintoperation.c:
        * gtk/gtkvolumebutton.c:
        * gtk/gtkbulderparser.c: Fix some i18n errors. Pointed
        out by Behdad Esfahbod.



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkbuilderparser.c
   branches/gtk-2-12/gtk/gtkpapersize.c
   branches/gtk-2-12/gtk/gtkprintoperation.c
   branches/gtk-2-12/gtk/gtkstatusicon.c
   branches/gtk-2-12/gtk/gtkvolumebutton.c

Modified: branches/gtk-2-12/gtk/gtkbuilderparser.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkbuilderparser.c	(original)
+++ branches/gtk-2-12/gtk/gtkbuilderparser.c	Tue Feb 12 21:57:41 2008
@@ -18,24 +18,20 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include <string.h>
-#include <glib/gfileutils.h>
-#include <glib/gi18n.h>
-#include <glib/gmacros.h>
-#include <glib/gmessages.h>
-#include <glib/gslist.h>
-#include <glib/gstrfuncs.h>
-#include <glib-object.h>
-#include <gmodule.h>
 
+#include <gmodule.h>
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkkeys.h>
-#include <gtk/gtktypeutils.h>
+#include "gtktypeutils.h"
 #include "gtkbuilderprivate.h"
 #include "gtkbuilder.h"
 #include "gtkbuildable.h"
 #include "gtkdebug.h"
 #include "gtktypeutils.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 static void free_property_info (PropertyInfo *info);

Modified: branches/gtk-2-12/gtk/gtkpapersize.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkpapersize.c	(original)
+++ branches/gtk-2-12/gtk/gtkpapersize.c	Tue Feb 12 21:57:41 2008
@@ -525,7 +525,7 @@
   g_assert (size->info != NULL);
 
   display_name = paper_names + size->info->display_name;
-  return g_strip_context (display_name, gettext (display_name));
+  return g_strip_context (display_name, _(display_name));
 }
 
 /**

Modified: branches/gtk-2-12/gtk/gtkprintoperation.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkprintoperation.c	(original)
+++ branches/gtk-2-12/gtk/gtkprintoperation.c	Tue Feb 12 21:57:41 2008
@@ -1517,8 +1517,7 @@
     status = GTK_PRINT_STATUS_FINISHED_ABORTED;
 
   if (string == NULL)
-    string = g_strip_context (status_strs[status],
-			      gettext (status_strs[status]));
+    string = g_strip_context (status_strs[status], _(status_strs[status]));
   
   if (priv->status == status &&
       strcmp (string, priv->status_string) == 0)

Modified: branches/gtk-2-12/gtk/gtkstatusicon.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkstatusicon.c	(original)
+++ branches/gtk-2-12/gtk/gtkstatusicon.c	Tue Feb 12 21:57:41 2008
@@ -53,6 +53,7 @@
 #include "gtklabel.h"
 #endif	
 
+#include "gtkmain.h"
 #include "gdkkeysyms.h"
 
 #include "gtkalias.h"

Modified: branches/gtk-2-12/gtk/gtkvolumebutton.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkvolumebutton.c	(original)
+++ branches/gtk-2-12/gtk/gtkvolumebutton.c	Tue Feb 12 21:57:41 2008
@@ -29,12 +29,12 @@
 
 #include <config.h>
 
-#include <glib/gi18n.h>
 #include <atk/atk.h>
 
 #include "gtkvolumebutton.h"
 #include "gtkstock.h"
 #include "gtktooltip.h"
+#include "gtkintl.h"
 
 #include "gtkalias.h"