October 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62587 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: rpmcruz Date: Fri Oct 8 22:37:13 2010 New Revision: 62587 URL: http://svn.opensuse.org/viewcvs/yast?rev=62587&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62587&r1=62586&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Fri Oct 8 22:37:13 2010 @@ -1 +1 @@ -2.21.76 +2.21.77 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62587&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Oct 8 22:37:13 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "76") +SET(VERSION_PATCH "77") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Oct 8 22:37:13 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 08 21:36:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.77 +- another string review. + +------------------------------------------------------------------- Thu Oct 07 13:22:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.76 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62586 - in /trunk/gtk/src/pkg: YGPackageSelector.cc ygtkpkgdetailview.cc ygtkpkgfilterview.cc ygtkpkgmenubar.cc ygtkpkgstatusbar.cc
by rpmcruz＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: rpmcruz Date: Fri Oct 8 22:25:32 2010 New Revision: 62586 URL: http://svn.opensuse.org/viewcvs/yast?rev=62586&view=rev Log: String review. Modified: trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkgfilterview.cc trunk/gtk/src/pkg/ygtkpkgmenubar.cc trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Fri Oct 8 22:25:32 2010 @@ -273,7 +273,7 @@ } virtual bool showMessage (Ypp::Selectable &sel, const std::string &message) - { return acceptText (sel, _("Warning Message"), _("Install anyway"), message); } + { return acceptText (sel, _("Warning Message"), _("Install anyway?"), message); } virtual bool resolveProblems (const std::list <Ypp::Problem *> &problems) { Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Fri Oct 8 22:25:32 2010 @@ -24,8 +24,12 @@ #define BROWSER_BIN "/usr/bin/firefox" #define GNOME_OPEN_BIN "/usr/bin/gnome-open" -static const char *onlyInstalledMsg = - _("Information only available for installed packages."); +static std::string onlyInstalledMsg() { + std::string s (""); + s += _("Information only available for installed packages."); + s += ""; + return s; +} #if 0 static const char *keywordOpenTag = ""; @@ -188,17 +192,14 @@ GtkWidget *item; if (g_file_test (BROWSER_BIN, G_FILE_TEST_IS_EXECUTABLE)) { - std::string label; + std::string label ("_Open"); if (getuid() == 0) { const char *username = getenv ("USERNAME"); if (!username || !(*username)) username = "root"; - label = _("_Open (as "); - label += username; - label += ")"; + label += " ("; label += _("as"); + label += " "; label += username; label += ")"; } - else - label = _("_Open"); item = gtk_image_menu_item_new_with_mnemonic (label.c_str()); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU)); @@ -776,11 +777,8 @@ inst = VersionDependencies (sel.installed()).getText (dep); if (hasCandidate) cand = VersionDependencies (sel.candidate()).getText (dep); - if (!inst.empty() || !cand.empty()) { - if (inst == cand) - cand = i + _("idem") + _i; + if (!inst.empty() || !cand.empty()) addLine (VersionDependencies::getLabel (dep), inst, cand, dep); - } } gtk_widget_show_all (vbox); } @@ -797,16 +795,17 @@ static const char *getLabel (int dep) { + switch ((zypp::Dep::for_use_in_switch) dep) { - case zypp::Dep::PROVIDES_e: return _("Provides:"); - case zypp::Dep::PREREQUIRES_e: return _("Pre-requires:"); - case zypp::Dep::REQUIRES_e: return _("Requires:"); - case zypp::Dep::CONFLICTS_e: return _("Conflicts:"); - case zypp::Dep::OBSOLETES_e: return _("Obsoletes:"); - case zypp::Dep::RECOMMENDS_e: return _("Recommends:"); - case zypp::Dep::SUGGESTS_e: return _("Suggests:"); - case zypp::Dep::ENHANCES_e: return _("Enhances:"); - case zypp::Dep::SUPPLEMENTS_e: return _("Supplements:"); + case zypp::Dep::PROVIDES_e: return "Provides:"; + case zypp::Dep::PREREQUIRES_e: return "Pre-requires:"; + case zypp::Dep::REQUIRES_e: return "Requires:"; + case zypp::Dep::CONFLICTS_e: return "Conflicts:"; + case zypp::Dep::OBSOLETES_e: return "Obsoletes:"; + case zypp::Dep::RECOMMENDS_e: return "Recommends:"; + case zypp::Dep::SUGGESTS_e: return "Suggests:"; + case zypp::Dep::ENHANCES_e: return "Enhances:"; + case zypp::Dep::SUPPLEMENTS_e: return "Supplements:"; } return 0; } @@ -894,7 +893,7 @@ if (sel.isInstalled()) ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), filelist (sel).c_str()); else - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg().c_str()); } virtual void showRefreshList (Ypp::List list) {} @@ -1009,7 +1008,7 @@ if (sel.isInstalled()) ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), changelog (sel).c_str()); else - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg().c_str()); } virtual void showRefreshList (Ypp::List list) {} @@ -1057,10 +1056,10 @@ { Ypp::Selectable sel = list.get (0); std::string str (authors (sel)); - if (str.empty()) - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Not specified.")); - else - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); + if (str.empty()) { + str = ""; str += _("Attribute not-specified."); str += ""; + } + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } virtual void showRefreshList (Ypp::List list) {} Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Fri Oct 8 22:25:32 2010 @@ -269,8 +269,8 @@ GtkWidget *hbox = gtk_hbox_new (FALSE, 6), *button, *icon; - // Translators: if you prefer, translate this as "Apply Patches" - button = gtk_button_new_with_label (_("Apply Patches")); + // Translators: this is shown next to the "Upgrade All" button + button = gtk_button_new_with_label (_("Only Upgrade Patches")); gtk_widget_set_sensitive (button, hasPatches); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (upgrade_patches_clicked_cb), this); Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Fri Oct 8 22:25:32 2010 @@ -366,8 +366,7 @@ // Post error popup std::string str (_("Could not save to:")); str += " "; str += filename; - errorMsg (text); - g_free (text); + errorMsg (str); } g_free (filename); @@ -380,8 +379,8 @@ { const char *dirname = "/var/log/YaST2/solverTestcase"; std::string msg (_("Use this to generate extensive logs to help tracking " - "down bugs in the dependencies resolver."); - msg += "\n"; msg += _("The logs will be saved to the directory:")); + "down bugs in the dependencies resolver.")); + msg += "\n"; msg += _("The logs will be saved to the directory:"); msg += " "; msg += dirname; GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.cc?… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgstatusbar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Fri Oct 8 22:25:32 2010 @@ -91,14 +91,17 @@ if (sel->toModifyAuto()) str = g_strdup_printf (_("%s %d preselected packages"), action, auto_count); else { - const char *format; - if (auto_count > 1) - format = _("%s %s, plus %d dependencies"); - else if (auto_count == 1) - format = _("%s %s, plus 1 dependency"); - else - format = "%s %s"; - str = g_strdup_printf (format, action, sel->name().c_str(), auto_count); + if (auto_count == 0) + str = g_strdup_printf ("%s %s", action, sel->name().c_str()); + else { + char *deps; + if (auto_count == 1) + deps = g_strdup (_("plus 1 dependency")); + else + deps = g_strdup_printf (_("plus %d dependencies"), auto_count); + str = g_strdup_printf ("%s %s, %s", action, sel->name().c_str(), deps); + g_free (deps); + } } gtk_label_set_markup (GTK_LABEL (text), str); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62585 - in /trunk/gtk/src: YGUI.cc YGUI.h pkg/ygtkpkglistview.cc pkg/ygtkpkgmenubar.cc pkg/ygtkpkgundolist.cc pkg/yzypptags.cc pkg/yzyppwrapper.cc
by rpmcruz＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: rpmcruz Date: Fri Oct 8 21:06:34 2010 New Revision: 62585 URL: http://svn.opensuse.org/viewcvs/yast?rev=62585&view=rev Log: String review. Modified: trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUI.h trunk/gtk/src/pkg/ygtkpkglistview.cc trunk/gtk/src/pkg/ygtkpkgmenubar.cc trunk/gtk/src/pkg/ygtkpkgundolist.cc trunk/gtk/src/pkg/yzypptags.cc trunk/gtk/src/pkg/yzyppwrapper.cc Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=62585&r1=625… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Fri Oct 8 21:06:34 2010 @@ -45,7 +45,6 @@ YGUI::YGUI (bool with_threads) : YUI (with_threads), m_done_init (false), busy_timeout (0) { - m_have_wm = true; m_no_border = m_fullscreen = m_swsingle = false; YGUI::setTextdomain( TEXTDOMAIN ); @@ -124,23 +123,19 @@ argp++; if (argp[0] == '-') argp++; - if (!strcmp (argp, "no-wm")) - m_have_wm = false; - else if (!strcmp (argp, "fullscreen")) + if (!strcmp (argp, "fullscreen")) m_fullscreen = true; else if (!strcmp (argp, "noborder")) m_no_border = true; else if (!strcmp (argp, "help")) { printf ( - _("Command line options for the YaST2 UI (Gtk plugin):\n\n" - "--no-wm assume no window manager is running\n" - "--noborder no window manager border for main dialogs\n" - "--fullscreen use full screen for main dialogs\n" -// "--geometry WxH sets a default size of W per H to main dialogs\n" - "--nothreads run without additional UI threads\n" - "--help prints this help text\n" - "\n" - )); + _("Command line options for the YaST2 UI (GTK plugin):\n\n" + "--noborder no window manager border for main dialogs\n" + "--fullscreen use full screen for main dialogs\n" + "--nothreads run without additional UI threads\n" + "--help prints this help text\n" + "\n" + )); exit (0); } } @@ -290,7 +285,7 @@ void YGUI::askPlayMacro() { string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_OPEN, - DEFAULT_MACRO_FILE_NAME, "*.ycp", _("Select Macro File to Play")); + DEFAULT_MACRO_FILE_NAME, "*.ycp", _("Open Macro file")); if (!filename.empty()) { busyCursor(); YMacro::play (filename); @@ -312,7 +307,7 @@ } else { string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_SAVE, - DEFAULT_MACRO_FILE_NAME, "*.ycp", _("Select Macro File to Record to")); + DEFAULT_MACRO_FILE_NAME, "*.ycp", _("Save Macro")); if (!filename.empty()) YMacro::record (filename); } @@ -321,7 +316,7 @@ void YGUI::askSaveLogs() { string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_SAVE, - "/tmp/y2logs.tgz", "*.tgz *.tar.gz", _("Save y2logs to...")); + "/tmp/y2logs.tgz", "*.tgz *.tar.gz", _("Save y2logs")); if (!filename.empty()) { std::string command = "/sbin/save_y2logs"; command += " '" + filename + "'"; @@ -331,7 +326,7 @@ yuiMilestone() << "y2logs saved to " << filename << endl; else { char *error = g_strdup_printf ( - _("Error: couldn't save y2logs: \"%s\" (exit value: %d)"), + _("Could not run: '%s' (exit value: %d)"), command.c_str(), ret); yuiError() << error << endl; errorMsg (error); @@ -369,7 +364,7 @@ if (!shot) { if (interactive) - errorMsg (_("Couldn't take a screenshot.")); + errorMsg (_("Could not take screenshot.")); return; } @@ -410,7 +405,7 @@ yuiDebug() << "screenshot: " << filename << endl; filename = askForFileOrDirectory ( - GTK_FILE_CHOOSER_ACTION_SAVE, "", "*.png", _("Save screenshot to")); + GTK_FILE_CHOOSER_ACTION_SAVE, "", "*.png", _("Save screenshot")); if (filename.empty()) { // user dismissed the dialog yuiDebug() << "Save screen shot canceled by user\n"; goto makeScreenShot_ret; @@ -422,10 +417,11 @@ yuiDebug() << "Saving screen shot to " << filename << endl; if (!gdk_pixbuf_save (shot, filename.c_str(), "png", &error, NULL)) { - string msg = _("Couldn't save screenshot to file ") + filename; + string msg = _("Could not save to:"); + msg += " "; msg += filename; if (error) { - msg += "\n"; - msg += std::string ("\n") + error->message; + msg += "\n"; msg += "\n"; + msg += error->message; } yuiError() << msg << endl; if (interactive) @@ -463,7 +459,7 @@ button = GTK_STOCK_OPEN; break; case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER: case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: - button = _("Choose"); break; + button = _("Select"); break; } GtkWidget *dialog; dialog = gtk_file_chooser_dialog_new (title.c_str(), Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=62585&r1=6258… ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Fri Oct 8 21:06:34 2010 @@ -63,13 +63,11 @@ static gboolean busy_timeout_cb (gpointer data); // window-related arguments - bool m_have_wm, m_no_border, m_fullscreen; - bool m_swsingle; + bool m_no_border, m_fullscreen, m_swsingle; public: // Helpers for internal use [ visibility hidden ] bool setFullscreen() const { return m_fullscreen; } - bool hasWM() const { return m_have_wm; } bool unsetBorder() const { return m_no_border; } bool isSwsingle() const { return m_swsingle; } }; Modified: trunk/gtk/src/pkg/ygtkpkglistview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkglistview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkglistview.cc Fri Oct 8 21:06:34 2010 @@ -453,7 +453,7 @@ if (canLock) { static const char *lock_tooltip = "Package lock: prevents the package status from being modified by " - "the solver (that is, it won't honour dependencies or collections ties.)"; + "the dependencies resolver."; if (props.isLocked()) inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), GTK_STOCK_DIALOG_AUTHENTICATION, true, inner::unlock_cb, pThis), empty = false; @@ -947,8 +947,11 @@ } else text = _("Not installed"); - if (sel.toModifyAuto()) - text += _("\nstatus changed by the dependency solver"); + if (sel.toModifyAuto()) { + text += "\n"; + text += _("status changed by the dependencies resolver"); + text += ""; + } return text; } Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Fri Oct 8 21:06:34 2010 @@ -214,7 +214,7 @@ static void import_file_cb (GtkMenuItem *item) { - GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import"), + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import from"), YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); @@ -293,9 +293,9 @@ catch (const zypp::Exception & exception) { yuiWarning() << "Error reading package list from " << filename << endl; - char *text = g_strdup_printf (_("Could not load package list: '%s'"), filename); - errorMsg (text); - g_free (text); + std::string str (_("Could not open:")); + str += " "; str += filename; + errorMsg (str); } g_free (filename); @@ -307,7 +307,7 @@ static void export_file_cb (GtkMenuItem *item) { - GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export"), + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export to"), YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); @@ -364,7 +364,8 @@ g_remove (filename); // Post error popup - char *text = g_strdup_printf (_("Could not export package list: '%s'"), filename); + std::string str (_("Could not save to:")); + str += " "; str += filename; errorMsg (text); g_free (text); } @@ -378,14 +379,15 @@ static void create_solver_testcase_cb (GtkMenuItem *item) { const char *dirname = "/var/log/YaST2/solverTestcase"; - std::string msg = _("Use this to generate extensive logs to help tracking down " - "bugs in the dependency solver.\nThe logs will be stored in " - "directory: "); - msg += dirname; + std::string msg (_("Use this to generate extensive logs to help tracking " + "down bugs in the dependencies resolver."); + msg += "\n"; msg += _("The logs will be saved to the directory:")); + msg += " "; 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 Solver Test Case")); + // Translators: if there is no direct translation to Dependencies Resolver, then translate it to e.g. Dependencies Manager + "%s", _("Generate Dependencies Resolver Testcase")); 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,7 +402,7 @@ GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _("Success")); - msg = _("Dependency solver test case written to"); + msg = _("Dependencies resolver test case written to:"); msg += " <tt>"; msg += dirname; msg += "</tt>\n"; @@ -413,11 +415,9 @@ YGUI::ui()->askSaveLogs(); } else { - msg = _("Failed to create dependency solver test case.\n" - "Please check disk space and permissions for"); - msg += " <tt>"; - msg += dirname; - msg += "</tt>"; + msg = _("Failed to create dependencies resolver testcase.\n" + "Please check disk space and permissions for:"); + msg += " <tt>"; msg += dirname; msg += "</tt>"; errorMsg (msg.c_str()); } } @@ -686,67 +686,68 @@ Flags flags; GtkWidget *menu_bar = m_menu, *item, *submenu; - item = append_menu_item (menu_bar, _("File"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_File"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("Import..."), NULL, + append_menu_item (submenu, _("_Import..."), NULL, G_CALLBACK (import_file_cb), this); - append_menu_item (submenu, _("Export..."), NULL, + append_menu_item (submenu, _("_Export..."), NULL, G_CALLBACK (export_file_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); append_menu_item (submenu, NULL, GTK_STOCK_APPLY, G_CALLBACK (accept_item_cb), selector); append_menu_item (submenu, NULL, GTK_STOCK_QUIT, G_CALLBACK (reject_item_cb), selector); if (selector->repoMgrEnabled()) { - item = append_menu_item (menu_bar, _("Configuration"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_Configuration"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("Repositories..."), NULL, + append_menu_item (submenu, _("_Repositories..."), NULL, G_CALLBACK (repoManager), this); if (selector->onlineUpdateMode()) - append_menu_item (submenu, _("Online Update..."), NULL, + append_menu_item (submenu, _("_Online Update..."), NULL, G_CALLBACK (onlineUpdateConfiguration), this); else - append_menu_item (submenu, _("Search Packages on Web..."), NULL, + append_menu_item (submenu, _("Search Packages on _Web..."), NULL, G_CALLBACK (webpinSearch), this); } - item = append_menu_item (menu_bar, _("Dependencies"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_Dependencies"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("Check Now"), NULL, + append_menu_item (submenu, _("_Check Now"), NULL, G_CALLBACK (manualResolvePackageDependencies), this); - new AutoCheckItem (submenu, _("Autocheck"), &flags); + new AutoCheckItem (submenu, _("_Autocheck"), &flags); if (!selector->onlineUpdateMode()) { - item = append_menu_item (menu_bar, _("Options"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_Options"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); // Translators: don't translate the "-devel" - new ShowDevelCheckItem (submenu, _("Show -devel packages"), &flags); + new ShowDevelCheckItem (submenu, _("Show -de_vel Packages"), &flags); // Translators: don't translate the "-debuginfo/-debugsource" part - new ShowDebugCheckItem (submenu, _("Show -debuginfo/-debugsource Packages"), &flags); - new SystemVerificationCheckItem (submenu, _("System Verification Mode"), &flags); -#if ZYPP_VERSION > 6031004 + new ShowDebugCheckItem (submenu, _("Show -_debuginfo/-debugsource Packages"), &flags); + new SystemVerificationCheckItem (submenu, _("_System Verification Mode"), &flags); new CleanupDepsCheckItem (submenu, _("_Cleanup when deleting packages"), &flags); new AllowVendorChangeCheckItem (submenu, _("_Allow vendor change"), &flags); -#endif } - item = append_menu_item (menu_bar, _("Extras"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("_Extras"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("Show Products"), NULL, + append_menu_item (submenu, _("Show _Products"), NULL, G_CALLBACK (show_products_cb), this); - append_menu_item (submenu, _("Show 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"), NULL, + append_menu_item (submenu, _("Show _History"), 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, + // Translators: keep "-_devel" untranslated + append_menu_item (submenu, _("Install All Matching -_devel Packages"), NULL, G_CALLBACK (install_all_devel_pkgs_cb), this); - append_menu_item (submenu, _("Install All Matching -debug-info Packages"), NULL, + // Translators: keep "-debug-_info" untranslated + append_menu_item (submenu, _("Install All Matching -debug-_sinfo Packages"), NULL, G_CALLBACK (install_all_debug_info_pkgs_cb), this); - append_menu_item (submenu, _("Install All Matching -debug-source Packages"), NULL, + // Translators: keep "-debug-_source" untranslated + 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 Solver Test Case"), NULL, + append_menu_item (submenu, _("Generate Dependencies Resolver _Testcase"), NULL, G_CALLBACK (create_solver_testcase_cb), this); - append_menu_item (submenu, _("Reset Ignored Dependency Conflicts"), NULL, + append_menu_item (submenu, _("Reset _Ignored Dependencies Conflicts"), NULL, G_CALLBACK (reset_ignored_dependency_conflicts_cb), this); gtk_widget_show_all (m_menu); Modified: trunk/gtk/src/pkg/ygtkpkgundolist.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgundolist.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgundolist.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgundolist.cc Fri Oct 8 21:06:34 2010 @@ -151,15 +151,17 @@ for (ZyppDuSet::iterator it = diskUsage.begin(); it != diskUsage.end(); it++) { 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"), - "", - point.dir.c_str(), point.freeAfterCommit().asString().c_str(), + // Translators: please keep the %s order intact. They refer to mount_point, needed_space + char *over = g_strdup_printf (_("Partition %s is %s over-capacity"), + point.dir.c_str(), point.freeAfterCommit().asString().c_str()); + // Translators: please keep the %s order intact. They refer to used_space, total_space + char *fill = g_strdup_printf (_("%s filled out of %s"), point.usedAfterCommit().asString().c_str(), - point.totalSize().asString().c_str(), ""); - gtk_label_set_markup (GTK_LABEL (warn_label), str); - g_free (str); + point.totalSize().asString().c_str()); + char *markup = g_strdup_printf ( + "%s (%s)", over, fill); + gtk_label_set_markup (GTK_LABEL (warn_label), markup); + g_free (over); g_free (fill); g_free (markup); gtk_widget_show (warn_label); break; } Modified: trunk/gtk/src/pkg/yzypptags.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzypptags.cc?rev=625… ============================================================================== --- trunk/gtk/src/pkg/yzypptags.cc (original) +++ trunk/gtk/src/pkg/yzypptags.cc Fri Oct 8 21:06:34 2010 @@ -49,6 +49,7 @@ case YPKG_GROUP_UNKNOWN: return _( "Unknown" ); case YPKG_GROUP_SUGGESTED: return _( "Suggested" ); case YPKG_GROUP_RECOMMENDED: return _( "Recommended" ); + // Translators: this refers to packages no longer available in any repository. case YPKG_GROUP_ORPHANED: return _( "Unmaintained" ); case YPKG_GROUP_RECENT: return _( "Recent" ); case YPKG_GROUP_MULTIVERSION: return _( "Multiversion" ); Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Fri Oct 8 21:06:34 2010 @@ -187,12 +187,12 @@ case PATCH: { ZyppPatch patch = castZyppPatch (m_sel->theObj()); if (patch->rebootSuggested()) { - text += br + br + "" + _("Reboot required: ") + ""; + text += br + br + "" + _("Reboot required:") + " "; text += _("the system will have to be restarted in order for " "this patch to take effect."); } if (patch->reloginSuggested()) { - text += br + br + "" + _("Relogin required: ") + ""; + text += br + br + "" + _("Relogin required:") + " "; text += _("you must logout and login again for " "this patch to take effect."); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62584 - in /branches/SuSE-SLE-10-SP4-Branch/s390: package/yast2-s390.changes yast2-s390.spec.in
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 14:36:20 2010 New Revision: 62584 URL: http://svn.opensuse.org/viewcvs/yast?rev=62584&view=rev Log: require s390-tools only on s390 s390x Modified: branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in Modified: branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/p… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes Fri Oct 8 14:36:20 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 8 14:34:06 CEST 2010 - mzugec(a)suse.de + +- require s390-tools only on s390 s390x + +------------------------------------------------------------------- Fri Oct 8 10:08:55 CEST 2010 - mzugec(a)suse.de - 2.13.28 Modified: branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/y… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in Fri Oct 8 14:36:20 2010 @@ -2,7 +2,10 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite + +%ifarch s390 s390x Requires: yast2 s390-tools +%endif Summary: Configuration of s390 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62583 - in /trunk/control-center: VERSION.cmake package/yast2-control-center.changes
by tgoettlicher＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: tgoettlicher Date: Fri Oct 8 12:34:09 2010 New Revision: 62583 URL: http://svn.opensuse.org/viewcvs/yast?rev=62583&view=rev Log: version Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Fri Oct 8 12:34:09 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Fri Oct 8 12:34:09 2010 @@ -2,6 +2,7 @@ Fri Oct 8 12:32:21 CEST 2010 - tgoettlicher(a)suse.de - fixed: bnc #644856: wrong systemsetting category +- 2.19.2 ------------------------------------------------------------------- Thu Mar 11 13:51:41 CET 2010 - kmachalkova(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62582 - in /trunk/control-center: package/yast2-control-center.changes src/YaST-systemsettings.desktop
by tgoettlicher＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: tgoettlicher Date: Fri Oct 8 12:33:40 2010 New Revision: 62582 URL: http://svn.opensuse.org/viewcvs/yast?rev=62582&view=rev Log: fixed Bug 644856 - wrong systemsetting category Modified: trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/YaST-systemsettings.desktop Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Fri Oct 8 12:33:40 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 8 12:32:21 CEST 2010 - tgoettlicher(a)suse.de + +- fixed: bnc #644856: wrong systemsetting category + +------------------------------------------------------------------- Thu Mar 11 13:51:41 CET 2010 - kmachalkova(a)suse.cz - Integrate YaST with new KControl - it is ExternaApp, not KCModule Modified: trunk/control-center/src/YaST-systemsettings.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/YaST-systemse… ============================================================================== --- trunk/control-center/src/YaST-systemsettings.desktop (original) +++ trunk/control-center/src/YaST-systemsettings.desktop Fri Oct 8 12:33:40 2010 @@ -5,5 +5,5 @@ GenericName=Administrator Settings Exec=kdesu -c /sbin/yast2 X-KDE-RootOnly=true -X-KDE-System-Settings-Parent-Category=system +X-KDE-System-Settings-Parent-Category=system-administration X-KDE-ServiceTypes=SystemSettingsExternalApp -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62581 - /tags/branch-SLE-10-SP4-2_13_28/s390/
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 10:12:56 2010 New Revision: 62581 URL: http://svn.opensuse.org/viewcvs/yast?rev=62581&view=rev Log: Created tag branch-SLE-10-SP4-2_13_28 for s390 Added: tags/branch-SLE-10-SP4-2_13_28/s390/ - copied from r62580, branches/SuSE-SLE-10-SP4-Branch/s390/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62580 - /tags/branch-SLE-10-SP4-2_13_28/
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 10:12:53 2010 New Revision: 62580 URL: http://svn.opensuse.org/viewcvs/yast?rev=62580&view=rev Log: Created tag branch-SLE-10-SP4-2_13_28 Added: tags/branch-SLE-10-SP4-2_13_28/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62579 - in /branches/SuSE-SLE-10-SP4-Branch/s390: VERSION package/yast2-s390.changes src/dump/helps.ycp
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 10:12:46 2010 New Revision: 62579 URL: http://svn.opensuse.org/viewcvs/yast?rev=62579&view=rev Log: fixed help text (bnc#529149) Modified: branches/SuSE-SLE-10-SP4-Branch/s390/VERSION branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes branches/SuSE-SLE-10-SP4-Branch/s390/src/dump/helps.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/V… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/VERSION Fri Oct 8 10:12:46 2010 @@ -1 +1 @@ -2.13.27 +2.13.28 Modified: branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/p… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes Fri Oct 8 10:12:46 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 8 10:08:55 CEST 2010 - mzugec(a)suse.de + +- 2.13.28 +- fixed help text (bnc#529149) + +------------------------------------------------------------------- Fri Oct 8 09:25:09 CEST 2010 - mzugec(a)suse.de - error messages more verbose for dump module (bnc#525440) Modified: branches/SuSE-SLE-10-SP4-Branch/s390/src/dump/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/s… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/src/dump/helps.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/src/dump/helps.ycp Fri Oct 8 10:12:46 2010 @@ -51,7 +51,7 @@ /* Disk add help 1/3 */ "edit_dump" : _("<big>Add New Dump Device</big> Prepare a device for use as an S/390 dump device. Supported devices are -ECKD DASD and zfcp disks. Set Dump Device to select the device +ECKD DASD. Set Dump Device to select the device to format. If the device is already formatted or configured, setting Install Dump Record Even If Disk Already &Formatted is required."), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62578 - /tags/branch-SLE-10-SP4-2_13_27/s390/
by mzugec＠svn2.opensuse.org 08 Oct '10

08 Oct '10

Author: mzugec Date: Fri Oct 8 09:39:36 2010 New Revision: 62578 URL: http://svn.opensuse.org/viewcvs/yast?rev=62578&view=rev Log: Created tag branch-SLE-10-SP4-2_13_27 for s390 Added: tags/branch-SLE-10-SP4-2_13_27/s390/ - copied from r62577, branches/SuSE-SLE-10-SP4-Branch/s390/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0