Author: rpmcruz Date: Mon Oct 4 17:58:48 2010 New Revision: 62529 URL: http://svn.opensuse.org/viewcvs/yast?rev=62529&view=rev Log: * src/*.cc & src/pkg/*.cc: general string review, and text domain change from "yast2-gtk" to "gtk". * src/pkg/ygtkpkgdetailview.cc: on the dependencies expander, show '"' for available version information when that text is the same of the installed version. Modified: trunk/gtk/ChangeLog trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/YGProgressBar.cc trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGi18n.h trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/pkg-selector-help.cc trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkgfilterview.cc trunk/gtk/src/pkg/ygtkpkghistorydialog.cc trunk/gtk/src/pkg/ygtkpkglistview.cc trunk/gtk/src/pkg/ygtkpkgmenubar.cc trunk/gtk/src/pkg/ygtkpkgpatternview.cc trunk/gtk/src/pkg/ygtkpkgproductdialog.cc trunk/gtk/src/pkg/ygtkpkgquerycombo.cc trunk/gtk/src/pkg/ygtkpkgrpmgroupsview.cc trunk/gtk/src/pkg/ygtkpkgsearchentry.cc trunk/gtk/src/pkg/ygtkpkgstatusbar.cc trunk/gtk/src/pkg/ygtkpkgundolist.cc trunk/gtk/src/pkg/yzypptags.cc trunk/gtk/src/pkg/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Oct 4 17:58:48 2010 @@ -1,3 +1,12 @@ +2010-10-04 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> + + * src/*.cc & src/pkg/*.cc: general string review, + and text domain change from "yast2-gtk" to "gtk". + + * src/pkg/ygtkpkgdetailview.cc: on the dependencies + expander, show '"' for available version information + when that text is the same of the installed version. + 2010-09-14 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: fix bug 637761: run Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Mon Oct 4 17:58:48 2010 @@ -1,9 +1,60 @@ ------------------------------------------------------------------- -Tue Sep 14 14:18:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt +Mon Oct 04 16:21:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt -- 2.21.68 +- 2.21.75 - sw_single: run solver at end, fixes bnc#620513. - got rid of included FindGTK2.cmake module. +- overall string review. +- text domain changed from "yast2-gtk" to "gtk". + +------------------------------------------------------------------- +Thu Sep 30 18:32:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.74 +- rpm spec fix (now compatible for both 11.3 and factory). + +------------------------------------------------------------------- +Tue Sep 14 14:48:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.73 +- sw_single: run solver at end, fixes bnc#620513. + +------------------------------------------------------------------- +Mon Aug 30 18:05:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.72 +- temporarily reverting cmake fixes: we need a 11.3 version +built in order to issue a patch. + +------------------------------------------------------------------- +Mon Aug 30 17:45:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.71 +- fix compilation error on Factory (bnc#635352) +- uploading the 11.3 branch for patching purposes (bnc#624310). + +------------------------------------------------------------------- +Mon Aug 23 00:40:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.70 +- sw_single: package count wrong on the filters box when +show-debug or show-devel when de-selected (bcn#632377) +- fixed potential crash when file picking file of esoteric +filename (bnc#633173) +- window size too small when using big fonts: correlate +window size to font size (bnc#633498) + +------------------------------------------------------------------- +Mon Jul 26 19:28:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.69 +- sw_single: fix file > import / export menu items (bcn#624310) + +------------------------------------------------------------------- +Wed Jul 14 13:39:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.68 +- sw_single: fixed duplicate separator item in context menu. ------------------------------------------------------------------- Wed Jul 14 11:41:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt Modified: trunk/gtk/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGProgressBar.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/YGProgressBar.cc (original) +++ trunk/gtk/src/YGProgressBar.cc Mon Oct 4 17:58:48 2010 @@ -3,7 +3,7 @@ ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #define YUILogComponent "gtk" Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Mon Oct 4 17:58:48 2010 @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Mon Oct 4 17:58:48 2010 @@ -3,7 +3,7 @@ ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include <string.h> Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Mon Oct 4 17:58:48 2010 @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #define YUILogComponent "gtk" Modified: trunk/gtk/src/YGi18n.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGi18n.h?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/YGi18n.h (original) +++ trunk/gtk/src/YGi18n.h Mon Oct 4 17:58:48 2010 @@ -6,7 +6,7 @@ #define YGi18n_h #include <libintl.h> -#define TEXTDOMAIN "yast2-gtk" +#define TEXTDOMAIN "gtk" static inline const char *_(const char *msgid) { return dgettext (TEXTDOMAIN, msgid); } Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Mon Oct 4 17:58:48 2010 @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/pkg-selector-help.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/pkg-selector-help.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/pkg-selector-help.cc (original) +++ trunk/gtk/src/pkg/pkg-selector-help.cc Mon Oct 4 17:58:48 2010 @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -760,22 +760,27 @@ Ypp::Selectable sel = list.get (0); clear(); - std::string i ("<i>"), _i ("</i>"); - std::string installed_str (i + _("Installed Version") + _i); - std::string candidate_str (i + _("Available Version") + _i); - if (sel.hasInstalledVersion()) + std::string i ("<i>"), _i ("</i>"), b ("<b>"), _b ("</b>"); + std::string installed_str (i + b + _("Installed Version:") + _b + _i); + std::string candidate_str (i + b + _("Available Version:") + _b + _i); + bool hasInstalled = sel.hasInstalledVersion(), + hasCandidate = sel.hasCandidateVersion(); + if (hasInstalled) installed_str += "<br>" + sel.installed().number(); - if (sel.hasCandidateVersion()) + if (hasCandidate) candidate_str += "<br>" + sel.candidate().number(); addLine ("", installed_str, candidate_str, -1); for (int dep = 0; dep < VersionDependencies::total(); dep++) { std::string inst, cand; - if (sel.hasInstalledVersion()) + if (hasInstalled) inst = VersionDependencies (sel.installed()).getText (dep); - if (sel.hasCandidateVersion()) + if (hasCandidate) cand = VersionDependencies (sel.candidate()).getText (dep); - if (!inst.empty() || !cand.empty()) + if (!inst.empty() || !cand.empty()) { + if (inst == cand) + cand = i + _("idem") + _i; addLine (VersionDependencies::getLabel (dep), inst, cand, dep); + } } gtk_widget_show_all (vbox); } Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -199,12 +199,12 @@ } else { // Translators: "Any status" may be translated as "All statuses" (whichever's smaller) - addRow (NULL, _("Any status"), true, 0); + addRow (NULL, _("All packages"), 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); + addRow (NULL, _("Upgrades"), true, 0, false); // Translators: this refers to the package status addRow (NULL, _("Locked"), true, 0, false); addRow (NULL, _("Modified"), true, 0, false); @@ -270,7 +270,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")); + button = gtk_button_new_with_label (_("Apply Patches")); gtk_widget_set_sensitive (button, hasPatches); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (upgrade_patches_clicked_cb), this); @@ -564,7 +564,7 @@ YGtkPkgPriorityModel::YGtkPkgPriorityModel() { // Translators: "Any priority" may be translated as "All priorities" (whichever's smaller) - addRow (NULL, _("Any priority"), true, 0); + addRow (NULL, _("All patches"), true, 0); for (int i = 0; i < Ypp::Patch::priorityTotal(); i++) addRow (NULL, Ypp::Patch::prioritySummary (i), true, 0, false); } Modified: trunk/gtk/src/pkg/ygtkpkghistorydialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkghistorydialog.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkghistorydialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkghistorydialog.cc Mon Oct 4 17:58:48 2010 @@ -1,11 +1,11 @@ /******************************************************************** * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ -/* YGtkPkgMenuBar, menu bar */ +/* YGtkPkgHistoryDialog, dialog */ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -47,8 +47,11 @@ { if (reqby.empty()) return _("automatic"); - if (reqby.compare (0, 4, "root", 4) == 0) - return _("user: root"); + if (reqby.compare (0, 4, "root", 4) == 0) { + std::string str (_("user:")); + str += " root"; + return str; + } return reqby; } @@ -508,7 +511,7 @@ GtkCellRenderer *renderer, *pix_renderer; GtkTreeViewColumn *column; - GtkWidget *log_view = ygtk_tree_view_new (_("No log entries.")); + GtkWidget *log_view = ygtk_tree_view_new (_("No entries.")); gtk_tree_view_set_search_column (GTK_TREE_VIEW (log_view), LogListHandler::SHORTCUT_COLUMN); gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (log_view), TRUE); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (log_view), TRUE); @@ -615,7 +618,7 @@ GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE, - _("History of Changes (%s)"), FILENAME); + _("Logs (%s)"), FILENAME); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_JUMP_TO, 1); gtk_dialog_add_button (GTK_DIALOG (dialog), _("Save to File"), 2); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); Modified: trunk/gtk/src/pkg/ygtkpkglistview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkglistview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkglistview.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #define YUILogComponent "gtk" @@ -940,8 +940,10 @@ text = _("To remove"); else if (sel.isInstalled()) { text = _("Installed"); - if (sel.hasUpgrade()) - text += _(" (upgrade available)"); + if (sel.hasUpgrade()) { + text += " "; + text += _("(upgrade available)"); + } } else text = _("Not installed"); @@ -982,7 +984,7 @@ std::string getRepositoryLabel (Ypp::Repository &repo) { std::string name (repo.name()), url, str; - url = repo.isSystem() ? _("Local database") : repo.url(); + url = repo.isSystem() ? _("System") : repo.url(); str.reserve (name.size() + url.size() + 64); str = name + "\n"; str += "<span color=\"" GRAY_COLOR "\">"; Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -214,7 +214,7 @@ static void import_file_cb (GtkMenuItem *item) { - GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Load Package List"), + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import"), YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); @@ -290,10 +290,10 @@ YGPackageSelector::get()->popupChanges(); } - catch ( const zypp::Exception & exception ) + catch (const zypp::Exception & exception) { yuiWarning() << "Error reading package list from " << filename << endl; - char *text = g_strdup_printf (_("Error loading package list from '%s'"), filename); + char *text = g_strdup_printf (_("Could not load package list: '%s'"), filename); errorMsg (text); g_free (text); } @@ -307,7 +307,7 @@ static void export_file_cb (GtkMenuItem *item) { - GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save Package List"), + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export"), YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); @@ -364,7 +364,7 @@ g_remove (filename); // Post error popup - char *text = g_strdup_printf (_("Error exporting package list to '%s'"), filename); + char *text = g_strdup_printf (_("Could not export package list: '%s'"), filename); errorMsg (text); g_free (text); } @@ -379,13 +379,13 @@ { const char *dirname = "/var/log/YaST2/solverTestcase"; std::string msg = _("Use this to generate extensive logs to help tracking down " - "bugs in the dependency resolver.\nThe logs will be stored in " + "bugs in the dependency solver.\nThe logs will be stored in " "directory: "); msg += dirname; GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, - "%s", _("Create Dependency Resolver Test Case")); + "%s", _("Create Dependency Solver Test Case")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str()); int ret = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -400,11 +400,11 @@ GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _("Success")); - msg = _("Dependency resolver test case written to"); + msg = _("Dependency solver test case written to"); msg += " <tt>"; msg += dirname; msg += "</tt>\n"; - msg += _("Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?"); + msg += _("Also create a <tt>y2logs.tgz</tt> tar archive to attach to bugzilla?"); gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str()); ret = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -413,7 +413,7 @@ YGUI::ui()->askSaveLogs(); } else { - msg = _("Failed to create dependency resolver test case.\n" + msg = _("Failed to create dependency solver test case.\n" "Please check disk space and permissions for"); msg += " <tt>"; msg += dirname; @@ -731,10 +731,10 @@ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); append_menu_item (submenu, _("Show Products"), NULL, G_CALLBACK (show_products_cb), this); - append_menu_item (submenu, _("Show Package Changes"), NULL, + append_menu_item (submenu, _("Show Changes"), NULL, G_CALLBACK (show_pkg_changes_cb), this); if (!selector->onlineUpdateMode()) - append_menu_item (submenu, _("Show History of Changes"), NULL, + append_menu_item (submenu, _("Show Logs"), NULL, G_CALLBACK (show_log_changes_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); append_menu_item (submenu, _("Install All Matching -devel Packages"), NULL, @@ -744,7 +744,7 @@ append_menu_item (submenu, _("Install All Matching -debug-source Packages"), NULL, G_CALLBACK (install_all_debug_source_pkgs_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); - append_menu_item (submenu, _("Generate Dependency Resolver Test Case"), NULL, + append_menu_item (submenu, _("Generate Dependency Solver Test Case"), NULL, G_CALLBACK (create_solver_testcase_cb), this); append_menu_item (submenu, _("Reset Ignored Dependency Conflicts"), NULL, G_CALLBACK (reset_ignored_dependency_conflicts_cb), this); Modified: trunk/gtk/src/pkg/ygtkpkgpatternview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgpatternview.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgpatternview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgpatternview.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/ygtkpkgproductdialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgproductdialog.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgproductdialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgproductdialog.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/ygtkpkgquerycombo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgquerycombo.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgquerycombo.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgquerycombo.cc Mon Oct 4 17:58:48 2010 @@ -1,10 +1,13 @@ /******************************************************************** * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ -/* Textdomain "yast2-gtk" */ /* YGtkPkgQueryCombo, an umbrella for any group of QueryWidget widgets */ // check the header file for information about this widget +/* + Textdomain "yast2-gtk" + */ + #define YUILogComponent "gtk-pkg" #include "YGi18n.h" #include "config.h" Modified: trunk/gtk/src/pkg/ygtkpkgrpmgroupsview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgrpmgroupsview.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgrpmgroupsview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgrpmgroupsview.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/ygtkpkgsearchentry.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgsearchentry.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgsearchentry.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgsearchentry.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -237,7 +237,7 @@ break; case 2: { GtkWidget *label = gtk_label_new ( - _("Search by file name is only reliable for installed packages.")); + _("Search by file name only reliable for installed packages.")); gtk_misc_set_alignment (GTK_MISC (label), 0, .5); GtkWidget *icon = gtk_image_new_from_stock ( GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgstatusbar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/ygtkpkgundolist.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgundolist.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgundolist.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgundolist.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this utility /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" Modified: trunk/gtk/src/pkg/yzypptags.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzypptags.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/yzypptags.cc (original) +++ trunk/gtk/src/pkg/yzypptags.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this translator /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "YGi18n.h" @@ -28,11 +28,16 @@ case YPKG_GROUP_PROGRAMMING: return _( "Programming" ); case YPKG_GROUP_MULTIMEDIA: return _( "Multimedia" ); case YPKG_GROUP_SYSTEM: return _( "System" ); + // Translators: keep translation short case YPKG_GROUP_DESKTOP_GNOME: return _( "Desktop (GNOME)" ); + // Translators: keep translation short case YPKG_GROUP_DESKTOP_KDE: return _( "Desktop (KDE)" ); + // Translators: keep translation short case YPKG_GROUP_DESKTOP_XFCE: return _( "Desktop (XFCE)" ); + // Translators: keep translation short case YPKG_GROUP_DESKTOP_OTHER: return _( "Desktop (Others)" ); case YPKG_GROUP_PUBLISHING: return _( "Publishing" ); + // Translators: keep translation short case YPKG_GROUP_ADMIN_TOOLS: return _( "Admin Tools" ); case YPKG_GROUP_LOCALIZATION: return _( "Localization" ); case YPKG_GROUP_SECURITY: return _( "Security" ); @@ -41,10 +46,10 @@ case YPKG_GROUP_DOCUMENTATION: return _( "Documentation" ); case YPKG_GROUP_UTILITIES: return _( "Utilities" ); - case YPKG_GROUP_UNKNOWN: return _( "Unknown Group" ); + case YPKG_GROUP_UNKNOWN: return _( "Unknown" ); case YPKG_GROUP_SUGGESTED: return _( "Suggested" ); case YPKG_GROUP_RECOMMENDED: return _( "Recommended" ); - case YPKG_GROUP_ORPHANED: return _( "Orphaned" ); + case YPKG_GROUP_ORPHANED: return _( "Unmaintained" ); case YPKG_GROUP_RECENT: return _( "Recent" ); case YPKG_GROUP_MULTIVERSION: return _( "Multiversion" ); case YPKG_GROUP_TOTAL: break; Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=62529&r1=62528&r2=62529&view=diff ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Mon Oct 4 17:58:48 2010 @@ -5,7 +5,7 @@ // check the header file for information about this wrapper /* - Textdomain "yast2-gtk" + Textdomain "gtk" */ #include "config.h" @@ -145,7 +145,7 @@ int installed, total; col.stats (&installed, &total); std::ostringstream stream; - stream << _("Installed: ") << installed << _(" of ") << total; + stream << _("Installed:") << " " << installed << " " << _("of") << " " << total; return stream.str(); } default: break; @@ -731,11 +731,15 @@ const char *Ypp::Patch::prioritySummary (int priority) { switch (priority) { + // Translators: this refers to patch priority case 0: return _("Security"); + // Translators: this refers to patch priority case 1: return _("Recommended"); case 2: return "YaST"; case 3: return _("Documentation"); + // Translators: this refers to patch priority case 4: return _("Optional"); + // Translators: this refers to patch priority case 5: return _("Other"); } return 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org