Author: michael_meeks Date: Mon Jun 2 17:26:08 2008 New Revision: 47995 URL: http://svn.opensuse.org/viewcvs/yast?rev=47995&view=rev Log: 2008-06-02 Michael Meeks * src/YGUI.cc (YGApplication::makeScreenShot), * src/ygtkwizard.c (ygtk_help_dialog_init), * src/ygtkwizard.c (sync_window_title): tag more missing strings for translation in the next version bug #395803# Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGUI.cc trunk/gtk/src/YGi18n.h trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=47995&r1=47994&r2=47995&view=diff ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Jun 2 17:26:08 2008 @@ -1,3 +1,10 @@ +2008-06-02 Michael Meeks + + * src/YGUI.cc (YGApplication::makeScreenShot), + * src/ygtkwizard.c (ygtk_help_dialog_init), + * src/ygtkwizard.c (sync_window_title): tag more missing + strings for translation in the next version bug #395803# + 2008-06-02 Ricardo Cruz * src/YGWidget.h/cc & src/YGLayout.h/cc: now using libyui for Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=47995&r1=47994&r2=47995&view=diff ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Mon Jun 2 17:26:08 2008 @@ -325,7 +325,7 @@ GtkWidget *widget = GTK_WIDGET (YGDialog::currentWindow()); if (!widget) { if (interactive) - errorMsg ("No dialog to take screenshot of."); + errorMsg (_("No dialog to take screenshot of.")); return; } @@ -337,7 +337,7 @@ if (!shot) { if (interactive) - errorMsg ("Couldn't take a screenshot."); + errorMsg (_("Couldn't take a screenshot.")); return; } @@ -392,7 +392,7 @@ if (gdk_pixbuf_save (shot, filename.c_str(), "png", &error, NULL)) { yuiError() << "Couldn't save screen shot " << filename << endl; if (interactive) { - string msg = "Couldn't save screenshot to file " + filename + string msg = _("Couldn't save screenshot to file ") + filename + " - " + error->message; errorMsg (msg.c_str()); } Modified: trunk/gtk/src/YGi18n.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGi18n.h?rev=47995&r1=47994&r2=47995&view=diff ============================================================================== --- trunk/gtk/src/YGi18n.h (original) +++ trunk/gtk/src/YGi18n.h Mon Jun 2 17:26:08 2008 @@ -25,15 +25,16 @@ #define TEXTDOMAIN "yast2-gtk" -inline const char * _( const char * msgid ) +static inline const char * _( const char * msgid ) { return ( !msgid || !*msgid ) ? "" : dgettext( TEXTDOMAIN, msgid ); } -inline const char * _( const char * msgid1, const char * msgid2, unsigned long int n ) +#ifndef YGI18N_C +static inline const char * _( const char * msgid1, const char * msgid2, unsigned long int n ) { return dngettext( TEXTDOMAIN, msgid1, msgid2, n ); } - +#endif #endif // YGi18n_h Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=47995&r1=47994&r2=47995&view=diff ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Mon Jun 2 17:26:08 2008 @@ -14,6 +14,8 @@ #include "ygtkhtmlwrap.h" #include "ygtksteps.h" #include "ygtkfindentry.h" +#define YGI18N_C +#include "YGi18n.h" #define BUTTONS_SPACING 12 #define BORDER 4 @@ -75,7 +77,7 @@ gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_window_set_title (GTK_WINDOW (dialog), "Help"); + gtk_window_set_title (GTK_WINDOW (dialog), _("Help")); gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 350); // title @@ -86,7 +88,7 @@ gtk_container_set_border_width (GTK_CONTAINER (dialog->title_box), 6); dialog->title_image = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_LARGE_TOOLBAR); - dialog->title_label = gtk_label_new ("Help"); + dialog->title_label = gtk_label_new (_("Help")); set_label_header (dialog->title_label, 0); gtk_box_pack_start (GTK_BOX (dialog->title_box), dialog->title_image, FALSE, FALSE, 0); @@ -613,9 +615,9 @@ const gchar *_title = gtk_label_get_text (GTK_LABEL (wizard->m_title_label)); char *title; if (*_title == '\0') - title = g_strdup ("YaST"); + title = g_strdup (_("YaST")); else - title = g_strdup_printf ("%s - YaST", _title); + title = g_strdup_printf (_("%s - YaST"), _title); GdkPixbuf *pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (wizard->m_title_image)); gtk_window_set_title (GTK_WINDOW (window), title); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org