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=62584&r2=62585&view=diff ============================================================================== --- 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=62584&r2=62585&view=diff ============================================================================== --- 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?rev=62585&r1=62584&r2=62585&view=diff ============================================================================== --- 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 = "<b>Package lock:</b> 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 += _("\n<i>status changed by the dependency solver</i>"); + if (sel.toModifyAuto()) { + text += "\n<i>"; + text += _("status changed by the dependencies resolver"); + text += "</i>"; + } return text; } Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?rev=62585&r1=62584&r2=62585&view=diff ============================================================================== --- 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?rev=62585&r1=62584&r2=62585&view=diff ============================================================================== --- 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"), - "<b><span color=\"red\">", - 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(), "</span></b>"); - gtk_label_set_markup (GTK_LABEL (warn_label), str); - g_free (str); + point.totalSize().asString().c_str()); + char *markup = g_strdup_printf ( + "<b><span color=\"red\">%s (%s)</span></b>", 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=62585&r1=62584&r2=62585&view=diff ============================================================================== --- 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=62585&r1=62584&r2=62585&view=diff ============================================================================== --- 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 + "<b>" + _("Reboot required: ") + "</b>"; + text += br + br + "<b>" + _("Reboot required:") + " </b>"; text += _("the system will have to be restarted in order for " "this patch to take effect."); } if (patch->reloginSuggested()) { - text += br + br + "<b>" + _("Relogin required: ") + "</b>"; + text += br + br + "<b>" + _("Relogin required:") + " </b>"; text += _("you must logout and login again for " "this patch to take effect."); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org