Author: coolo
Date: Tue Jun 3 07:51:03 2008
New Revision: 47999
URL: http://svn.opensuse.org/viewcvs/yast?rev=47999&view=rev
Log:
backporting and increasing version number
Modified:
branches/SuSE-Linux-11_0-Branch/gtk/ChangeLog
branches/SuSE-Linux-11_0-Branch/gtk/VERSION
branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes
branches/SuSE-Linux-11_0-Branch/gtk/src/YGUI.cc
branches/SuSE-Linux-11_0-Branch/gtk/src/YGi18n.h
branches/SuSE-Linux-11_0-Branch/gtk/src/ygtkwizard.c
Modified: branches/SuSE-Linux-11_0-Branch/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/ChangeLog?rev=47999&r1=47998&r2=47999&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/gtk/ChangeLog (original)
+++ branches/SuSE-Linux-11_0-Branch/gtk/ChangeLog Tue Jun 3 07:51:03 2008
@@ -1,3 +1,15 @@
+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/YGUI.cc: fixed bug 395484. Wrong check that assumed error
+ was set, crashing...
+
2008-05-28 Ricardo Cruz
* src/YGDialog.cc: bug fix: seems like we shouldn't unref the
Modified: branches/SuSE-Linux-11_0-Branch/gtk/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/VERSION?rev=47999&r1=47998&r2=47999&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/gtk/VERSION (original)
+++ branches/SuSE-Linux-11_0-Branch/gtk/VERSION Tue Jun 3 07:51:03 2008
@@ -1 +1 @@
-2.16.12
+2.16.13
Modified: branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes?rev=47999&r1=47998&r2=47999&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes (original)
+++ branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes Tue Jun 3 07:51:03 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Tue Jun 3 07:46:59 CEST 2008 - coolo@suse.de
+
+- Update to version 2.16.13
+* tag more missing strings for translation (bnc#395803)
+* fixed bnc#395484
+* various fixes in the package selector by Ricardo
+
+-------------------------------------------------------------------
Mon May 19 11:05:00 BST 2008 - mmichael@suse.de
- Update to version 2.16.12
Modified: branches/SuSE-Linux-11_0-Branch/gtk/src/YGUI.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/src/YGUI.cc?rev=47999&r1=47998&r2=47999&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/gtk/src/YGUI.cc (original)
+++ branches/SuSE-Linux-11_0-Branch/gtk/src/YGUI.cc Tue Jun 3 07:51:03 2008
@@ -349,7 +349,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;
}
@@ -361,7 +361,7 @@
if (!shot) {
if (interactive)
- errorMsg ("Couldn't take a screenshot.");
+ errorMsg (_("Couldn't take a screenshot."));
return;
}
@@ -413,13 +413,15 @@
}
yuiDebug() << "Saving screen shot to " << filename << endl;
- 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
- + " - " + error->message;
- errorMsg (msg.c_str());
+ if (!gdk_pixbuf_save (shot, filename.c_str(), "png", &error, NULL)) {
+ string msg = _("Couldn't save screenshot to file ") + filename;
+ if (error) {
+ msg += "\n";
+ msg += std::string ("\n") + error->message;
}
+ yuiError() << msg << endl;
+ if (interactive)
+ errorMsg (msg.c_str());
goto makeScreenShot_ret;
}
Modified: branches/SuSE-Linux-11_0-Branch/gtk/src/YGi18n.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/src/YGi18n.h?rev=47999&r1=47998&r2=47999&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/gtk/src/YGi18n.h (original)
+++ branches/SuSE-Linux-11_0-Branch/gtk/src/YGi18n.h Tue Jun 3 07:51:03 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: branches/SuSE-Linux-11_0-Branch/gtk/src/ygtkwizard.c
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/src/ygtkwizard.c?rev=47999&r1=47998&r2=47999&view=diff
==============================================================================
--- branches/SuSE-Linux-11_0-Branch/gtk/src/ygtkwizard.c (original)
+++ branches/SuSE-Linux-11_0-Branch/gtk/src/ygtkwizard.c Tue Jun 3 07:51:03 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
