October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41332 - in /trunk/pos-installation: src/clients/Makefile.am yast2-pos-installation.spec.in
by locilka＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: locilka Date: Wed Oct 10 15:37:43 2007 New Revision: 41332 URL: http://svn.opensuse.org/viewcvs/yast?rev=41332&view=rev Log: Another fix for makefile and specfile Modified: trunk/pos-installation/src/clients/Makefile.am trunk/pos-installation/yast2-pos-installation.spec.in Modified: trunk/pos-installation/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/Mak… ============================================================================== --- trunk/pos-installation/src/clients/Makefile.am (original) +++ trunk/pos-installation/src/clients/Makefile.am Wed Oct 10 15:37:43 2007 @@ -2,4 +2,6 @@ client_DATA = $(wildcard *.ycp) +EXTRA_DIST = $(client_DATA) + include $(top_srcdir)/Makefile.am.common Modified: trunk/pos-installation/yast2-pos-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/yast2-pos-insta… ============================================================================== --- trunk/pos-installation/yast2-pos-installation.spec.in (original) +++ trunk/pos-installation/yast2-pos-installation.spec.in Wed Oct 10 15:37:43 2007 @@ -22,5 +22,6 @@ %files %defattr(-,root,root) @clientdir@/*.ycp -@desktopdir@/pos-installation.desktop +@desktopdir@/*.desktop +/etc/YaST2/* %doc @docdir@ -- 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] r41331 - /trunk/pos-installation/src/clients/slepos_server_selection.ycp
by locilka＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: locilka Date: Wed Oct 10 15:19:09 2007 New Revision: 41331 URL: http://svn.opensuse.org/viewcvs/yast?rev=41331&view=rev Log: Comments for translators Modified: trunk/pos-installation/src/clients/slepos_server_selection.ycp Modified: trunk/pos-installation/src/clients/slepos_server_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/sle… ============================================================================== --- trunk/pos-installation/src/clients/slepos_server_selection.ycp (original) +++ trunk/pos-installation/src/clients/slepos_server_selection.ycp Wed Oct 10 15:19:09 2007 @@ -19,16 +19,19 @@ list <map <string, string> > list_of_patterns = [ $[ + // TRANSLATORS: A name of pattern, used as RadioButton label "label" : _("Admin Server Installation"), "name" : "SLEPOS_Server_Admin", "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-powertweak.png", ], $[ + // TRANSLATORS: A name of pattern, used as RadioButton label "label" : _("Branch Server Installation"), "name" : "SLEPOS_Server_Branch", "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-iscsi-server.png", ], $[ + // TRANSLATORS: A name of pattern, used as RadioButton label "label" : _("Image Server Installation"), "name" : "SLEPOS_Image_Server", "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-instserver.png", @@ -86,6 +89,8 @@ Pkg::PkgSolve (false); return true; } else { + y2error ("Can't select pattern %1", pattern_to_select); + // TRANSLATORS: Error message, %1 is replaced with the name of the pattern Report::Error (sformat(_("Unable to select pattern '%1'"), GetPatternLabel (pattern_to_select))); return false; } @@ -133,18 +138,21 @@ term_patterns, CreateRadioButtonTerm ( "detailed", + // TRANSLATORS: Radio button _("Detailed Selection"), "" ) ); Wizard::SetContentsButtons ( + // TRANSLATORS: Dialog caption _("Server Pattern Selection"), `RadioButtonGroup ( `id (`selected_pattern), `opt (`notify), term_patterns ), + // TRANSLATORS: Dialog help _("Some help - FIXME!!!!"), Label::BackButton(), Label::NextButton() -- 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] r41330 - /trunk/pos-installation/src/clients/slepos_data_migration.ycp
by locilka＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: locilka Date: Wed Oct 10 15:15:51 2007 New Revision: 41330 URL: http://svn.opensuse.org/viewcvs/yast?rev=41330&view=rev Log: Comments for translators Modified: trunk/pos-installation/src/clients/slepos_data_migration.ycp Modified: trunk/pos-installation/src/clients/slepos_data_migration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/sle… ============================================================================== --- trunk/pos-installation/src/clients/slepos_data_migration.ycp (original) +++ trunk/pos-installation/src/clients/slepos_data_migration.ycp Wed Oct 10 15:15:51 2007 @@ -196,6 +196,7 @@ counter = counter + 1; items[counter] = `item ( `id (counter), + // TRANSLATORS: Table item (file type) _("Directory"), copy_data_dir["source"]:"", copy_data_dir["destination"]:"" @@ -206,6 +207,7 @@ counter = counter + 1; items[counter] = `item ( `id (counter), + // TRANSLATORS: Table item (file type) _("File"), copy_data_file["source"]:"", copy_data_file["destination"]:"" @@ -217,13 +219,16 @@ void DisplayMigrationDialog () { Wizard::SetContentsButtons ( + // TRANSLATORS: Dialog caption _("Migration Asistent"), `VBox ( `VSpacing (1), `RadioButtonGroup ( `id (`skip_or_do_migration), `VBox ( + // TRANSLATORS: Radio button `Left (`RadioButton (`id (`skip_migration), `opt (`notify, `boldFont), _("&Skip Migration"))), + // TRANSLATORS: Radio button `Left (`RadioButton (`id (`do_migrate), `opt (`notify, `boldFont), _("&Do Migrate"), true)) ) ), @@ -232,23 +237,30 @@ `HSpacing (4), `VBox ( `id (`migration_allitems), + // TRANSLATORS: informative text `Left (`Label (_("These directories and files will be migrated"))), `Table ( `id (`migration_items), `header ( + // TRANSLATORS: Table header item _("Type"), + // TRANSLATORS: Table header item _("From"), + // TRANSLATORS: Table header item _("To") ), [] ), `VSpacing (0.5), + // TRANSLATORS: Push button `Left (`PushButton (`id (`details), _("&Migration Details..."))) ) ), `VStretch (), + // TRANSLATORS: informative text `Left (`Label (_("Note: Migration can take very long time according to the current size of your data."))) ), + // TRANSLATORS: Dialog help _("Some help - FIXME!!!!"), Label::BackButton(), Label::NextButton() @@ -267,9 +279,12 @@ // file already exists } else if (FileUtils::IsFile (archive_name)) { return (Popup::AnyQuestion ( + // TRANSLATORS: Pop-up dialog caption _("Warning"), + // TRANSLATORS: Warning dialog message, %1 is replaced with a filename sformat(_("Archive %1 already exists. Do you really want to overwrite it?"), archive_name), + // TRANSLATORS: Push button _("&Yes, Overwrite"), Label::NoButton(), `no @@ -277,6 +292,7 @@ // file is a directory } else if (FileUtils::IsDirectory (archive_name)) { + // TRANSLATORS: Error pop-up message, %1 is replaced with a filename Report::Error (sformat(_("Archive %1 is a directory. Expecting file name instead."), archive_name)); return false; @@ -284,6 +300,8 @@ // file is a socket, fifo, etc... } else { Report::Error ( + // TRANSLATORS: Error pop-up message, %1 is replaced with a file name + // %2 is replaced with a file name type sformat (_("The file %1 is type '%2'. It cannot be used for creating any backup archive."), archive_name, FileUtils::GetFileType (archive_name)) ); @@ -325,17 +343,22 @@ UI::OpenDialog ( `VBox ( + // TRANSLATORS: Pop-up dialog caption `Heading (_("Migration Details")), `VSpacing (1), + // TRANSLATORS: Informative text `Left (`Label (_("We recommend creating a backup copy of your data before the migration starts."))), `VSpacing (1), + // TRANSLATORS: Check box `Left (`CheckBox (`id (`do_backup), `opt (`notify), _("Create a Backup &Archive"))), `HBox ( + // TRANSLATORS: Text entry `MinWidth (50, `TextEntry (`id (`backup_archive), _("Archive &Location"), backup_archive)), `HSpacing (1), `VBox ( `VSpacing (1), + // TRANSLATORS: Push button `PushButton (`id (`browse), _("&Browse...")) ) ), @@ -369,6 +392,7 @@ if (backup_archive == "") { UI::SetFocus (`backup_archive); + // TRANSLATORS: Error message Report::Error (_("Please, select a directory or an archive file.")); continue; } @@ -382,6 +406,7 @@ } else if (ret == `browse) { string existdir = UI::AskForExistingDirectory ( (backup_archive == "" ? default_backupdir : backup_archive), + // TRANSLATORS: File-browse dialog caption _("Backup Archive File Location") ); UI::ChangeWidget (`id (`backup_archive), `Value, existdir); @@ -450,6 +475,7 @@ void DisplayMigrationProgress () { Wizard::SetContentsButtons ( + // TRANSLATORS: Dialog caption _("Migration in Progress"), `VBox ( `ReplacePoint (`id (`rp_backup), `Empty ()), @@ -457,6 +483,7 @@ `ReplacePoint (`id (`rp_migration), `Empty ()), `VStretch () ), + // TRANSLATORS: Dialog help _("Some help - FIXME!!!!"), Label::BackButton(), Label::NextButton() @@ -492,10 +519,15 @@ UI::ReplaceWidget ( `id (`rp_backup), `VBox ( + // TRANSLATORS: Dialog informative text `Left (`Label (`opt (`boldFont), _("Backup statistics:"))), `Left (`Label ( sformat ( - "Current: %1\nTotal directories: %2\nTotal files: %3", + // TRANSLATORS: Dialog informative text + // %1 is replaced with the current file name just being archived + // %2 is replaced with total number of directories archived + // %3 is replaced with total number of files archived + _("Current: %1\nTotal directories: %2\nTotal files: %3"), backup_stats_show, backup_stats_dirs, backup_stats_files @@ -509,14 +541,19 @@ UI::ReplaceWidget ( `id (`rp_backup), `VBox ( + // TRANSLATORS: Dialog informative text `Left (`Label (`opt (`boldFont), _("Backup statistics:"))), `Left (`Label ( sformat ( - "Total directories: %1\nTotal files: %2", + // TRANSLATORS: Dialog informative text + // %1 is replaced with total number of directories archived + // %2 is replaced with total number of files archived + _("Total directories: %1\nTotal files: %2"), backup_stats_dirs, backup_stats_files ) )), + // TRANSLATORS: Dialog informative text (progress) `Left (`Label (`opt (`boldFont), _("Done"))) ) ); @@ -541,10 +578,15 @@ UI::ReplaceWidget ( `id (`rp_migration), `VBox ( + // TRANSLATORS: informative text (headline) `Left (`Label (`opt (`boldFont), _("Migration statistics:"))), `Left (`Label ( sformat ( - "Current: %1\nTotal files: %2\nTotal size: %3", + // TRANSLATORS: Dialog informative text + // %1 is replaced with the current file name just being migrated + // %2 is replaced with total number of files migrated + // %3 is replaced with total size of files migrated + _("Current: %1\nTotal files: %2\nTotal size: %3"), migrated_stats_show, migrated_stats_files, SizeInReadableFormat (migrated_stats_size) @@ -558,14 +600,19 @@ UI::ReplaceWidget ( `id (`rp_migration), `VBox ( + // TRANSLATORS: informative text (headline) `Left (`Label (`opt (`boldFont), _("Migration statistics:"))), `Left (`Label ( sformat ( - "Total files: %1\nTotal size: %2", + // TRANSLATORS: Dialog informative text + // %1 is replaced with total number of files migrated + // %2 is replaced with total size of files migrated + _("Total files: %1\nTotal size: %2"), migrated_stats_files, SizeInReadableFormat (migrated_stats_size) ) )), + // TRANSLATORS: Dialog informative text (progress) `Left (`Label (`opt (`boldFont), _("Done"))) ) ); @@ -575,13 +622,15 @@ UI::ReplaceWidget ( `id (`rp_migration), `VBox ( + // TRANSLATORS: informative text (headline) `Left (`Label (`opt (`boldFont), _("Migration statistics:"))), `Left (`Label ( sformat ( - "Total files: %1", + _("Total files: %1"), migrated_stats_files ) )), + // TRANSLATORS: Dialog informative text (progress) `Left (`Label (`opt (`boldFont), _("Aborted"))) ) ); @@ -610,6 +659,7 @@ boolean CreateBackupArchive () { UI::ReplaceWidget ( `id (`rp_backup), + // TRANSLATORS: Dialog informative text (progress) `Left (`Label (_("Creating backup archive..."))) ); @@ -785,6 +835,7 @@ boolean MigrateData () { UI::ReplaceWidget ( `id (`rp_migration), + // TRANSLATORS: Dialog informative text (progress) `Left (`Label (_("Migrating data..."))) ); @@ -882,10 +933,13 @@ } Wizard::SetContentsButtons ( + // TRANSLATORS: Dialog caption _("Migration Asistent"), `VBox ( + // TRANSLATORS: Dialog informative text (progress) `Label (_("Running post-migration script...")) ), + // TRANSLATORS: Dialog help _("Some help - FIXME!!!!"), Label::BackButton(), Label::NextButton() @@ -932,6 +986,7 @@ if (! ReadParseAndCheckXMLConfig()) { Report::Error (sformat ( + // TRANSLATORS: Pop-up error message _("Unable to read migration configuration from %1"), migration_conf )); -- 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] r41329 - /tags/stable-2_16_0/online-update/
by jsuchome＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsuchome Date: Wed Oct 10 14:52:05 2007 New Revision: 41329 URL: http://svn.opensuse.org/viewcvs/yast?rev=41329&view=rev Log: Created tag stable-2_16_0 for online-update Added: tags/stable-2_16_0/online-update/ - copied from r41328, trunk/online-update/ -- 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] r41328 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/OnlineUpdateCallbacks.ycp
by jsuchome＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsuchome Date: Wed Oct 10 14:51:46 2007 New Revision: 41328 URL: http://svn.opensuse.org/viewcvs/yast?rev=41328&view=rev Log: - do not log progress on DoneDownload callback (#331271) - 2.16.0 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/OnlineUpdateCallbacks.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=41328&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Oct 10 14:51:46 2007 @@ -1 +1 @@ -2.15.23 +2.16.0 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Oct 10 14:51:46 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 10 14:37:12 CEST 2007 - jsuchome(a)suse.cz + +- do not log progress on DoneDownload callback (#331271) +- 2.16.0 + +------------------------------------------------------------------- Wed Sep 19 09:16:05 CEST 2007 - jsuchome(a)suse.cz - removed popup used for debugging (#326247) Modified: trunk/online-update/src/OnlineUpdateCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdateCa… ============================================================================== --- trunk/online-update/src/OnlineUpdateCallbacks.ycp (original) +++ trunk/online-update/src/OnlineUpdateCallbacks.ycp Wed Oct 10 14:51:46 2007 @@ -206,7 +206,7 @@ string ret = PackageCallbacks::DoneProvide (error, reason, name); if (ret == "I") { - if (last_callback == "StartProvide") + if (last_callback != "FinishPatchDeltaProvide") FinishLine (false); total_progress = total_progress + 1; if ( UI::WidgetExists( `id( `you_total_progress ) ) ) { @@ -218,9 +218,13 @@ } global void DoneDownload (integer error_value, string error_text) { - PackageCallbacks::DoneDownload (error_value, error_text); if (last_callback != "FinishPatchDeltaProvide") + y2debug ("DoneDownload %1, %2", error_value, error_text); + PackageCallbacks::DoneDownload (error_value, error_text); + /* + if (last_callback != "FinishPatchDeltaProvide") FinishLine (false); last_callback = "DoneDownload"; + */ } /** @@ -231,7 +235,7 @@ // progress log item (%1 is name of delta RPM if (last_callback == "StartProvide" || last_callback == "StartDownload") ProgressLog ("\n" + indent); - ProgressLog (sformat(_("Downloading delta RPM %1"), name)); + ProgressLog (sformat(_("Downloading delta RPM %1 "), name)); if (UI::WidgetExists (`id (`you_patch_progress))) { UI::ChangeWidget (`id (`you_patch_progress), `Label, @@ -273,7 +277,7 @@ */ global void StartDeltaApply (string name) { // progress log item (%1 is name of delta RPM) - ProgressLog (indent + sformat(_("Applying delta RPM: %1"), name)); + ProgressLog (indent + sformat(_("Applying delta RPM: %1 "), name)); if (UI::WidgetExists (`id (`you_patch_progress))) { UI::ChangeWidget (`id (`you_patch_progress), `Label, @@ -318,7 +322,7 @@ // progress log item (%1 is name of delta RPM) if (last_callback == "StartProvide") ProgressLog ("\n" + indent); - ProgressLog (sformat(_("Downloading patch RPM %1"), name)); + ProgressLog (sformat(_("Downloading patch RPM %1 "), name)); if (UI::WidgetExists (`id (`you_patch_progress))) { UI::ChangeWidget (`id (`you_patch_progress), `Label, @@ -357,7 +361,8 @@ // finish of download/application of delta or patch download global void FinishPatchDeltaProvide () { - FinishLine (true); + if (last_callback != "DoneDownload") + FinishLine (false); last_callback = "FinishPatchDeltaProvide"; } -- 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] r41327 - /tags/stable-2_16_1/ca-management/
by mcalmer＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mcalmer Date: Wed Oct 10 14:51:42 2007 New Revision: 41327 URL: http://svn.opensuse.org/viewcvs/yast?rev=41327&view=rev Log: Created tag stable-2_16_1 for ca-management Added: tags/stable-2_16_1/ca-management/ - copied from r41326, trunk/ca-management/ -- 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] r41326 - in /trunk/ca-management: VERSION package/yast2-ca-management.changes
by mcalmer＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mcalmer Date: Wed Oct 10 14:50:01 2007 New Revision: 41326 URL: http://svn.opensuse.org/viewcvs/yast?rev=41326&view=rev Log: version 2.16.1 Modified: trunk/ca-management/VERSION trunk/ca-management/package/yast2-ca-management.changes Modified: trunk/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=41326&… ============================================================================== --- trunk/ca-management/VERSION (original) +++ trunk/ca-management/VERSION Wed Oct 10 14:50:01 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Wed Oct 10 14:50:01 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 10 11:39:26 CEST 2007 - mc(a)suse.de + +- version 2.16.1 +- fix logging [#332002] + +------------------------------------------------------------------- Mon Oct 8 12:20:38 CEST 2007 - mc(a)suse.de - version 2.16.0 -- 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] r41325 - /trunk/pos-installation/src/Makefile.am
by locilka＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: locilka Date: Wed Oct 10 14:46:49 2007 New Revision: 41325 URL: http://svn.opensuse.org/viewcvs/yast?rev=41325&view=rev Log: Fixed makefile Modified: trunk/pos-installation/src/Makefile.am Modified: trunk/pos-installation/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/Makefile.am… ============================================================================== --- trunk/pos-installation/src/Makefile.am (original) +++ trunk/pos-installation/src/Makefile.am Wed Oct 10 14:46:49 2007 @@ -2,4 +2,4 @@ # Makefile.am for installation/src # -SUBDIRS = clients scripts +SUBDIRS = clients -- 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] r41324 - /tags/stable-2_16_1/devtools/
by mvidner＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mvidner Date: Wed Oct 10 14:44:25 2007 New Revision: 41324 URL: http://svn.opensuse.org/viewcvs/yast?rev=41324&view=rev Log: Created tag stable-2_16_1 for devtools Added: tags/stable-2_16_1/devtools/ - copied from r41323, trunk/devtools/ -- 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] r41323 - /trunk/pos-installation/src/scripts/
by locilka＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: locilka Date: Wed Oct 10 14:43:58 2007 New Revision: 41323 URL: http://svn.opensuse.org/viewcvs/yast?rev=41323&view=rev Log: Removed scripts Removed: trunk/pos-installation/src/scripts/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0