Hello community,
here is the log from the commit of package yast2-gtk for openSUSE:Factory
checked in at Tue Jun 29 19:06:13 CEST 2010.
--------
--- yast2-gtk/yast2-gtk.changes 2010-06-13 11:35:10.000000000 +0200
+++ yast2-gtk/yast2-gtk.changes 2010-06-28 19:16:05.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 26 15:37:00 WET 2010 - badshah400@gmail.com
+
+- 2.21.57
+- don't steal window focus (bnc#615927)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-gtk-2.21.56.tar.bz2
New:
----
yast2-gtk-2.21.57.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-gtk.spec ++++++
--- /var/tmp/diff_new_pack.gipt5F/_old 2010-06-29 19:05:38.000000000 +0200
+++ /var/tmp/diff_new_pack.gipt5F/_new 2010-06-29 19:05:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-gtk (Version 2.21.56)
+# spec file for package yast2-gtk (Version 2.21.57)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,11 +18,11 @@
Name: yast2-gtk
-Version: 2.21.56
+Version: 2.21.57
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-gtk-2.21.56.tar.bz2
+Source0: yast2-gtk-2.21.57.tar.bz2
Url: http://en.opensuse.org/YaST2-GTK
Summary: YaST2 - GTK+ Graphical User Interface
Group: System/YaST
++++++ yast2-gtk-2.21.56.tar.bz2 -> yast2-gtk-2.21.57.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/ChangeLog new/yast2-gtk-2.21.57/ChangeLog
--- old/yast2-gtk-2.21.56/ChangeLog 2010-06-12 13:52:46.000000000 +0200
+++ new/yast2-gtk-2.21.57/ChangeLog 2010-06-27 21:23:44.000000000 +0200
@@ -1,3 +1,21 @@
+2010-06-25 Ricardo Cruz
+
+ * src/YGDialog.cc: compile fix.
+
+2010-06-22 Ricardo Cruz
+
+ * src/YGDialog.cc: bug fix 615927: don't steal focus
+ on taskbar highlight.
+
+2010-06-16 Ricardo Cruz
+
+ * src/pkg/pkg-selector-help.cc: changed from header
+ format otherwise it is not picked up by i18n tool.
+
+ * src/pkg/ygtkpkgundolist.cc, ygtkpkgproductdialog.cc,
+ & ygtkpkgfilterview.cc: complemented with translator
+ commentary.
+
2010-06-12 Ricardo Cruz
* src/pkg/ygtkpkgmenubar.cc: memorize menu options.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/VERSION new/yast2-gtk-2.21.57/VERSION
--- old/yast2-gtk-2.21.56/VERSION 2010-06-12 13:52:46.000000000 +0200
+++ new/yast2-gtk-2.21.57/VERSION 2010-06-27 21:23:44.000000000 +0200
@@ -1 +1 @@
-2.21.56
+2.21.57
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/VERSION.cmake new/yast2-gtk-2.21.57/VERSION.cmake
--- old/yast2-gtk-2.21.56/VERSION.cmake 2010-06-12 13:52:46.000000000 +0200
+++ new/yast2-gtk-2.21.57/VERSION.cmake 2010-06-27 21:23:44.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "21")
-SET(VERSION_PATCH "56")
+SET(VERSION_PATCH "57")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/package/yast2-gtk.changes new/yast2-gtk-2.21.57/package/yast2-gtk.changes
--- old/yast2-gtk-2.21.56/package/yast2-gtk.changes 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/package/yast2-gtk.changes 2010-06-27 21:23:44.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Jun 26 15:37:00 WET 2010 - badshah400@gmail.com
+
+- 2.21.57
+- don't steal window focus (bnc#615927)
+
+-------------------------------------------------------------------
Sun Jun 13 10:28:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt
- 2.21.56
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/package/yast2-gtk.spec new/yast2-gtk-2.21.57/package/yast2-gtk.spec
--- old/yast2-gtk-2.21.56/package/yast2-gtk.spec 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/package/yast2-gtk.spec 1970-01-01 01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-#
-# spec file for package yast2-gtk (Version 2.21.55)
-#
-# norootforbuild;,
-
-
-Name: yast2-gtk
-Version: 2.21.55
-Release: 0
-
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-gtk-2.21.55.tar.bz2
-Url: http://en.opensuse.org/YaST2-GTK
-Summary: YaST2 - GTK+ Graphical User Interface
-Group: System/YaST
-License: GPL v2.1 or later
-BuildRequires: cmake
-BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel
-BuildRequires: gtk2-devel
-BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-libyui-devel >= 2.18.8
-BuildRequires: libzypp-devel >= 6.3.0
-Requires: yast2-libyui >= 2.18.8
-Requires: yast2_theme >= 2.16.1
-Requires: libzypp >= 6.3.0
-Provides: yast2_ui yast2-ui-gtk
-Provides: yast2_ui_pkg
-Source1: yast2-gtk-rpmlintrc
-
-%description
-One of several user interfaces available for YaST2, based on GTK and
-the X Window System.
-
-%prep
-%setup
-
-%build
-mkdir build
-cd build
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$CFLAGS"
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DLIB=%{_lib} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=1 \
- ..
-make %{?_smp_mflags} VERBOSE=1
-
-%install
-cd build
-make install DESTDIR=$RPM_BUILD_ROOT
-cd ..
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-%files
-%defattr (-, root, root)
-%dir %_libdir/YaST2
-%_libdir/YaST2/plugin/
-# %_prefix/share/YaST2/gtk/
-
-%changelog
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/YGDialog.cc new/yast2-gtk-2.21.57/src/YGDialog.cc
--- old/yast2-gtk-2.21.56/src/YGDialog.cc 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/src/YGDialog.cc 2010-06-27 21:23:44.000000000 +0200
@@ -117,6 +117,8 @@
G_CALLBACK (close_window_cb), this);
g_signal_connect_after (G_OBJECT (m_widget), "key-press-event",
G_CALLBACK (key_pressed_cb), this);
+ g_signal_connect (G_OBJECT (m_widget), "focus-in-event",
+ G_CALLBACK (focus_in_event_cb), this);
// set busy cursor at start
g_signal_connect_after (G_OBJECT (m_widget), "realize",
G_CALLBACK (realize_cb), this);
@@ -264,6 +266,9 @@
return FALSE;
}
+ static gboolean focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event)
+ { gtk_window_set_urgency_hint (GTK_WINDOW (widget), FALSE); return FALSE; }
+
static void realize_cb (GtkWidget *widget, YGWindow *pThis)
{ pThis->busyCursor(); }
@@ -350,7 +355,9 @@
void YGDialog::present()
{
- gtk_window_present (GTK_WINDOW (m_window->getWidget()));
+ GtkWindow *window = GTK_WINDOW (m_window->getWidget());
+ if (!gtk_window_is_active (window))
+ gtk_window_set_urgency_hint (window, TRUE);
}
YGDialog *YGDialog::currentDialog()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/pkg/CMakeLists.txt new/yast2-gtk-2.21.57/src/pkg/CMakeLists.txt
--- old/yast2-gtk-2.21.56/src/pkg/CMakeLists.txt 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/src/pkg/CMakeLists.txt 2010-06-27 21:23:44.000000000 +0200
@@ -1,6 +1,7 @@
## Makefile.am
set (gtk_pkg_yast_plugin_SRCS
+ pkg-selector-help.cc
YGPackageSelector.cc
YGPackageSelectorPluginImpl.cc
ygtkpkgdetailview.cc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/pkg/YGPackageSelector.cc new/yast2-gtk-2.21.57/src/pkg/YGPackageSelector.cc
--- old/yast2-gtk-2.21.56/src/pkg/YGPackageSelector.cc 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/src/pkg/YGPackageSelector.cc 2010-06-27 21:23:44.000000000 +0200
@@ -641,7 +641,7 @@
}
};
-#include "pkg-selector-help.h"
+extern const char *pkg_help[], *patch_help[];
static bool confirm_cb (void *pThis)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/pkg/pkg-selector-help.cc new/yast2-gtk-2.21.57/src/pkg/pkg-selector-help.cc
--- old/yast2-gtk-2.21.56/src/pkg/pkg-selector-help.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-gtk-2.21.57/src/pkg/pkg-selector-help.cc 2010-06-27 21:23:44.000000000 +0200
@@ -0,0 +1,105 @@
+/********************************************************************
+ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK *
+ ********************************************************************/
+/*
+ Textdomain "yast2-gtk"
+ */
+
+#include "YGi18n.h"
+
+const char *pkg_help[] = {
+ _("<h1>Purpose</h1>"
+ "<p>This tool lets you install, remove, and update applications.</p>"
+ "<p>Software in &product; is broken down and distributed in the form of "
+ "packages. This way, if multiple applications require a common system file, "
+ "this system file is shipped in its own package and is installed only once "
+ "if needed. The user need not be concerned about such underlying <i>dependencies</i>. "
+ "Likewise, the plugins and other non-essential data of a given application may "
+ "be shipped in their own packages, so the user may install them only if needed.</p>"),
+ _("<p>Common suffixes for complementory packages:</p>"
+ "<ul>"
+ "<li><b>-plugin-</b>: extends the application with extra functionality.</li>"
+ "<li><b>-devel</b>: headers for software development.</li>"
+ "<li><b>-debuginfo</b>: debug symbols for software testing.</li>"
+ "<li><b>-fr</b>, <b>-pl</b> or other language siglas: translation files (your language "
+ "will be marked for installation automatically when needed).</li>"
+ "</ul>"),
+ _("<p>Both the packages that are installed on your system, and the packages "
+ "that are available from the <i>repositories</i> you have configured will be listed "
+ "together. <i>Status</i> filters are available in the right-bottom box.</p>"),
+ _("<blockquote>A repository is a packages media; it can either be local (such as the "
+ "installation CD), or a remote internet server. You can find an utility to setup "
+ "repositories on the YaST control center, which can also be accessed via the "
+ "<b>Configuration > Repositories</b> menu item.</blockquote>"),
+ _("<h1>Usage</h1>"),
+ _("<h2>Install, Upgrade, Remove, Undo tab pages</h2>"
+ "<p>All packages are listed together unless you have selected a <i>status</i> filter "
+ "from the right-bottom box. The check-box next to the package name indicates whether "
+ "the package is installed or not. If a more recent version of an installed "
+ "package is available, the version text will be highlighted in blue and an "
+ "upgrade button conveniently placed next to it. It is highlighted red if the "
+ "version installed is no longer being made available in any configured repository.</p>"
+ "<p>The context menu (right click on a package) provides extra options. "
+ "The <b>Undo</b> option can be used to revert any changes you have made. Multiple "
+ "packages may be selected (using the Control key) and modified together.</p>"
+ "<p>Use the <b>Version</b> list over the description box to select a specific version "
+ "of a package.</p>"
+ "<p>Press the <b>Apply</b> button when you want your changes to be performed.</p>"),
+ _("<h2>Lock software</h2>"
+ "<p>Packages can be locked against automatic changes via the context menu.</p>"
+ "<p>Locking is only useful in very unusual cases: for instance, you may not want "
+ "to install a given driver because it interferes with your system, yet you want "
+ "to install some collection that includes it. Locks can be applied whether the "
+ "package is installed or not.</p>"),
+ _("<h2>Filters</h2>"),
+ _("<h3>Search</h3>"
+ "<p>Enter free text into the search-field to match their names and descriptions. "
+ "(a search for 'office' will bring up the 'OpenOffice' packages as well as "
+ "'AbiWord' which carries the word 'office' in its description). You can search for "
+ "multiple keywords by separating the with a white space (e.g. 'spread sheet' "
+ "would return 'OpenOffice-calc').You may use the "
+ "search combined with a filter, like searching for a package in a given repository. "
+ "Other search attributes are provided, such as to search for a given file.</p>"),
+ _("<h3>Groups</h3>"
+ "<p>Software for &product; is indexed so that you can find software for a specific "
+ "task when you are not aware of the software selection available. A more detailed, "
+ "hierarchical classification is provided by the <b>RPM Groups</b> filter.</p>"),
+ _("<h3>Patterns and Languages</h3>"
+ "<p><b>Patterns</b> are task-oriented collections of multiple packages that "
+ "install like one. The installation of the <i>File Server</i> pattern, for example, "
+ "will install various packages needed for running such a server.</p>"
+ "<p>If you want to install a particular language, you may want to do so via the "
+ "<b>Language</b> tool from the YaST control center.</p>"),
+ _("<h2>Software details in the box below</h2>"
+ "<p>Explore the available information about the package in the box below. Note "
+ "that more information is available for installed packages than for those only "
+ "available from a repository.</p>"
+ "<p>You can also pick a specific version of the package to install from this "
+ "box.</p>"),
+ "<hr/><p>http://en.opensuse.org/YaST2-GTK</p>",
+ 0
+};
+
+const char *patch_help[] = {
+ _("<h1>Purpose</h1>"
+ "<p>This tool gives you control on overviewing and picking patches. You may also "
+ "reverse patches that have been applied to the system.</p>"),
+ _("<h1>Usage</h1>"
+ "<h2>Categories</h2>"
+ "<p>Patches are grouped as follows:</p>"
+ "<ul>"
+ "<li><b>Security</b>: patches a software flaw that could be exploited to gain "
+ "restricted privilege.</li>"
+ "<li><b>Recommended</b>: fixes non-security related flaws (e.g. data corruption, "
+ "performance slowdown)</li>"
+ "<li><b>Optional</b>: ones that only apply to few users.</li>"
+ "<li><b>Documentation</b>: fixes documentation errors.</li>"
+ "<li><b>YaST</b>: patches for the YaST control center tools.</li>"
+ "</ul>"),
+ _("<p>Only patches that apply to your system will be visible. You can be sure "
+ "that the decision to make a patch available is not done trivially.</p>"
+ "<p>If you are looking for applications enhancements, you should check for <i>upgrades</i> "
+ "on the <b>Software Manager</b>.</p>"),
+ 0
+};
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/pkg/pkg-selector-help.h new/yast2-gtk-2.21.57/src/pkg/pkg-selector-help.h
--- old/yast2-gtk-2.21.56/src/pkg/pkg-selector-help.h 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/src/pkg/pkg-selector-help.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,100 +0,0 @@
-/*
- Textdomain "yast2-gtk"
- */
-
-static const char *pkg_help[] = {
- _("<h1>Purpose</h1>"
- "<p>This tool lets you install, remove, and update applications.</p>"
- "<p>Software in &product; is broken down and distributed in the form of "
- "packages. This way, if multiple applications require a common system file, "
- "this system file is shipped in its own package and is installed only once "
- "if needed. The user need not be concerned about such underlying <i>dependencies</i>. "
- "Likewise, the plugins and other non-essential data of a given application may "
- "be shipped in their own packages, so the user may install them only if needed.</p>"),
- _("<p>Common suffixes for complementory packages:</p>"
- "<ul>"
- "<li><b>-plugin-</b>: extends the application with extra functionality.</li>"
- "<li><b>-devel</b>: headers for software development.</li>"
- "<li><b>-debuginfo</b>: debug symbols for software testing.</li>"
- "<li><b>-fr</b>, <b>-pl</b> or other language siglas: translation files (your language "
- "will be marked for installation automatically when needed).</li>"
- "</ul>"),
- _("<p>Both the packages that are installed on your system, and the packages "
- "that are available from the <i>repositories</i> you have configured will be listed "
- "together. <i>Status</i> filters are available in the right-bottom box.</p>"),
- _("<blockquote>A repository is a packages media; it can either be local (such as the "
- "installation CD), or a remote internet server. You can find an utility to setup "
- "repositories on the YaST control center, which can also be accessed via the "
- "<b>Configuration > Repositories</b> menu item.</blockquote>"),
- _("<h1>Usage</h1>"),
- _("<h2>Install, Upgrade, Remove, Undo tab pages</h2>"
- "<p>All packages are listed together unless you have selected a <i>status</i> filter "
- "from the right-bottom box. The check-box next to the package name indicates whether "
- "the package is installed or not. If a more recent version of an installed "
- "package is available, the version text will be highlighted in blue and an "
- "upgrade button conveniently placed next to it. It is highlighted red if the "
- "version installed is no longer being made available in any configured repository.</p>"
- "<p>The context menu (right click on a package) provides extra options. "
- "The <b>Undo</b> option can be used to revert any changes you have made. Multiple "
- "packages may be selected (using the Control key) and modified together.</p>"
- "<p>Use the <b>Version</b> list over the description box to select a specific version "
- "of a package.</p>"
- "<p>Press the <b>Apply</b> button when you want your changes to be performed.</p>"),
- _("<h2>Lock software</h2>"
- "<p>Packages can be locked against automatic changes via the context menu.</p>"
- "<p>Locking is only useful in very unusual cases: for instance, you may not want "
- "to install a given driver because it interferes with your system, yet you want "
- "to install some collection that includes it. Locks can be applied whether the "
- "package is installed or not.</p>"),
- _("<h2>Filters</h2>"),
- _("<h3>Search</h3>"
- "<p>Enter free text into the search-field to match their names and descriptions. "
- "(a search for 'office' will bring up the 'OpenOffice' packages as well as "
- "'AbiWord' which carries the word 'office' in its description). You can search for "
- "multiple keywords by separating the with a white space (e.g. 'spread sheet' "
- "would return 'OpenOffice-calc').You may use the "
- "search combined with a filter, like searching for a package in a given repository. "
- "Other search attributes are provided, such as to search for a given file.</p>"),
- _("<h3>Groups</h3>"
- "<p>Software for &product; is indexed so that you can find software for a specific "
- "task when you are not aware of the software selection available. A more detailed, "
- "hierarchical classification is provided by the <b>RPM Groups</b> filter.</p>"),
- _("<h3>Patterns and Languages</h3>"
- "<p><b>Patterns</b> are task-oriented collections of multiple packages that "
- "install like one. The installation of the <i>File Server</i> pattern, for example, "
- "will install various packages needed for running such a server.</p>"
- "<p>If you want to install a particular language, you may want to do so via the "
- "<b>Language</b> tool from the YaST control center.</p>"),
- _("<h2>Software details in the box below</h2>"
- "<p>Explore the available information about the package in the box below. Note "
- "that more information is available for installed packages than for those only "
- "available from a repository.</p>"
- "<p>You can also pick a specific version of the package to install from this "
- "box.</p>"),
- "<hr/><p>http://en.opensuse.org/YaST2-GTK</p>",
- 0
-};
-
-static const char *patch_help[] = {
- _("<h1>Purpose</h1>"
- "<p>This tool gives you control on overviewing and picking patches. You may also "
- "reverse patches that have been applied to the system.</p>"),
- _("<h1>Usage</h1>"
- "<h2>Categories</h2>"
- "<p>Patches are grouped as follows:</p>"
- "<ul>"
- "<li><b>Security</b>: patches a software flaw that could be exploited to gain "
- "restricted privilege.</li>"
- "<li><b>Recommended</b>: fixes non-security related flaws (e.g. data corruption, "
- "performance slowdown)</li>"
- "<li><b>Optional</b>: ones that only apply to few users.</li>"
- "<li><b>Documentation</b>: fixes documentation errors.</li>"
- "<li><b>YaST</b>: patches for the YaST control center tools.</li>"
- "</ul>"),
- _("<p>Only patches that apply to your system will be visible. You can be sure "
- "that the decision to make a patch available is not done trivially.</p>"
- "<p>If you are looking for applications enhancements, you should check for <i>upgrades</i> "
- "on the <b>Software Manager</b>.</p>"),
- 0
-};
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/pkg/ygtkpkgfilterview.cc new/yast2-gtk-2.21.57/src/pkg/ygtkpkgfilterview.cc
--- old/yast2-gtk-2.21.56/src/pkg/ygtkpkgfilterview.cc 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/src/pkg/ygtkpkgfilterview.cc 2010-06-27 21:23:44.000000000 +0200
@@ -190,15 +190,22 @@
: impl (new Impl (this))
{
if (YGPackageSelector::get()->onlineUpdateMode()) {
+ // Translators: this refers to the package status
addRow (NULL, _("Available"), true, 0);
+ // Translators: this refers to the package status
addRow (NULL, _("Installed"), true, 0);
+ // Translators: this refers to the package status
addRow (NULL, _("Modified"), true, 0, false);
}
else {
+ // Translators: "Any status" may be translated as "All statuses" (whichever's smaller)
addRow (NULL, _("Any status"), true, 0);
+ // Translators: this refers to the package status
addRow (NULL, _("Not installed"), true, 0);
addRow (NULL, _("Installed"), true, 0);
+ // Translators: refers to package status: may be translated as "Upgrade"
addRow (NULL, _("Upgradable"), true, 0, false);
+ // Translators: this refers to the package status
addRow (NULL, _("Locked"), true, 0, false);
addRow (NULL, _("Modified"), true, 0, false);
}
@@ -262,6 +269,7 @@
GtkWidget *hbox = gtk_hbox_new (FALSE, 6), *button, *icon;
+ // Translators: if you prefer, translate this as "Apply Patches"
button = gtk_button_new_with_label (_("Upgrade Patches"));
gtk_widget_set_sensitive (button, hasPatches);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -317,6 +325,7 @@
std::string name = zypp_tag_group_enum_to_localised_text ((YPkgGroupEnum) i);
const char *icon = zypp_tag_enum_to_icon ((YPkgGroupEnum) i);
if (i == YPKG_GROUP_RECENT)
+ // Translators: when "upload" isn't easy to translate, translate this as "7 days old"
name += std::string ("\n<small>") + _("(uploaded last 7 days)") + "</small>";
addRow (icon, name.c_str(), true, GINT_TO_POINTER (i+1));
if (i == YPKG_GROUP_UNKNOWN)
@@ -485,7 +494,7 @@
G_CALLBACK (switch_clicked_cb), this);
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, TRUE, 0);
button = gtk_button_new_with_label (
- _("Switch system packages to the versions in this repository"));
+ _("Switch installed packages to the versions in this repository"));
gtk_button_set_image (GTK_BUTTON (button),
gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON));
g_signal_connect (G_OBJECT (button), "clicked",
@@ -554,6 +563,7 @@
YGtkPkgPriorityModel::YGtkPkgPriorityModel()
{
+ // Translators: "Any priority" may be translated as "All priorities" (whichever's smaller)
addRow (NULL, _("Any priority"), true, 0);
for (int i = 0; i < Ypp::Patch::priorityTotal(); i++)
addRow (NULL, Ypp::Patch::prioritySummary (i), true, 0, false);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/pkg/ygtkpkgflags.cc new/yast2-gtk-2.21.57/src/pkg/ygtkpkgflags.cc
--- old/yast2-gtk-2.21.56/src/pkg/ygtkpkgflags.cc 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/src/pkg/ygtkpkgflags.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-/********************************************************************
- * YaST2-GTK - http://en.opensuse.org/YaST2-GTK *
- ********************************************************************/
-/* YGtkPkgFlags, file handler */
-// check the header file for information about this utility
-
-#include "ygtkpkgflags.h"
-#include
-
-struct YGtkPkgFlags::Impl {
- GKeyFile *file;
-};
-
-YGtkPkgFlags::YGtkPkgFlags (const char *filename, bool writable)
-{
- impl = new Impl();
- impl->file = g_key_file_new();
- GKeyFileFlags flags = writable ? G_KEY_FILE_KEEP_COMMENTS : G_KEY_FILE_NONE;
- if (!g_key_file_load_from_file (file, filename, flags, NULL)) {
- g_key_file_free (impl->file);
- impl->file = NULL;
- }
-}
-
-YGtkPkgFlags::~YGtkPkgFlags()
-{
- if (impl->file)
- g_key_file_free (impl->file);
- delete impl;
-}
-
-std::string YGtkPkgFlags::readValue (const char *group, const char *var)
-{
- std::string value;
- if (impl->file) {
- gchar *v = g_key_file_get_string (impl->file, group, var, NULL);
- if (v) {
- value = v;
- g_free (v);
- }
- }
- return value;
-}
-
-void YGtkPkgFlags::writeValue (const char *group, const char *var, const char *value)
-{
- g_key_file_set_string (impl->file, group, var, value);
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/pkg/ygtkpkgflags.h new/yast2-gtk-2.21.57/src/pkg/ygtkpkgflags.h
--- old/yast2-gtk-2.21.56/src/pkg/ygtkpkgflags.h 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/src/pkg/ygtkpkgflags.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-/********************************************************************
- * YaST2-GTK - http://en.opensuse.org/YaST2-GTK *
- ********************************************************************/
-
-/* Reads and stores some flags to a given file.
-*/
-
-#ifndef YGTK_PKG_FLAGS_H
-#define YGTK_PKG_FLAGS_H
-
-struct YGtkPkgFlags {
- YGtkPkgFlags (const char *filename, bool writable);
-
- std::string readValue (const char *group, const char *variable);
- void writeValue (const char *group, const char *variable, const char *value);
-
- ~YGtkPkgFlags();
- struct Impl;
- Impl *impl;
-};
-
-#endif
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/pkg/ygtkpkgproductdialog.cc new/yast2-gtk-2.21.57/src/pkg/ygtkpkgproductdialog.cc
--- old/yast2-gtk-2.21.56/src/pkg/ygtkpkgproductdialog.cc 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/src/pkg/ygtkpkgproductdialog.cc 2010-06-27 21:23:44.000000000 +0200
@@ -156,7 +156,8 @@
gtk_container_add (GTK_CONTAINER (scroll), view);
GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(),
- GtkDialogFlags (0), GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("Product Listing"));
+ // Translators: same as "Listing of Products"
+ GtkDialogFlags (0), GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("Products Listing"));
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.56/src/pkg/ygtkpkgundolist.cc new/yast2-gtk-2.21.57/src/pkg/ygtkpkgundolist.cc
--- old/yast2-gtk-2.21.56/src/pkg/ygtkpkgundolist.cc 2010-06-12 13:52:45.000000000 +0200
+++ new/yast2-gtk-2.21.57/src/pkg/ygtkpkgundolist.cc 2010-06-27 21:23:44.000000000 +0200
@@ -152,6 +152,7 @@
const ZyppDu &point = *it;
if (!point.readonly && point.freeAfterCommit() < 0) {
char *str = g_strdup_printf (
+ // Translators: keep the first and final "%s". They will be expanded with html code.
_("%sPartition %s is %s over-capacity (%s filled out of %s).%s"),
"<b>",
point.dir.c_str(), point.freeAfterCommit().asString().c_str(),
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org