callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some i18n errors. Pointed out by Behdad Esfahbod.

Browse Source 
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.



svn path=/trunk/; revision=19547
This commit is contained in:
Matthias Clasen 2008-02-12 22:43:35 +00:00 committed by Matthias Clasen
parent 1cda35d32c
commit 9d6954734d
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2008-02-12 Federico Mena Quintero <federico@novell.com> 2008-02-12 Federico Mena Quintero <federico@novell.com>
Merged from gtk-2-12: Merged from gtk-2-12:

12
gtk/gtkbuilderparser.c
View File

@ -18,24 +18,20 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <config.h>
#include <string.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/gdkenumtypes.h>
#include <gdk/gdkkeys.h> #include <gdk/gdkkeys.h>
#include <gtk/gtktypeutils.h> #include "gtktypeutils.h"
#include "gtkbuilderprivate.h" #include "gtkbuilderprivate.h"
#include "gtkbuilder.h" #include "gtkbuilder.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkdebug.h" #include "gtkdebug.h"
#include "gtktypeutils.h" #include "gtktypeutils.h"
#include "gtkintl.h"
#include "gtkalias.h" #include "gtkalias.h"
static void free_property_info (PropertyInfo *info); static void free_property_info (PropertyInfo *info);

2
gtk/gtkpapersize.c
View File

@ -525,7 +525,7 @@ gtk_paper_size_get_display_name (GtkPaperSize *size)
g_assert (size->info != NULL); g_assert (size->info != NULL);
display_name = paper_names + size->info->display_name; 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));
} }
/** /**

3
gtk/gtkprintoperation.c
View File

@ -1518,8 +1518,7 @@ _gtk_print_operation_set_status (GtkPrintOperation *op,
status = GTK_PRINT_STATUS_FINISHED_ABORTED; status = GTK_PRINT_STATUS_FINISHED_ABORTED;
if (string == NULL) if (string == NULL)
string = g_strip_context (status_strs[status], string = g_strip_context (status_strs[status], _(status_strs[status]));
gettext (status_strs[status]));
if (priv->status == status && if (priv->status == status &&
strcmp (string, priv->status_string) == 0) strcmp (string, priv->status_string) == 0)

2
gtk/gtkvolumebutton.c
View File

@ -29,12 +29,12 @@
#include <config.h> #include <config.h>
#include <glib/gi18n.h>
#include <atk/atk.h> #include <atk/atk.h>
#include "gtkvolumebutton.h" #include "gtkvolumebutton.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtkintl.h"
#include "gtkalias.h" #include "gtkalias.h"